Index: /trunk/include/VBox/dis.h
===================================================================
--- /trunk/include/VBox/dis.h	(revision 41787)
+++ /trunk/include/VBox/dis.h	(revision 41788)
@@ -595,6 +595,5 @@
     /** The instruction size. */
     uint8_t         cbInstr;
-    /** The number of valid bytes in abInstr.
-     * @todo Implement caching and read-ahead tomorrow. */
+    /** The number of valid bytes in abInstr. */
     uint8_t         cbCachedInstr;
     /** Unused byte. */
Index: /trunk/src/VBox/Disassembler/DisasmCore.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 41787)
+++ /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 41788)
@@ -2625,5 +2625,6 @@
 
         /* first opcode byte. */
-        pCpu->bOpCode = codebyte;
+        pCpu->bOpCode  = codebyte;
+        pCpu->cbPrefix = (uint8_t)offInstr - 1;
         offInstr += disParseInstruction(offInstr, &paOneByteMap[pCpu->bOpCode], pCpu);
         break;