[Bochs-cvs] CVS: bochs/cpu cpu.cc,1.71,1.72

[Stanislav S. <ssh...@us...>]

Update of /cvsroot/bochs/bochs/cpu
In directory sc8-pr-cvs1:/tmp/cvs-serv27099

Modified Files:
	cpu.cc 
Log Message:
Add BX_INSTR_FETCH_DECODE_COMPLETED call even if an instruction hitten in ICache


Index: cpu.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/cpu.cc,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cpu.cc	21 Nov 2002 08:08:29 -0000	1.71
+++ cpu.cc	20 Dec 2002 13:36:50 -0000	1.72
@@ -275,11 +275,6 @@
                   BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.d_b);
     }
 #endif
-
-    // An instruction will have been fetched using either the normal case,
-    // or the boundary fetch (across pages), by this point.
-    BX_INSTR_FETCH_DECODE_COMPLETED(CPU_ID, i);
-
     execute = i->execute; // fetch as soon as possible for speculation.
     if (resolveModRM) {
       BX_CPU_CALL_METHOD(resolveModRM, (i));
@@ -287,14 +282,14 @@
     }
   }
 
+    // An instruction will have been fetched using either the normal case,
+    // or the boundary fetch (across pages), by this point.
+    BX_INSTR_FETCH_DECODE_COMPLETED(CPU_ID, i);
+
 #if BX_DEBUGGER
     if (BX_CPU_THIS_PTR trace) {
       // print the instruction that is about to be executed.
-#if (BX_SMP_PROCESSORS==1)
-      bx_dbg_disassemble_current (0, 1);  // only one cpu, print time stamp
-#else
-      bx_dbg_disassemble_current (local_apic.get_id (), 1); // this cpu only
-#endif
+      bx_dbg_disassemble_current (CPU_ID, 1);  // only one cpu, print time stamp
     }
 #endif