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

Timestamp:

Sep 21, 2012 9:40:25 AM (13 years ago)

Author:

vboxsync

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

80859

Message:

VMM: HM cleanup.

File:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -40 +40 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/dbg.h>
-#include <VBox/vmm/hwaccm.h>
+#include <VBox/vmm/hm.h>
 #include <VBox/vmm/patm.h>
 #include <VBox/vmm/csam.h>
@@ -956 +956 @@
      * CPU_RAW_HWACC makes sure we never execute interrupt handlers in the recompiler.
      */
-    if (HWACCMIsEnabled(pVM))
+    if (HMIsEnabled(pVM))
         pVM->rem.s.Env.state |= CPU_RAW_HWACC;
 
@@ -1436 +1436 @@
         return false;
 
-    if (HWACCMIsEnabled(env->pVM))
+    if (HMIsEnabled(env->pVM))
     {
         CPUMCTX Ctx;
@@ -1449 +1449 @@
 
         /*
-         * Create partial context for HWACCMR3CanExecuteGuest
+         * Create partial context for HMR3CanExecuteGuest
          */
         Ctx.cr0            = env->cr[0];
@@ -1528 +1528 @@
          * Typically only 32-bits protected mode, with paging enabled, code is allowed here.
          */
-        if (HWACCMR3CanExecuteGuest(env->pVM, &Ctx) == true)
+        if (HMR3CanExecuteGuest(env->pVM, &Ctx) == true)
         {
             *piException = EXCP_EXECUTE_HWACC;
@@ -1835 +1835 @@
         &&   (((env->hflags >> HF_CPL_SHIFT) & 3) == 0)     /* supervisor mode only */
         &&  !(env->eflags & VM_MASK)                        /* no V86 mode */
-        &&  !HWACCMIsEnabled(env->pVM))
+        &&  !HMIsEnabled(env->pVM))
         CSAMR3MonitorPage(env->pVM, GCPtr, CSAM_TAG_REM);
 #endif
@@ -1855 +1855 @@
         &&   (((env->hflags >> HF_CPL_SHIFT) & 3) == 0)     /* supervisor mode only */
         &&  !(env->eflags & VM_MASK)                        /* no V86 mode */
-        &&  !HWACCMIsEnabled(env->pVM))
+        &&  !HMIsEnabled(env->pVM))
         CSAMR3UnmonitorPage(env->pVM, GCPtr, CSAM_TAG_REM);
 #endif
@@ -2748 +2748 @@
      */
     CPUMR3RemLeave(pVCpu,
-                      HWACCMIsEnabled(pVM)
+                      HMIsEnabled(pVM)
                    || (  pVM->rem.s.Env.segs[R_SS].newselector
                        | pVM->rem.s.Env.segs[R_GS].newselector