christoph/fail
1
Fork 0
Code Releases Activity

uniform use of comments for Bochs modifications

Browse Source 
We need to be able to grep for our manual changes.  It doesn't help to
have variations with "TUDOS" or "BOCHS-MODIFIED" around.  Please
understand "// DanceOS" comments as an abbreviation for "this code was
manually modified and needs to be manually ported once we switch to a
newer version of Bochs."

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1747 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-10-16 16:59:49 +00:00
parent 6100472e1b
commit 773ad1367d
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
simulators/bochs/cpu/cpu.cc
View File

@ -26,11 +26,7 @@
#include "iodev/iodev.h"
/****************************************************************
* DanceOS - BOCHS-MODIFIED
*
*/
// DanceOS:
// Just a dummy function to define a join-point. This function is
// *just* called once within bx_cpu_c::cpu_loop(...).
static inline void defineCPULoopJoinPoint(BX_CPU_C* pThis, bxInstruction_c *pInstr)
@ -155,29 +151,16 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count)
debug_disasm_instruction(BX_CPU_THIS_PTR prev_rip);
}
#endif
/****************************************************************
* TUDOS - BOCHS-MODIFIED
*
*/
// DanceOS: Save original instruction length in case we modify the instruction.
unsigned orig_len = i->ilen();
/****************************************************************/
/****************************************************************
* DanceOS - BOCHS-MODIFIED
*
*/
// DanceOS: Aspect "hook"
defineCPULoopJoinPoint(BX_CPU_THIS, i);
/****************************************************************/
// instruction decoding completed -> continue with execution
// want to allow changing of the instruction inside instrumentation callback
BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i);
/****************************************************************
* TUDOS - BOCHS-MODIFIED
*
*/
// DanceOS: Use original length (see above).
RIP += orig_len;
/****************************************************************/
BX_CPU_CALL_METHOD(i->execute, (i)); // might iterate repeat instruction
BX_CPU_THIS_PTR prev_rip = RIP; // commit new RIP
BX_INSTR_AFTER_EXECUTION(BX_CPU_ID, i);