Changeset 30263 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Jun 16, 2010 6:31:42 PM (14 years ago)

Author:

vboxsync

Message:

VMM,REM: Only invalidate hidden registers when using raw-mode. Fixes save restore during mode switching code like the windows boot menu. (#5057)

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (6 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1798 +1798 @@
     TRPMEVENT               enmType;
     uint8_t                 u8TrapNo;
+    uint32_t                uCpl;
     int                     rc;
 
@@ -1805 +1806 @@
     pVM->rem.s.Env.pVCpu = pVCpu;
     pCtx = pVM->rem.s.pCtx = CPUMQueryGuestCtxPtr(pVCpu);
-    fHiddenSelRegsValid = CPUMAreHiddenSelRegsValid(pVM);
+    fHiddenSelRegsValid = CPUMAreHiddenSelRegsValid(pVCpu); /// @todo move this down and use fFlags.
 
     Assert(!pVM->rem.s.fInREM);
@@ -1927 +1928 @@
      * Registers which are rarely changed and require special handling / order when changed.
      */
-    fFlags = CPUMGetAndClearChangedFlagsREM(pVCpu);
-    LogFlow(("CPUMGetAndClearChangedFlagsREM %x\n", fFlags));
+    fFlags = CPUMR3RemEnter(pVCpu, &uCpl);
+    LogFlow(("CPUMR3RemEnter %x %x\n", fFlags, uCpl));
     if (fFlags & (  CPUM_CHANGED_CR4  | CPUM_CHANGED_CR3  | CPUM_CHANGED_CR0
                   | CPUM_CHANGED_GDTR | CPUM_CHANGED_IDTR | CPUM_CHANGED_LDTR
@@ -2041 +2042 @@
 
         /* Set current CPL */
-        cpu_x86_set_cpl(&pVM->rem.s.Env, CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)));
+        cpu_x86_set_cpl(&pVM->rem.s.Env, uCpl);
 
         cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_CS, pCtx->cs, pCtx->csHid.u64Base, pCtx->csHid.u32Limit, (pCtx->csHid.Attr.u << 8) & 0xFFFFFF);
@@ -2057 +2058 @@
             Log2(("REMR3State: SS changed from %04x to %04x!\n", pVM->rem.s.Env.segs[R_SS].selector, pCtx->ss));
 
-            cpu_x86_set_cpl(&pVM->rem.s.Env, CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)));
+            cpu_x86_set_cpl(&pVM->rem.s.Env, uCpl);
             sync_seg(&pVM->rem.s.Env, R_SS, pCtx->ss);
 #ifdef VBOX_WITH_STATISTICS
@@ -2475 +2476 @@
      * We're not longer in REM mode.
      */
+    CPUMR3RemLeave(pVCpu,
+                      HWACCMIsEnabled(pVM)
+                   || (  pVM->rem.s.Env.segs[R_SS].newselector
+                       | pVM->rem.s.Env.segs[R_GS].newselector
+                       | pVM->rem.s.Env.segs[R_FS].newselector
+                       | pVM->rem.s.Env.segs[R_ES].newselector
+                       | pVM->rem.s.Env.segs[R_DS].newselector
+                       | pVM->rem.s.Env.segs[R_CS].newselector) == 0
+                   );
     VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED, VMCPUSTATE_STARTED_EXEC_REM);
     pVM->rem.s.fInREM    = false;