Changeset 1359 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Mar 9, 2007 10:40:44 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19350

Message:

SELM function changes for v86 mode code.
CPL check fixes for V86 mode code.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (2 diffs)
• PATM.cpp (modified) (3 diffs)
• VMMGC/PATMGC.cpp (modified) (1 diff)

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

@@ -2048 +2048 @@
     if (CSAMIsEnabled(pVM))
     {
-        bool fCode32 = SELMIsSelector32Bit(pVM, Sel, pHiddenSel);
+        X86EFLAGS fakeflags;
+
+        /* we're not in v86 mode here */
+        fakeflags.u32 = 0;
+
+        bool fCode32 = SELMIsSelector32Bit(pVM, fakeflags, Sel, pHiddenSel);
 
         //assuming 32 bits code for now
         Assert(fCode32);
 
-        pInstrGC = SELMToFlat(pVM, Sel, pHiddenSel, pInstrGC);
+        pInstrGC = SELMToFlat(pVM, fakeflags, Sel, pHiddenSel, pInstrGC);
 
         return CSAMR3CheckCode(pVM, pInstrGC);
@@ -2239 +2244 @@
             CSAMP2GLOOKUPREC cacheRec = {0};            /* Cache record for PATMGCVirtToHCVirt. */
             PCSAMPAGE pPage = NULL;
+            X86EFLAGS fakeflags;
+
+            /* we're not in v86 mode here */
+            fakeflags.u32 = 0;
 
             pHandler = (pGuestIdte->Gen.u16OffsetHigh << 16) | pGuestIdte->Gen.u16OffsetLow;
-            pHandler = SELMToFlat(pVM, pGuestIdte->Gen.u16SegSel, 0, pHandler);
+            pHandler = SELMToFlat(pVM, fakeflags, pGuestIdte->Gen.u16SegSel, 0, pHandler);
 
             if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)

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

@@ -3338 +3338 @@
 
     pBranchTarget = pCtx->edx;
-    pBranchTarget = SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, pBranchTarget);
+    pBranchTarget = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pBranchTarget);
 
     /* First we check if the duplicate function target lies in some existing function patch already. Will save some space. */
@@ -3955 +3955 @@
         &&  (pCtx->ss & X86_SEL_RPL) == 0)
     {
-        RTGCPTR pInstrGCFlat = SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, pInstrGC);
+        RTGCPTR pInstrGCFlat = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pInstrGC);
         Assert(pInstrGCFlat == pInstrGC);
     }
@@ -5907 +5907 @@
 
     /* Return original address, correct by subtracting the CS base address. */
-    *ppNewEip = pNewEip - SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, 0);
+    *ppNewEip = pNewEip - SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, 0);
 
     /* Reset the PATM stack. */

trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

@@ -469 +469 @@
             }
 
-            cpu.mode = SELMIsSelector32Bit(pVM, pRegFrame->cs, 0) ? CPUMODE_32BIT : CPUMODE_16BIT;
+            cpu.mode = SELMIsSelector32Bit(pVM, pRegFrame->eflags, pRegFrame->cs, 0) ? CPUMODE_32BIT : CPUMODE_16BIT;
             if(cpu.mode != CPUMODE_32BIT)
             {