mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed segfault when setting ESP/EIP in GUI debugger

Browse Source
This commit is contained in:
Stanislav Shwartsman 2012-04-16 19:18:23 +00:00
parent 99a31bd150
commit e12494bf7b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/cpu/debugstuff.cc
View File

@ -278,7 +278,7 @@ bx_bool BX_CPU_C::dbg_set_reg(unsigned reg, Bit32u val)
switch (reg) {
case BX_DBG_REG_EIP:
EIP = val;
RIP = BX_CPU_THIS_PTR prev_rip = val;
invalidate_prefetch_q();
return(1);
case BX_DBG_REG_EFLAGS:

8
bochs/gui/enh_dbg.cc
View File

@ -2676,17 +2676,15 @@ void ChangeReg()
int i = RitemToRnum[L];
if (i > EFER_Rnum) // TODO: extend this to more reg -- need display names for all
return;
char *d1 = RDispName[i];
// if (i > EFER_Rnum)
// *tmpcb = 0;
// else
sprintf (tmpcb,"0x" FMT_LL "X", rV[i]);
if (AskText("Change Register Value",d1,tmpcb))
if (AskText("Change Register Value",RDispName[i],tmpcb))
{
Bit64u val;
val = cvt64(tmpcb,TRUE); // input either hex or decimal
Bit64u val = cvt64(tmpcb,TRUE); // input either hex or decimal
#if BX_SUPPORT_X86_64
if (i >= EAX_Rnum && i <= EBP_Rnum) // must use RAX-RBP when setting 32b registers
if (i >= EAX_Rnum && i <= EIP_Rnum) // must use RAX-RIP when setting 32b registers
i -= EAX_Rnum - RAX_Rnum;
#endif
RegObject[CurrentCPU][i]->set(val); // the set function should be a bool, not a void