Changeset 17327 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2009 8:46:40 AM (16 years ago)

Author:

vboxsync

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

43701

Message:

Take code locality into account when deal with io block emulation

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• HWACCMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1208 +1208 @@
         Log(("HWACCMR3EmulateIoBlock -> enabled\n"));
         pVCpu->hwaccm.s.EmulateIoBlock.fEnabled         = true;
-        pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp = pCtx->rsp;
+        pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEip = pCtx->rip;
         pVCpu->hwaccm.s.EmulateIoBlock.cr0              = pCtx->cr0;
         return VINF_EM_RESCHEDULE_REM;
@@ -1230 +1230 @@
     /* If we're still executing the IO code, then return false. */
     if (    RT_UNLIKELY(pVCpu->hwaccm.s.EmulateIoBlock.fEnabled)
-        &&  pCtx->rsp <= pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEsp
+        &&  pCtx->rip <  pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEip + 0x200
+        &&  pCtx->rip >  pVCpu->hwaccm.s.EmulateIoBlock.GCPtrFunctionEip - 0x200
         &&  pCtx->cr0 == pVCpu->hwaccm.s.EmulateIoBlock.cr0)
         return false;

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -556 +556 @@
         uint8_t                 u8Align[7];
 
-        /** Esp at the start of the io code we wish to emulate in the recompiler. */
-        RTGCPTR                 GCPtrFunctionEsp;
+        /** RIP at the start of the io code we wish to emulate in the recompiler. */
+        RTGCPTR                 GCPtrFunctionEip;
 
         uint64_t                cr0;