Changeset 97616 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2022 11:58:09 PM (2 years ago)

Author:

vboxsync

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

154660

Message:

VMM/EM: Extended assertion that we don't have a pending trap before calling emR3ExecuteInstruction. Seems possible to trigger this in long mode when 16-bit code triggers a #UD with garbage in ESP[31:16] and #UD is intercepted by our VMX code (bs3-cpu-basic-2 far return w/o Bs3Trap64InitEx(true)).

File:

• trunk/src/VBox/VMM/include/EMHandleRCTmpl.h (modified) (1 diff)

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

@@ -155 +155 @@
         case VINF_EM_RAW_GUEST_TRAP:
         case VINF_EM_RAW_EMULATE_INSTR:
-            Assert(!TRPMHasTrap(pVCpu)); /* We're directly executing instructions below without respecting any pending traps! */
+            AssertMsg(!TRPMHasTrap(pVCpu), ("trap=%#x\n", TRPMGetTrapNo(pVCpu))); /* We're directly executing instructions below without respecting any pending traps! */
             rc = emR3ExecuteInstruction(pVM, pVCpu, "EMUL: ");
             break;