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

Timestamp:

Jun 13, 2008 9:49:54 AM (17 years ago)

Author:

vboxsync

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

32013

Message:

General cleanup of SELMToFlat.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (3 diffs)
• PATM.cpp (modified) (6 diffs)

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

@@ -2099 +2099 @@
  * @returns VBox status code.
  * @param   pVM         The VM to operate on.
- * @param   Sel         selector
- * @param   pHiddenSel  The hidden selector register.
+ * @param   pCtxCore    CPU context
  * @param   pInstrGC    Instruction pointer
  */
-CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTRCPTR pInstrGC)
+CSAMR3DECL(int) CSAMR3CheckCodeEx(PVM pVM, PCPUMCTXCORE pCtxCore, RTRCPTR pInstrGC)
 {
     if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
@@ -2113 +2112 @@
     if (CSAMIsEnabled(pVM))
     {
-        X86EFLAGS fakeflags;
-
-        /* we're not in v86 mode here */
-        fakeflags.u32 = 0;
-
         /* Assuming 32 bits code for now. */
-        Assert(SELMGetCpuModeFromSelector(pVM, fakeflags, Sel, pHiddenSel) == CPUMODE_32BIT);
-
-        pInstrGC = SELMToFlat(pVM, fakeflags, Sel, pHiddenSel, pInstrGC);
-
+        Assert(SELMGetCpuModeFromSelector(pVM, pCtxCore->eflags, pCtxCore->cs, &pCtxCore->csHid) == CPUMODE_32BIT);
+
+        pInstrGC = SELMToFlat(pVM, DIS_SELREG_CS, pCtxCore, pInstrGC);
         return CSAMR3CheckCode(pVM, pInstrGC);
     }
@@ -2366 +2359 @@
             CSAMP2GLOOKUPREC cacheRec = {0};            /* Cache record for PATMGCVirtToHCVirt. */
             PCSAMPAGE pPage = NULL;
-            X86EFLAGS fakeflags;
             SELMSELINFO selInfo;
 
-            /* we're not in v86 mode here */
-            fakeflags.u32 = 0;
-
             pHandler = VBOXIDTE_OFFSET(*pGuestIdte);
-            pHandler = SELMToFlat(pVM, fakeflags, pGuestIdte->Gen.u16SegSel, 0, pHandler);
+            pHandler = SELMToFlatBySel(pVM, pGuestIdte->Gen.u16SegSel, pHandler);
 
             rc = SELMR3GetSelectorInfo(pVM, pGuestIdte->Gen.u16SegSel, &selInfo);

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

@@ -1658 +1658 @@
             /* mov ss, src? */
             if (    (pCpu->param1.flags & USE_REG_SEG)
-                &&  (pCpu->param1.base.reg_seg == USE_REG_SS))
+                &&  (pCpu->param1.base.reg_seg == DIS_SELREG_SS))
             {
                 Log(("Force recompilation of next instruction for OP_MOV at %VRv\n", pCurInstrGC));
@@ -3373 +3373 @@
 
     pBranchTarget = pCtx->edx;
-    pBranchTarget = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pBranchTarget);
+    pBranchTarget = SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), pBranchTarget);
 
     /* First we check if the duplicate function target lies in some existing function patch already. Will save some space. */
@@ -3987 +3987 @@
     if (CPUMGetGuestCPL(pVM, CPUMCTX2CORE(pCtx)) == 0)
     {
-        RTRCPTR pInstrGCFlat = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pInstrGC);
+        RTRCPTR pInstrGCFlat = SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), pInstrGC);
         if (pInstrGCFlat != pInstrGC)
         {
@@ -6052 +6052 @@
 
                     /* continue at the original instruction */
-                    *ppNewEip = pNewEip - SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, 0);
+                    *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
                     STAM_PROFILE_ADV_STOP(&pVM->patm.s.StatHandleTrap, a);
                     return VINF_SUCCESS;
@@ -6119 +6119 @@
         }
 
-        *ppNewEip = pNewEip - SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, 0);
+        *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
         STAM_PROFILE_ADV_STOP(&pVM->patm.s.StatHandleTrap, a);
         return rc;
@@ -6152 +6152 @@
 
     /* Return original address, correct by subtracting the CS base address. */
-    *ppNewEip = pNewEip - SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, 0);
+    *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
 
     /* Reset the PATM stack. */