diff --git a/bochs/cpu/fetchdecode.cc b/bochs/cpu/fetchdecode.cc
index 5787d0541..841f44b89 100644
--- a/bochs/cpu/fetchdecode.cc
+++ b/bochs/cpu/fetchdecode.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: fetchdecode.cc,v 1.230 2009-10-24 11:17:51 sshwarts Exp $
+// $Id: fetchdecode.cc,v 1.231 2009-10-31 20:02:44 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -190,7 +190,7 @@ bxIAOpcodeTable BxOpcodesTable[] = {
 };
 #undef  bx_define_opcode
 
-#if BX_INSTRUMENTATION
+#if BX_INSTRUMENT_IA_OPCODE
 const char* BxOpcodeNamesTable[BX_IA_LAST] =
 {
 #define bx_define_opcode(a, b, c) #a,
@@ -2990,7 +2990,7 @@ modrm_done:
   i->setB1(b1);
   i->setILen(ilen);
 
-#if BX_INSTRUMENTATION
+#if BX_INSTRUMENT_IA_OPCODE
   i->ia_opcode = ia_opcode;
 #endif
 
diff --git a/bochs/cpu/fetchdecode64.cc b/bochs/cpu/fetchdecode64.cc
index 79ff287b9..1d6788b28 100644
--- a/bochs/cpu/fetchdecode64.cc
+++ b/bochs/cpu/fetchdecode64.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: fetchdecode64.cc,v 1.232 2009-10-24 11:17:51 sshwarts Exp $
+// $Id: fetchdecode64.cc,v 1.233 2009-10-31 20:02:44 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -3873,7 +3873,7 @@ modrm_done:
   i->setB1(b1);
   i->setILen(ilen);
 
-#if BX_INSTRUMENTATION
+#if BX_INSTRUMENT_IA_OPCODE
   i->ia_opcode = ia_opcode;
 #endif
 
diff --git a/bochs/cpu/instr.h b/bochs/cpu/instr.h
index 0f2c03dfb..d463a5d85 100755
--- a/bochs/cpu/instr.h
+++ b/bochs/cpu/instr.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: instr.h,v 1.21 2009-10-14 20:45:29 sshwarts Exp $
+// $Id: instr.h,v 1.22 2009-10-31 20:02:44 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2008-2009 Stanislav Shwartsman
@@ -24,6 +24,8 @@
 #ifndef BX_INSTR_H
 #  define BX_INSTR_H 1
 
+#define BX_INSTRUMENT_IA_OPCODE 0
+
 class bxInstruction_c;
 
 // <TAG-TYPE-EXECUTEPTR-START>
@@ -46,7 +48,7 @@ public:
   BxExecutePtr_tR execute;
   BxExecutePtr_tR execute2;
   BxResolvePtr_tR ResolveModrm;
-#if BX_INSTRUMENTATION
+#if BX_INSTRUMENT_IA_OPCODE
   Bit16u ia_opcode;
 #endif
 
@@ -284,4 +286,8 @@ public:
 };
 // <TAG-CLASS-INSTRUCTION-END>
 
+#if BX_INSTRUMENT_IA_OPCODE
+extern const char* BxOpcodeNamesTable[];
+#endif
+
 #endif