Changeset 1160 in vbox for trunk

Timestamp:

Mar 2, 2007 2:37:51 PM (18 years ago)

Author:

vboxsync

Message:

Correction for v86 mode

Location:

trunk/src/VBox/VMM/VMMGC

Files:

• IOMGC.cpp (modified) (2 diffs)
• TRPMGCHandlers.cpp (modified) (2 diffs)

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

@@ -564 +564 @@
 
         /* Access verification first; we can't recover from traps inside this instruction, as the port read cannot be repeated. */
+        uint32_t cpl = (pRegFrame->eflags.Bits.u1VM) ? 3 : (pRegFrame->ss & X86_SEL_RPL);
         rc = PGMVerifyAccess(pVM, (RTGCUINTPTR)GCPtrDst, cTransfers * cbSize,
-                             X86_PTE_RW | (((pRegFrame->ss & X86_SEL_RPL) == 3) ? X86_PTE_US : 0));
+                             X86_PTE_RW | ((cpl == 3) ? X86_PTE_US : 0));
         if (rc != VINF_SUCCESS)
         {
@@ -668 +669 @@
 
         /* Access verification first; we currently can't recover properly from traps inside this instruction */
+        uint32_t cpl = (pRegFrame->eflags.Bits.u1VM) ? 3 : (pRegFrame->ss & X86_SEL_RPL);
         rc = PGMVerifyAccess(pVM, (RTGCUINTPTR)GCPtrSrc, cTransfers * cbSize,
-                             ((pRegFrame->ss & X86_SEL_RPL) == 3) ? X86_PTE_US : 0);
+                             (cpl == 3) ? X86_PTE_US : 0);
         if (rc != VINF_SUCCESS)
         {

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

@@ -311 +311 @@
      * Both PATM are using INT3s, let them have a go first.
      */
-    if ((pRegFrame->ss & X86_SEL_RPL) == 1)
+    if (    (pRegFrame->ss & X86_SEL_RPL) == 1 
+        &&  !pRegFrame->eflags.Bits.u1VM)
     {
         rc = PATMHandleInt3PatchTrap(pVM, pRegFrame);
@@ -341 +342 @@
 
     if (    (pRegFrame->ss & X86_SEL_RPL) == 1
+        &&  !pRegFrame->eflags.Bits.u1VM
         &&  PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
     {