Changeset 42186 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 17, 2012 1:32:15 PM (13 years ago)

Author:

vboxsync

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

79186

Message:

SELM,DIS,CPUM,EM: Hidden selector register cleanups.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CSAM.cpp (modified) (1 diff)
• EMRaw.cpp (modified) (3 diffs)
• HWACCM.cpp (modified) (3 diffs)

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

@@ -2295 +2295 @@
     {
         /* Assuming 32 bits code for now. */
-        Assert(SELMGetCpuModeFromSelector(VMMGetCpu0(pVM), pCtxCore->eflags, pCtxCore->cs.Sel, &pCtxCore->cs) == DISCPUMODE_32BIT);
+        Assert(CPUMGetGuestCodeBits(VMMGetCpu0(pVM)) == 32);
 
         pInstrGC = SELMToFlat(pVM, DISSELREG_CS, pCtxCore, pInstrGC);

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -685 +685 @@
             {
                 rc = PATMR3InstallPatch(pVM, SELMToFlat(pVM, DISSELREG_CS, CPUMCTX2CORE(pCtx), pCtx->eip),
-                                           SELMGetCpuModeFromSelector(pVCpu, pCtx->eflags, pCtx->cs.Sel, &pCtx->cs)
-                                        == DISCPUMODE_32BIT ? PATMFL_CODE32 : 0);
+                                        CPUMGetGuestCodeBits(pVCpu) == 32 ? PATMFL_CODE32 : 0);
                 if (RT_SUCCESS(rc))
                 {
@@ -936 +935 @@
         {
             int rc = PATMR3InstallPatch(pVM, SELMToFlat(pVM, DISSELREG_CS, CPUMCTX2CORE(pCtx), pCtx->eip),
-                                        (   SELMGetCpuModeFromSelector(pVCpu, pCtx->eflags, pCtx->cs.Sel, &pCtx->cs)
-                                         == DISCPUMODE_32BIT) ? PATMFL_CODE32 : 0);
+                                        CPUMGetGuestCodeBits(pVCpu) == 32 ? PATMFL_CODE32 : 0);
             if (RT_SUCCESS(rc))
             {
@@ -1044 +1042 @@
         if (    (pCtx->ss.Sel & X86_SEL_RPL) == 0
             &&  !pCtx->eflags.Bits.u1VM
-            &&  SELMGetCpuModeFromSelector(pVCpu, pCtx->eflags, pCtx->cs.Sel, &pCtx->cs) == DISCPUMODE_32BIT)
+            &&  CPUMGetGuestCodeBits(pVCpu) == 32)
         {
             STAM_PROFILE_START(&pVCpu->em.s.StatPrivEmu, a);

trunk/src/VBox/VMM/VMMR3/HWACCM.cpp

@@ -1868 +1868 @@
     PDISCPUSTATE    pDis = &pVCpu->hwaccm.s.DisState;
     uint32_t        cbOp;
-    int rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, &cbOp);
+    int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbOp);
     AssertRC(rc);
     if (    rc == VINF_SUCCESS
@@ -1920 +1920 @@
 
             pCtx->rip += cbOp;
-            rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, &cbOp);
+            rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbOp);
             DBGFR3DisasInstrCurrentLog(pVCpu, "Following read");
             pCtx->rip = uSavedRip;
@@ -2041 +2041 @@
     PDISCPUSTATE    pDis   = &pVCpu->hwaccm.s.DisState;
     uint32_t        cbOp;
-    int rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, &cbOp);
+    int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbOp);
     AssertRC(rc);
     if (    rc == VINF_SUCCESS