Changeset 43392 in vbox

Timestamp:

Sep 21, 2012 10:21:29 AM (12 years ago)

Author:

vboxsync

Message:

VMM: HM cleanup.

Location:

trunk

Files:

• include/VBox/vmm/vmm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/EMHM.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/EMInternal.h (modified) (3 diffs)

trunk/include/VBox/vmm/vmm.h

@@ -264 +264 @@
 VMMR3_INT_DECL(RTR0PTR) VMMR3GetHostToGuestSwitcher(PVM pVM, VMMSWITCHER enmSwitcher);
 VMMR3_INT_DECL(int)     VMMR3RawRunGC(PVM pVM, PVMCPU pVCpu);
-VMMR3_INT_DECL(int)     VMMR3HwAccRunGC(PVM pVM, PVMCPU pVCpu);
+VMMR3_INT_DECL(int)     VMMR3HmRunGC(PVM pVM, PVMCPU pVCpu);
 VMMR3DECL(int)          VMMR3CallRC(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, ...);
 VMMR3DECL(int)          VMMR3CallRCV(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, va_list args);

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -22 +22 @@
  * Interpreted), and keeping the CPU states in sync. The function
  * EMR3ExecuteVM() is the 'main-loop' of the VM, while each of the execution
- * modes has different inner loops (emR3RawExecute, emR3HwAccExecute, and
+ * modes has different inner loops (emR3RawExecute, emR3HmExecute, and
  * emR3RemExecute).
  *
@@ -391 +391 @@
         EM_REG_COUNTER(&pVCpu->em.s.StatIOEmu,                 "/PROF/CPU%d/EM/Emulation/IO",      "Profiling of emR3RawExecuteIOInstruction.");
         EM_REG_COUNTER(&pVCpu->em.s.StatPrivEmu,               "/PROF/CPU%d/EM/Emulation/Priv",    "Profiling of emR3RawPrivileged.");
-        EM_REG_PROFILE(&pVCpu->em.s.StatHwAccEntry,           "/PROF/CPU%d/EM/HwAccEnter",        "Profiling Hardware Accelerated Mode entry overhead.");
-        EM_REG_PROFILE(&pVCpu->em.s.StatHwAccExec,            "/PROF/CPU%d/EM/HwAccExec",         "Profiling Hardware Accelerated Mode execution.");
+        EM_REG_PROFILE(&pVCpu->em.s.StatHmEntry,           "/PROF/CPU%d/EM/HmEnter",        "Profiling Hardware Accelerated Mode entry overhead.");
+        EM_REG_PROFILE(&pVCpu->em.s.StatHmExec,            "/PROF/CPU%d/EM/HmExec",         "Profiling Hardware Accelerated Mode execution.");
         EM_REG_PROFILE(&pVCpu->em.s.StatREMEmu,               "/PROF/CPU%d/EM/REMEmuSingle",      "Profiling single instruction REM execution.");
         EM_REG_PROFILE(&pVCpu->em.s.StatREMExec,              "/PROF/CPU%d/EM/REMExec",           "Profiling REM execution.");
@@ -2198 +2198 @@
                 case EMSTATE_HWACC:
 #ifndef IEM_VERIFICATION_MODE /* remove later */
-                    rc = emR3HwAccExecute(pVM, pVCpu, &fFFDone);
+                    rc = emR3HmExecute(pVM, pVCpu, &fFFDone);
                     break;
 #endif

trunk/src/VBox/VMM/VMMR3/EMHM.cpp

@@ -79 +79 @@
  * @param   pVCpu   Pointer to the VMCPU.
  */
-static int emR3HwAccStep(PVM pVM, PVMCPU pVCpu)
+static int emR3HmStep(PVM pVM, PVMCPU pVCpu)
 {
     Assert(pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC);
@@ -108 +108 @@
     do
     {
-        rc = VMMR3HwAccRunGC(pVM, pVCpu);
+        rc = VMMR3HmRunGC(pVM, pVCpu);
     } while (   rc == VINF_SUCCESS
              || rc == VINF_EM_RAW_INTERRUPT);
@@ -128 +128 @@
 
 
-static int emR3SingleStepExecHwAcc(PVM pVM, PVMCPU pVCpu, uint32_t cIterations)
+static int emR3SingleStepExecHm(PVM pVM, PVMCPU pVCpu, uint32_t cIterations)
 {
     int     rc          = VINF_SUCCESS;
@@ -139 +139 @@
         DBGFR3PrgStep(pVCpu);
         DBGFR3DisasInstrCurrentLog(pVCpu, "RSS: ");
-        rc = emR3HwAccStep(pVM, pVCpu);
+        rc = emR3HmStep(pVM, pVCpu);
         if (    rc != VINF_SUCCESS
             ||  !HMR3CanExecuteGuest(pVM, pVCpu->em.s.pCtx))
@@ -464 +464 @@
  *                      FFs were done before returning.
  */
-int emR3HwAccExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone)
+int emR3HmExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone)
 {
     int      rc = VERR_IPE_UNINITIALIZED_STATUS;
     PCPUMCTX pCtx = pVCpu->em.s.pCtx;
 
-    LogFlow(("emR3HwAccExecute%d: (cs:eip=%04x:%RGv)\n", pVCpu->idCpu, pCtx->cs.Sel, (RTGCPTR)pCtx->rip));
+    LogFlow(("emR3HmExecute%d: (cs:eip=%04x:%RGv)\n", pVCpu->idCpu, pCtx->cs.Sel, (RTGCPTR)pCtx->rip));
     *pfFFDone = false;
 
-    STAM_COUNTER_INC(&pVCpu->em.s.StatHwAccExecuteEntry);
+    STAM_COUNTER_INC(&pVCpu->em.s.StatHmExecuteEntry);
 
 #ifdef EM_NOTIFY_HM
@@ -483 +483 @@
     for (;;)
     {
-        STAM_PROFILE_ADV_START(&pVCpu->em.s.StatHwAccEntry, a);
+        STAM_PROFILE_ADV_START(&pVCpu->em.s.StatHmEntry, a);
 
         /* Check if a forced reschedule is pending. */
@@ -536 +536 @@
          * Execute the code.
          */
-        STAM_PROFILE_ADV_STOP(&pVCpu->em.s.StatHwAccEntry, a);
+        STAM_PROFILE_ADV_STOP(&pVCpu->em.s.StatHmEntry, a);
 
         if (RT_LIKELY(EMR3IsExecutionAllowed(pVM, pVCpu)))
         {
-            STAM_PROFILE_START(&pVCpu->em.s.StatHwAccExec, x);
-            rc = VMMR3HwAccRunGC(pVM, pVCpu);
-            STAM_PROFILE_STOP(&pVCpu->em.s.StatHwAccExec, x);
+            STAM_PROFILE_START(&pVCpu->em.s.StatHmExec, x);
+            rc = VMMR3HmRunGC(pVM, pVCpu);
+            STAM_PROFILE_STOP(&pVCpu->em.s.StatHmExec, x);
         }
         else

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -1271 +1271 @@
  * @param   pVCpu       Pointer to the VMCPU.
  */
-VMMR3_INT_DECL(int) VMMR3HwAccRunGC(PVM pVM, PVMCPU pVCpu)
-{
-    Log2(("VMMR3HwAccRunGC: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
+VMMR3_INT_DECL(int) VMMR3HmRunGC(PVM pVM, PVMCPU pVCpu)
+{
+    Log2(("VMMR3HmRunGC: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
 
     for (;;)
@@ -1304 +1304 @@
         if (rc != VINF_VMM_CALL_HOST)
         {
-            Log2(("VMMR3HwAccRunGC: returns %Rrc (cs:eip=%04x:%08x)\n", rc, CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
+            Log2(("VMMR3HmRunGC: returns %Rrc (cs:eip=%04x:%08x)\n", rc, CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
             return rc;
         }

trunk/src/VBox/VMM/include/EMInternal.h

@@ -398 +398 @@
     STAMPROFILE             StatHalted;
     STAMPROFILEADV          StatCapped;
-    STAMPROFILEADV          StatHwAccEntry;
-    STAMPROFILE             StatHwAccExec;
+    STAMPROFILEADV          StatHmEntry;
+    STAMPROFILE             StatHmExec;
     STAMPROFILE             StatREMEmu;
     STAMPROFILE             StatREMExec;
@@ -415 +415 @@
     /** R3: Profiling of emR3RawPrivileged. */
     STAMPROFILE             StatPrivEmu;
-    /** R3: Number of time emR3HwAccExecute is called. */
-    STAMCOUNTER             StatHwAccExecuteEntry;
+    /** R3: Number of time emR3HmExecute is called. */
+    STAMCOUNTER             StatHmExecuteEntry;
 
     /** More statistics (R3). */
@@ -442 +442 @@
 
 
-int     emR3HwAccExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone);
+int     emR3HmExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone);
 int     emR3RawExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone);
 int     emR3RawHandleRC(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, int rc);