Changeset 17295 in vbox

Timestamp:

Mar 3, 2009 3:56:07 PM (16 years ago)

Author:

vboxsync

Message:

Refined HWACCMR3EmulateIoBlock

Location:

trunk

Files:

• include/VBox/hwaccm.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (1 diff)
• src/VBox/VMM/HWACCM.cpp (modified) (2 diffs)
• src/VBox/VMM/HWACCMInternal.h (modified) (1 diff)

trunk/include/VBox/hwaccm.h

@@ -120 +120 @@
 VMMR3DECL(bool) HWACCMR3IsVPIDActive(PVM pVM);
 VMMR3DECL(int)  HWACCMR3InjectNMI(PVM pVM);
-VMMR3DECL(void) HWACCMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx);
+VMMR3DECL(int)  HWACCMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx);
 
 /** @} */

trunk/src/VBox/VMM/EM.cpp

@@ -2360 +2360 @@
          */
         case VINF_EM_RAW_EMULATE_IO_BLOCK:
-            HWACCMR3EmulateIoBlock(pVM, pCtx);
-            rc = VINF_EM_RESCHEDULE_REM;
+            rc =HWACCMR3EmulateIoBlock(pVM, pCtx);
             break;
 

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1192 +1192 @@
  * Force execution of the current IO code in the recompiler
  *
+ * @returns VBox status code.
  * @param   pVM         The VM to operate on.
  * @param   pCtx        Partial VM execution context
  */
-VMMR3DECL(void) HWACCMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx)
+VMMR3DECL(int) HWACCMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx)
 {
     PVMCPU pVCpu = VMMGetCpu(pVM);
 
     Assert(pVM->fHWACCMEnabled);
-    pVCpu->hwaccm.s.EmulateIoBlock.fEnabled         = true;
-    pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp = pCtx->rsp;
+    Log(("HWACCMR3EmulateIoBlock\n"));
+    if (!CPUMIsGuestInPagedProtectedModeEx(pCtx))
+    {
+        Log(("HWACCMR3EmulateIoBlock -> enabled\n"));
+        pVCpu->hwaccm.s.EmulateIoBlock.fEnabled         = true;
+        pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp = pCtx->rsp;
+        pVCpu->hwaccm.s.EmulateIoBlock.cr0              = pCtx->cr0;
+        return VINF_EM_RESCHEDULE_REM;
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1218 +1227 @@
 
     if (    RT_UNLIKELY(pVCpu->hwaccm.s.EmulateIoBlock.fEnabled)
-        &&  pCtx->rsp <= pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp)
+        &&  pCtx->rsp <= pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp
+        &&  pCtx->cr0 == pVCpu->hwaccm.s.EmulateIoBlock.cr0)
         return false;
 

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -558 +558 @@
         /** Esp at the start of the io code we wish to emulate in the recompiler. */
         RTGCPTR                 GCPtrFunctionEsp;
+
+        uint64_t                cr0;
     } EmulateIoBlock;