Changeset 51256 in vbox

Timestamp:

May 15, 2014 10:30:08 AM (11 years ago)

Author:

vboxsync

Message:

IEM: Fall back if IEMInjectTrpmEvent() did not do its job.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (2 diffs)
• include/EMHandleRCTmpl.h (modified) (1 diff)

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

@@ -10935 +10935 @@
 VMMDECL(VBOXSTRICTRC) IEMInjectTrpmEvent(PVMCPU pVCpu)
 {
+#ifndef IEM_IMPLEMENTS_TASKSWITCH
+    IEM_RETURN_ASPECT_NOT_IMPLEMENTED_LOG(("Event injection\n"));
+#else
     uint8_t     u8TrapNo;
     TRPMEVENT   enmType;
@@ -10946 +10949 @@
     TRPMResetTrap(pVCpu);
     return IEMInjectTrap(pVCpu, u8TrapNo, enmType, uErrCode, uCr2, cbInstr);
+#endif
 }
 

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

@@ -278 +278 @@
 #ifdef VBOX_WITH_FIRST_IEM_STEP
             rc = VBOXSTRICTRC_VAL(IEMInjectTrpmEvent(pVCpu));
+            /* The following condition should be removed when IEM_IMPLEMENTS_TASKSWITCH becomes true. */
+            if (rc == VERR_IEM_ASPECT_NOT_IMPLEMENTED)
+                rc = emR3ExecuteInstruction(pVM, pVCpu, "EVENT: ");
 #else
             /* Do the same thing as VINF_EM_RAW_EMULATE_INSTR. */
-            rc = emR3ExecuteInstruction(pVM, pVCpu, "EMUL: ");
+            rc = emR3ExecuteInstruction(pVM, pVCpu, "EVENT: ");
 #endif
             break;