Changeset 15572 in vbox for trunk

Timestamp:

Dec 16, 2008 10:51:42 AM (16 years ago)

Author:

vboxsync

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

41081

Message:

emR3SingleStepExecRem fix

File:

• trunk/src/VBox/VMM/EM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -99 +99 @@
 static int emR3RawGuestTrap(PVM pVM);
 static int emR3PatchTrap(PVM pVM, PCPUMCTX pCtx, int gcret);
-
+static int emR3SingleStepExecRem(PVM pVM, uint32_t cIterations);
+static EMSTATE emR3Reschedule(PVM pVM, PCPUMCTX pCtx);
 
 /**
@@ -1128 +1129 @@
 
 
-int emR3SingleStepExecHwAcc(PVM pVM, RTCPUID idCpu, uint32_t cIterations)
+static int emR3SingleStepExecHwAcc(PVM pVM, RTCPUID idCpu, uint32_t cIterations)
 {
     EMSTATE  enmOldState = pVM->em.s.enmState;
@@ -1150 +1151 @@
 
 
-void emR3SingleStepExecRem(PVM pVM, uint32_t cIterations)
+static int emR3SingleStepExecRem(PVM pVM, uint32_t cIterations)
 {
     EMSTATE  enmOldState = pVM->em.s.enmState;
@@ -1162 +1163 @@
         DBGFR3DisasInstrCurrentLog(pVM, "RSS: ");
         emR3RemStep(pVM);
+        if (emR3Reschedule(pVM, pVM->em.s.pCtx) != EMSTATE_REM)
+            break;
     }
     Log(("Single step END:\n"));
     CPUMSetGuestEFlags(pVM, CPUMGetGuestEFlags(pVM) & ~X86_EFL_TF);
     pVM->em.s.enmState = enmOldState;
+    return VINF_EM_RESCHEDULE;
 }
 
@@ -2878 +2882 @@
  * @param   pCtx    The CPU context.
  */
-DECLINLINE(EMSTATE) emR3Reschedule(PVM pVM, PCPUMCTX pCtx)
+static EMSTATE emR3Reschedule(PVM pVM, PCPUMCTX pCtx)
 {
     /*