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

Timestamp:

Jun 27, 2012 11:59:46 PM (12 years ago)

Author:

vboxsync

Message:

CPUMGetGuestCPL: Drop the context core pointer and use the Guest state in CPUMCPU via pVCpu.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (1 diff)
• EM.cpp (modified) (1 diff)
• EMHwaccm.cpp (modified) (1 diff)
• EMRaw.cpp (modified) (1 diff)
• PATM.cpp (modified) (1 diff)

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

@@ -4149 +4149 @@
      * Get the CPL first.
      */
-    *puCpl = CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(&pVCpu->cpum.s.Guest));
+    *puCpl = CPUMGetGuestCPL(pVCpu);
 
     /*

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

@@ -962 +962 @@
 #ifdef LOG_ENABLED
     PCPUMCTX pCtx = pVCpu->em.s.pCtx;
-    uint32_t cpl = CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx));
+    uint32_t cpl = CPUMGetGuestCPL(pVCpu);
 
     if (pCtx->eflags.Bits.u1VM)

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

@@ -511 +511 @@
             Log(("CPU%d: Pending hardware interrupt=0x%x cs:rip=%04X:%RGv\n", pVCpu->idCpu, TRPMGetTrapNo(pVCpu), pCtx->cs.Sel, (RTGCPTR)pCtx->rip));
 
-        uint32_t cpl = CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx));
+        uint32_t cpl = CPUMGetGuestCPL(pVCpu);
 
         if (pVM->cCpus == 1)

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

@@ -534 +534 @@
      * instead. One example is #DE.
      */
-    uint32_t uCpl = CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx));
+    uint32_t uCpl = CPUMGetGuestCPL(pVCpu);
     if (    uCpl == 0
         &&  PATMIsPatchGCAddr(pVM, pCtx->eip))

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

@@ -4083 +4083 @@
     /* Make sure the code selector is wide open; otherwise refuse. */
     pCtx = CPUMQueryGuestCtxPtr(pVCpu);
-    if (CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0)
+    if (CPUMGetGuestCPL(pVCpu) == 0)
     {
         RTRCPTR pInstrGCFlat = SELMToFlat(pVM, DISSELREG_CS, CPUMCTX2CORE(pCtx), pInstrGC);