Changeset 21443 in vbox

Timestamp:

Jul 9, 2009 2:04:57 PM (15 years ago)

Author:

vboxsync

Message:

Fix boundary cases when crossing into a page that hasn't been scanned before

File:

• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -721 +721 @@
         uint32_t     cbInstr = 0;
         uint32_t     opsize  = pCpu->opsize;
-
-        PATMR3AddHint(pVM, pCurInstrGC, (pPage->fCode32) ? PATMFL_CODE32 : 0);
+        bool         fCode32 = pPage->fCode32;
+
+        Assert(fCode32);
+
+        PATMR3AddHint(pVM, pCurInstrGC, (fCode32) ? PATMFL_CODE32 : 0);
 
         /* Make sure the instructions that follow the cli have not been encountered before. */
@@ -750 +753 @@
             Assert(VALID_PTR(pCurInstrHC));
 
-            cpu.mode = (pPage->fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT;
+            cpu.mode = (fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT;
             rc = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
             Assert(RT_SUCCESS(rc));