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

Timestamp:

Apr 10, 2007 9:30:52 AM (18 years ago)

Author:

vboxsync

Message:

Emulate monitor in ring 0.

File:

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

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

@@ -343 +343 @@
     LogFlow(("TRPMGCTrap06Handler %VGv eflags=%x\n", pRegFrame->eip, pRegFrame->eflags.u32));
 
-    if (    (pRegFrame->ss & X86_SEL_RPL) == 1
-        &&  !pRegFrame->eflags.Bits.u1VM
-        &&  PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+    if (CPUMGetGuestCPL(pVM, pRegFrame) == 0)
     {
         /*
@@ -364 +362 @@
             return trpmGCExitTrap(pVM, VINF_EM_RAW_EMULATE_INSTR, pRegFrame);
 
-        /** @note monitor causes an #UD exception instead of #GP when not executed in ring 0. */
-        if (Cpu.pCurInstr->opcode == OP_ILLUD2)
+        if (    PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip)
+            &&  Cpu.pCurInstr->opcode == OP_ILLUD2)
         {
             rc = PATMGCHandleIllegalInstrTrap(pVM, pRegFrame);
@@ -371 +369 @@
                 return trpmGCExitTrap(pVM, rc, pRegFrame);
         }
-        /* Never generate a raw trap here; it might be a monitor instruction, that requires emulation. */
-        rc = VINF_EM_RAW_EMULATE_INSTR;
-    }
-    else if (pRegFrame->eflags.Bits.u1VM)
+        else
+        /** Note: monitor causes an #UD exception instead of #GP when not executed in ring 0. */
+        if (Cpu.pCurInstr->opcode == OP_MONITOR)
+        {
+            uint32_t cbIgnored;
+            rc = EMInterpretInstructionCPU(pVM, &Cpu, pRegFrame, PC, &cbIgnored);
+        }
+        else
+            /* Never generate a raw trap here; it might be an instruction, that requires emulation. */
+            rc = VINF_EM_RAW_EMULATE_INSTR;
+    }
+    else
+    if (pRegFrame->eflags.Bits.u1VM)
     {
         rc = TRPMForwardTrap(pVM, pRegFrame, 0x6, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_TRAP);
@@ -380 +387 @@
     }
     else
-        /* Never generate a raw trap here; it might be a monitor instruction, that requires emulation. */
+        /* Never generate a raw trap here; it might be an instruction, that requires emulation. */
         rc = VINF_EM_RAW_EMULATE_INSTR;