Changeset 36054 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 22, 2011 3:04:28 PM (14 years ago)

Author:

vboxsync

Message:

VMM/REM: Made .remstep work to some degree (might skip interrupts/traps).

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (2 diffs)
• VMM.cpp (modified) (2 diffs)

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

@@ -989 +989 @@
         TMTimerPollVoid(pVM, pVCpu);
 #endif
-        AssertCompile((VMCPU_FF_ALL_BUT_RAW_MASK & ~(VMCPU_FF_CSAM_PENDING_ACTION | VMCPU_FF_CSAM_SCAN_PAGE)) & VMCPU_FF_TIMER);
-        if (    VM_FF_ISPENDING(pVM, VM_FF_ALL_BUT_RAW_MASK)
-            ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_ALL_BUT_RAW_MASK & ~(VMCPU_FF_CSAM_PENDING_ACTION | VMCPU_FF_CSAM_SCAN_PAGE)))
+        AssertCompile((VMCPU_FF_ALL_REM_MASK & ~(VMCPU_FF_CSAM_PENDING_ACTION | VMCPU_FF_CSAM_SCAN_PAGE)) & VMCPU_FF_TIMER);
+        if (    VM_FF_ISPENDING(pVM, VM_FF_ALL_REM_MASK)
+            ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_ALL_REM_MASK & ~(VMCPU_FF_CSAM_PENDING_ACTION | VMCPU_FF_CSAM_SCAN_PAGE)))
         {
 l_REMDoForcedActions:
@@ -1755 +1755 @@
                 && rc != VINF_EM_TERMINATE
                 && rc != VINF_EM_OFF
-                && (   VM_FF_ISPENDING(pVM, VM_FF_ALL_BUT_RAW_MASK)
-                    || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_ALL_BUT_RAW_MASK)))
+                && (   VM_FF_ISPENDING(pVM, VM_FF_ALL_REM_MASK)
+                    || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_ALL_REM_MASK)))
             {
                 rc = emR3ForcedActions(pVM, pVCpu, rc);

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

@@ -2258 +2258 @@
     PRINT_GROUP(VM_FF_,NORMAL_PRIORITY_POST,_MASK);
     PRINT_GROUP(VM_FF_,NORMAL_PRIORITY,_MASK);
-    PRINT_GROUP(VM_FF_,ALL_BUT_RAW,_MASK);
+    PRINT_GROUP(VM_FF_,ALL_REM,_MASK);
     if (c)
         pHlp->pfnPrintf(pHlp, "\n");
@@ -2305 +2305 @@
         PRINT_GROUP(VMCPU_FF_,RESUME_GUEST,_MASK);
         PRINT_GROUP(VMCPU_FF_,HWACCM_TO_R3,_MASK);
-        PRINT_GROUP(VMCPU_FF_,ALL_BUT_RAW,_MASK);
+        PRINT_GROUP(VMCPU_FF_,ALL_REM,_MASK);
         if (c)
             pHlp->pfnPrintf(pHlp, "\n");