diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc
index 05dd31ecd..3eaa20614 100644
--- a/bochs/cpu/cpu.cc
+++ b/bochs/cpu/cpu.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.cc,v 1.55 2002-09-29 14:16:30 sshwarts Exp $
+// $Id: cpu.cc,v 1.56 2002-09-29 15:06:58 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -263,7 +263,15 @@ async_events_processed:
 #endif
       boundaryFetch(i);
       resolveModRM = i->ResolveModrm; // Get function pointers as early
-      }
+    }
+#if BX_INSTRUMENTATION
+    else
+    {
+      // An instruction was either fetched, or found in the iCache.
+      BX_INSTR_OPCODE(CPU_ID, fetchPtr, i->ilen(),
+                  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.
@@ -276,11 +284,6 @@ async_events_processed:
     }
   }
 
-  // An instruction was either fetched, or found in the iCache.
-  BX_INSTR_OPCODE(CPU_ID, fetchPtr, i->ilen(),
-                  BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.d_b);
-
-
 #if BX_DEBUGGER
     if (BX_CPU_THIS_PTR trace) {
       // print the instruction that is about to be executed.
diff --git a/bochs/cpu/ctrl_xfer16.cc b/bochs/cpu/ctrl_xfer16.cc
index 23c4c0ae7..fecec8d45 100644
--- a/bochs/cpu/ctrl_xfer16.cc
+++ b/bochs/cpu/ctrl_xfer16.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ctrl_xfer16.cc,v 1.16 2002-09-28 00:54:04 kevinlawton Exp $
+// $Id: ctrl_xfer16.cc,v 1.17 2002-09-29 15:06:58 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -367,7 +367,7 @@ BailBigRSP("JCC_Jw");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
@@ -396,7 +396,7 @@ BailBigRSP("JZ_Jw");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
@@ -425,7 +425,7 @@ BailBigRSP("JNZ_Jw");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
diff --git a/bochs/cpu/ctrl_xfer32.cc b/bochs/cpu/ctrl_xfer32.cc
index 4f508acc9..331dc00dd 100644
--- a/bochs/cpu/ctrl_xfer32.cc
+++ b/bochs/cpu/ctrl_xfer32.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ctrl_xfer32.cc,v 1.20 2002-09-28 00:54:04 kevinlawton Exp $
+// $Id: ctrl_xfer32.cc,v 1.21 2002-09-29 15:06:58 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -425,7 +425,7 @@ BailBigRSP("JCC_Jd");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
@@ -453,7 +453,7 @@ BailBigRSP("JZ_Jd");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
@@ -481,7 +481,7 @@ BailBigRSP("JNZ_Jd");
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
diff --git a/bochs/cpu/ctrl_xfer64.cc b/bochs/cpu/ctrl_xfer64.cc
index 742f8bccd..4ce673851 100644
--- a/bochs/cpu/ctrl_xfer64.cc
+++ b/bochs/cpu/ctrl_xfer64.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ctrl_xfer64.cc,v 1.15 2002-09-28 00:54:04 kevinlawton Exp $
+// $Id: ctrl_xfer64.cc,v 1.16 2002-09-29 15:06:58 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -332,7 +332,7 @@ BX_CPU_C::JCC_Jq(bxInstruction_c *i)
     }
 #if BX_INSTRUMENTATION
   else {
-    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+    BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
     }
 #endif
 }
@@ -461,7 +461,7 @@ BX_CPU_C::JCXZ64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -475,7 +475,7 @@ BX_CPU_C::JCXZ64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
   }
@@ -497,7 +497,7 @@ BX_CPU_C::LOOPNE64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -511,7 +511,7 @@ BX_CPU_C::LOOPNE64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -531,7 +531,7 @@ BX_CPU_C::LOOPE64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -545,7 +545,7 @@ BX_CPU_C::LOOPE64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -565,7 +565,7 @@ BX_CPU_C::LOOP64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -579,7 +579,7 @@ BX_CPU_C::LOOP64_Jb(bxInstruction_c *i)
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
diff --git a/bochs/cpu/ctrl_xfer8.cc b/bochs/cpu/ctrl_xfer8.cc
index 4c003f3e5..e08d7701b 100644
--- a/bochs/cpu/ctrl_xfer8.cc
+++ b/bochs/cpu/ctrl_xfer8.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ctrl_xfer8.cc,v 1.12 2002-09-28 00:54:04 kevinlawton Exp $
+// $Id: ctrl_xfer8.cc,v 1.13 2002-09-29 15:06:58 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -51,7 +51,7 @@ BailBigRSP("JCXZ_Jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -83,7 +83,7 @@ BailBigRSP("JCXZ_Jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
   }
@@ -105,7 +105,7 @@ BailBigRSP("loopne_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -137,7 +137,7 @@ BailBigRSP("loopne_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
 
@@ -162,7 +162,7 @@ BailBigRSP("loope_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -194,7 +194,7 @@ BailBigRSP("loope_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
 
@@ -219,7 +219,7 @@ BailBigRSP("loop_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif
     }
@@ -251,7 +251,7 @@ BailBigRSP("loop_jb");
       }
 #if BX_INSTRUMENTATION
     else {
-      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID, );
+      BX_INSTR_CNEAR_BRANCH_NOT_TAKEN(CPU_ID);
       }
 #endif