Changeset 41940 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 28, 2012 12:07:43 AM (12 years ago)

Author:

vboxsync

Message:

CPUMRaw[SG]etEFlags: Drop pCtxCore.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)
• VMMAll/EMAll.cpp (modified) (1 diff)
• VMMAll/IOMAll.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (2 diffs)
• VMMRC/TRPMRCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2204 +2204 @@
  *
  * @param   pVCpu       Pointer to the VMCPU.
- * @param   pCtxCore    The context core.
- * @param   eflags      The new EFLAGS value.
- */
-VMMDECL(void) CPUMRawSetEFlags(PVMCPU pVCpu, PCPUMCTXCORE pCtxCore, uint32_t eflags)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-
+ * @param   fEfl        The new EFLAGS value.
+ */
+VMMDECL(void) CPUMRawSetEFlags(PVMCPU pVCpu, uint32_t fEfl)
+{
     if (!pVCpu->cpum.s.fRawEntered)
-    {
-        pCtxCore->eflags.u32 = eflags;
-        return;
-    }
-    PATMRawSetEFlags(pVM, pCtxCore, eflags);
+        pVCpu->cpum.s.Guest.eflags.u32 = fEfl;
+    else
+        PATMRawSetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest), fEfl);
 }
 #endif /* !IN_RING0 */
@@ -2225 +2220 @@
  *
  * @returns The eflags.
- * @param   pVCpu       Pointer to the VMCPU.
- * @param   pCtxCore    The context core.
- */
-VMMDECL(uint32_t) CPUMRawGetEFlags(PVMCPU pVCpu, PCPUMCTXCORE pCtxCore)
+ * @param   pVCpu       Pointer to the current virtual CPU.
+ */
+VMMDECL(uint32_t) CPUMRawGetEFlags(PVMCPU pVCpu)
 {
 #ifdef IN_RING0
-    NOREF(pVCpu);
-    return pCtxCore->eflags.u32;
+    return pVCpu->cpum.s.Guest.eflags.u32;
 #else
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
 
     if (!pVCpu->cpum.s.fRawEntered)
-        return pCtxCore->eflags.u32;
-    return PATMRawGetEFlags(pVM, pCtxCore);
+        return pVCpu->cpum.s.Guest.eflags.u32;
+    return PATMRawGetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest));
 #endif
 }
@@ -2246 +2238 @@
  * Sets the specified changed flags (CPUM_CHANGED_*).
  *
- * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pVCpu       Pointer to the current virtual CPU.
  */
 VMMDECL(void) CPUMSetChangedFlags(PVMCPU pVCpu, uint32_t fChangedFlags)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -636 +636 @@
     eflags &= uMask;
 
-    CPUMRawSetEFlags(pVCpu, pRegFrame, eflags);
+    CPUMRawSetEFlags(pVCpu, eflags);
     Assert((pRegFrame->eflags.u32 & (X86_EFL_IF|X86_EFL_IOPL)) == X86_EFL_IF);
 

trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

@@ -853 +853 @@
      * If this isn't ring-0, we have to check for I/O privileges.
      */
-    uint32_t efl = CPUMRawGetEFlags(pVCpu, pCtxCore);
+    uint32_t efl = CPUMRawGetEFlags(pVCpu);
     uint32_t cpl = CPUMGetGuestCPL(pVCpu);
 

trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

@@ -406 +406 @@
     /* Retrieve the eflags including the virtualized bits. */
     /* Note: hackish as the cpumctxcore structure doesn't contain the right value */
-    eflags.u32 = CPUMRawGetEFlags(pVCpu, pRegFrame);
+    eflags.u32 = CPUMRawGetEFlags(pVCpu);
 
     /* VMCPU_FF_INHIBIT_INTERRUPTS should be cleared upfront or don't call this function at all for dispatching hardware interrupts. */
@@ -680 +680 @@
                     /* Turn off interrupts for interrupt gates. */
                     if (GuestIdte.Gen.u5Type2 == VBOX_IDTE_TYPE2_INT_32)
-                        CPUMRawSetEFlags(pVCpu, pRegFrame, eflags.u32 & ~X86_EFL_IF);
+                        CPUMRawSetEFlags(pVCpu, eflags.u32 & ~X86_EFL_IF);
 
                     /* The virtualized bits must be removed again!! */

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -889 +889 @@
         case OP_CLI:
         {
-            uint32_t efl = CPUMRawGetEFlags(pVCpu, pRegFrame);
+            uint32_t efl = CPUMRawGetEFlags(pVCpu);
             if (X86_EFL_GET_IOPL(efl) >= (unsigned)(pRegFrame->ss.Sel & X86_SEL_RPL))
             {
@@ -1023 +1023 @@
      */
     X86EFLAGS eflags;
-    eflags.u32 = CPUMRawGetEFlags(pVCpu, pRegFrame); /* Get the correct value. */
+    eflags.u32 = CPUMRawGetEFlags(pVCpu); /* Get the correct value. */
     Log3(("TRPM #GP V86: cs:eip=%04x:%08x IOPL=%d efl=%08x\n", pRegFrame->cs.Sel, pRegFrame->eip, eflags.Bits.u2IOPL, eflags.u));
     if (eflags.Bits.u2IOPL != 3)