Index: /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41764)
+++ /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41765)
@@ -394,5 +394,4 @@
              && (pCpu->fPrefix & DISPREFIX_LOCK)))
         PUT_SZ("Illegal opcode");
-        //cchOutput += RTStrPrintf(pszDst, cchDst, "Illegal opcode %.*Rhxs", pCpu->cbInstr, pCpu->abInstr);
     else
     {
Index: /trunk/src/VBox/VMM/VMMR3/CPUM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/CPUM.cpp	(revision 41764)
+++ /trunk/src/VBox/VMM/VMMR3/CPUM.cpp	(revision 41765)
@@ -3582,9 +3582,6 @@
                 cb = cbSeg;
         }
-        /** @todo read more later. */
-        //if (cb > cbMaxRead) - later
-        //    cb = cbMaxRead;
-        if (cb > cbMinRead)
-            cb = cbMinRead;
+        if (cb > cbMaxRead)
+            cb = cbMaxRead;
 
         /*
@@ -3717,23 +3714,4 @@
 
 #ifdef DEBUG
-
-/**
- * Disassemble an instruction and dump it to the log
- *
- * @returns VBox status code.
- * @param   pVM         VM Handle
- * @param   pVCpu       VMCPU Handle
- * @param   pCtx        CPU context
- * @param   pc          GC instruction pointer
- * @param   pszPrefix   String prefix for logging
- *
- * @deprecated  Use DBGFR3DisasInstrCurrentLog().
- */
-VMMR3DECL(void) CPUMR3DisasmInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPTR pc, const char *pszPrefix)
-{
-    DISCPUSTATE Cpu;
-    CPUMR3DisasmInstrCPU(pVM, pVCpu, pCtx, pc, &Cpu, pszPrefix);
-}
-
 
 /**