Changeset 36823 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 23, 2011 10:32:27 PM (14 years ago)

Author:

vboxsync

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

71382

Message:

IEM: fixed interrupt delivery in verification mode.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMR3/EM.cpp (modified) (1 diff)
• VMMR3/TRPM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -6279 +6279 @@
         Log(("Injecting trap %#x\n", TRPMGetTrapNo(pVCpu)));
         iemCImpl_int(pIemCpu, 0, TRPMGetTrapNo(pVCpu), false);
+# ifdef IEM_VERIFICATION_MODE_NO_REM
+        TRPMResetTrap(pVCpu);
+# endif
     }
 

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

@@ -2014 +2014 @@
                 case EMSTATE_REM:
 #ifdef IEM_VERIFICATION_MODE
+# if 1
                     rc = VBOXSTRICTRC_TODO(IEMExecOne(pVCpu)); fFFDone = false;
+# else
+                    rc = VBOXSTRICTRC_TODO(REMR3EmulateInstruction(pVM, pVCpu)); fFFDone = false;
+                    if (rc == VINF_EM_RESCHEDULE)
+                        rc = VINF_SUCCESS;
+# endif
 #else
                     rc = emR3RemExecute(pVM, pVCpu, &fFFDone);

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

@@ -1468 +1468 @@
         if (RT_SUCCESS(rc))
         {
+# ifndef IEM_VERIFICATION_MODE
             if (HWACCMIsEnabled(pVM))
+# endif
             {
                 rc = TRPMAssertTrap(pVCpu, u8Interrupt, enmEvent);