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

oops, revert incorrectly merged change

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-01-10 20:32:23 +00:00
parent 1f4608cd84
commit 77b4b70b9b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.200 2008-01-10 20:26:49 sshwarts Exp $ // $Id: cpu.cc,v 1.201 2008-01-10 20:32:23 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -428,7 +428,7 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count)
// decoding instruction compeleted -> continue with execution // decoding instruction compeleted -> continue with execution
BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i); BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i);
EIP += i->ilen(); RIP += i->ilen();
BX_CPU_CALL_METHOD(i->execute, (i)); // might iterate repeat instruction BX_CPU_CALL_METHOD(i->execute, (i)); // might iterate repeat instruction
BX_CPU_THIS_PTR prev_rip = RIP; // commit new RIP BX_CPU_THIS_PTR prev_rip = RIP; // commit new RIP
BX_INSTR_AFTER_EXECUTION(BX_CPU_ID, i); BX_INSTR_AFTER_EXECUTION(BX_CPU_ID, i);

10
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.409 2008-01-10 20:26:49 sshwarts Exp $ // $Id: cpu.h,v 1.410 2008-01-10 20:32:23 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -1190,13 +1190,13 @@ public: // for now...
#define BX_DEBUG_TRAP_SPECIAL (0xf8000000) #define BX_DEBUG_TRAP_SPECIAL (0xf8000000)
Bit32u debug_trap; // holds DR6 value (16bit) to be set as well Bit32u debug_trap; // holds DR6 value (16bit) to be set as well
/*volatile*/ Bit32u async_event; volatile Bit32u async_event;
#define BX_ASYNC_EVENT_STOP_TRACE (0x80000000) #define BX_ASYNC_EVENT_STOP_TRACE (0x80000000)
/*volatile*/ bx_bool INTR; volatile bx_bool INTR;
/*volatile*/ bx_bool smi_pending; volatile bx_bool smi_pending;
/*volatile*/ bx_bool nmi_pending; volatile bx_bool nmi_pending;
// for exceptions // for exceptions
jmp_buf jmp_buf_env; jmp_buf jmp_buf_env;