From 773ad1367da2e85f2575e728a680ae9b5d63ea6b Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Tue, 16 Oct 2012 16:59:49 +0000
Subject: [PATCH] uniform use of comments for Bochs modifications

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
---
 simulators/bochs/cpu/cpu.cc | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/simulators/bochs/cpu/cpu.cc b/simulators/bochs/cpu/cpu.cc
index 35db3904..c47358fc 100644
--- a/simulators/bochs/cpu/cpu.cc
+++ b/simulators/bochs/cpu/cpu.cc
@@ -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);