Changeset 43394 in vbox for trunk/src/recompiler

Timestamp:

Sep 21, 2012 11:11:17 AM (13 years ago)

Author:

vboxsync

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

80872

Message:

VMM: HM cleanup.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (7 diffs)
• cpu-defs.h (modified) (1 diff)
• cpu-exec.c (modified) (1 diff)
• target-i386/cpu.h (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -865 +865 @@
                 break;
             case EXCP_EXECUTE_RAW:
-            case EXCP_EXECUTE_HWACC:
+            case EXCP_EXECUTE_HM:
                 /** @todo: is it correct? No! */
                 rc = VINF_SUCCESS;
@@ -954 +954 @@
 
     /* Make sure this flag is set; we might never execute remR3CanExecuteRaw in the AMD-V case.
-     * CPU_RAW_HWACC makes sure we never execute interrupt handlers in the recompiler.
+     * CPU_RAW_HM makes sure we never execute interrupt handlers in the recompiler.
      */
     if (HMIsEnabled(pVM))
-        pVM->rem.s.Env.state |= CPU_RAW_HWACC;
+        pVM->rem.s.Env.state |= CPU_RAW_HM;
 
     /* Skip the TB flush as that's rather expensive and not necessary for single instruction emulation. */
@@ -1053 +1053 @@
              * Switch to hardware accelerated RAW-mode.
              */
-            case EXCP_EXECUTE_HWACC:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_EXECUTE_HWACC\n"));
-                rc = VINF_EM_RESCHEDULE_HWACC;
+            case EXCP_EXECUTE_HM:
+                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_EXECUTE_HM\n"));
+                rc = VINF_EM_RESCHEDULE_HM;
                 break;
 
@@ -1256 +1256 @@
              * Switch to hardware accelerated RAW-mode.
              */
-            case EXCP_EXECUTE_HWACC:
-                RTLogPrintf("remR3RunLoggingStep: cpu_exec -> EXCP_EXECUTE_HWACC rc=VINF_EM_RESCHEDULE_HWACC\n");
-                rc = VINF_EM_RESCHEDULE_HWACC;
+            case EXCP_EXECUTE_HM:
+                RTLogPrintf("remR3RunLoggingStep: cpu_exec -> EXCP_EXECUTE_HM rc=VINF_EM_RESCHEDULE_HM\n");
+                rc = VINF_EM_RESCHEDULE_HM;
                 break;
 
@@ -1377 +1377 @@
          * Switch to hardware accelerated RAW-mode.
          */
-        case EXCP_EXECUTE_HWACC:
-            Log2(("REMR3Run: cpu_exec -> EXCP_EXECUTE_HWACC\n"));
-            rc = VINF_EM_RESCHEDULE_HWACC;
+        case EXCP_EXECUTE_HM:
+            Log2(("REMR3Run: cpu_exec -> EXCP_EXECUTE_HM\n"));
+            rc = VINF_EM_RESCHEDULE_HM;
             break;
 
@@ -1440 +1440 @@
         CPUMCTX Ctx;
 
-        env->state |= CPU_RAW_HWACC;
+        env->state |= CPU_RAW_HM;
 
         /*
@@ -1530 +1530 @@
         if (HMR3CanExecuteGuest(env->pVM, &Ctx) == true)
         {
-            *piException = EXCP_EXECUTE_HWACC;
+            *piException = EXCP_EXECUTE_HM;
             return true;
         }

trunk/src/recompiler/cpu-defs.h

@@ -77 +77 @@
 #ifdef VBOX
 # define EXCP_EXECUTE_RAW   0x11024 /**< execute raw mode. */
-# define EXCP_EXECUTE_HWACC 0x11025 /**< execute hardware accelerated raw mode. */
+# define EXCP_EXECUTE_HM 0x11025 /**< execute hardware accelerated raw mode. */
 # define EXCP_SINGLE_INSTR  0x11026 /**< executed single instruction. */
 # define EXCP_RC            0x11027 /**< a EM rc was raised (VMR3Reset/Suspend/PowerOff). */

trunk/src/recompiler/cpu-exec.c

@@ -437 +437 @@
                                 || !(env->eflags & IF_MASK)
                                 ||  (env->hflags & HF_INHIBIT_IRQ_MASK)
-                                ||  (env->state & CPU_RAW_HWACC)
+                                ||  (env->state & CPU_RAW_HM)
                                )
                             {

trunk/src/recompiler/target-i386/cpu.h

@@ -910 +910 @@
 # define CPU_EMULATE_SINGLE_INSTR 0x0040 /* Execute a single instruction in emulation mode */
 # define CPU_EMULATE_SINGLE_STEP  0x0080 /* go into single step mode */
-# define CPU_RAW_HWACC            0x0100 /* Set after first time HWACC is executed, never cleared. */
+# define CPU_RAW_HM            0x0100 /* Set after first time HWACC is executed, never cleared. */
 /** @} */
 #endif /* !VBOX */