Changeset 1306 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Mar 7, 2007 4:50:52 PM (18 years ago)

Author:

vboxsync

Message:

Forward #UD & #GP in V86 code in GC

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -366 +366 @@
         {
             int rc = PATMGCHandleIllegalInstrTrap(pVM, pRegFrame);
-            if (rc == VINF_SUCCESS || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PATM_DUPLICATE_FUNCTION || rc == VINF_PATM_PENDING_IRQ_AFTER_IRET)
+            if (rc == VINF_SUCCESS || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PATM_DUPLICATE_FUNCTION || rc == VINF_PATM_PENDING_IRQ_AFTER_IRET || rc == VINF_EM_RESCHEDULE)
                 return trpmGCExitTrap(pVM, rc, pRegFrame);
         }
+    }
+    else
+    if (pRegFrame->eflags.Bits.u1VM)
+    {
+        int rc = TRPMForwardTrap(pVM, pRegFrame, 0x6, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_TRAP);
+        Assert(rc == VINF_EM_RAW_GUEST_TRAP);
     }
     return trpmGCExitTrap(pVM, VINF_EM_RAW_GUEST_TRAP, pRegFrame);
@@ -704 +710 @@
     if (pRegFrame->eflags.Bits.u1VM)
     {
+        X86EFLAGS eflags;
+
         STAM_PROFILE_ADV_STOP(&pVM->trpm.s.StatTrap0dDisasm, a);
+
+        /* Retrieve the eflags including the virtualized bits. */
+        /** @note hackish as the cpumctxcore structure doesn't contain the right value */
+        eflags.u32 = CPUMRawGetEFlags(pVM, pRegFrame);
+        if (eflags.Bits.u2IOPL == 0)
+        {
+            int rc = TRPMForwardTrap(pVM, pRegFrame, 0xD, 0, TRPM_TRAP_HAS_ERRORCODE, TRPM_TRAP);
+            Assert(rc == VINF_EM_RAW_GUEST_TRAP);
+            return trpmGCExitTrap(pVM, rc, pRegFrame);
+        }
+
         return trpmGCExitTrap(pVM, VINF_EM_RAW_EMULATE_INSTR, pRegFrame);
     }