Changeset 1164 in vbox

Timestamp:

Mar 2, 2007 2:50:04 PM (18 years ago)

Author:

vboxsync

Message:

Even more v86 corrections

File:

• trunk/src/VBox/VMM/EM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -1385 +1385 @@
                         cbUnit = Cpu.opmode == CPUMODE_32BIT ? 4 : 2;
 
-                    RTGCPTR GCPtrDst = pCtx->edi;
+                    RTGCPTR  GCPtrDst = pCtx->edi;
+                    uint32_t cpl = (pRegFrame->eflags.Bits.u1VM) ? 3 : (pCtx->ss & X86_SEL_RPL);
+
                     /* Access verification first; we can't recover from traps inside this instruction, as the port read cannot be repeated. */
                     rc = PGMVerifyAccess(pVM, GCPtrDst, cTransfers * cbUnit,
-                                         X86_PTE_RW | (((pCtx->ss & X86_SEL_RPL) == 3) ? X86_PTE_US : 0));
+                                         X86_PTE_RW | ((cpl == 3) ? X86_PTE_US : 0));
                     if (rc != VINF_SUCCESS)
                     {
@@ -1452 +1454 @@
                         cbUnit = Cpu.opmode == CPUMODE_32BIT ? 4 : 2;
 
-                    RTGCPTR GCPtrSrc = pCtx->esi;
+                    RTGCPTR  GCPtrSrc = pCtx->esi;
+                    uint32_t cpl = (pRegFrame->eflags.Bits.u1VM) ? 3 : (pCtx->ss & X86_SEL_RPL);
+
                     /* Access verification first; we currently can't recover properly from traps inside this instruction */
-                    rc = PGMVerifyAccess(pVM, GCPtrSrc, cTransfers * cbUnit, (((pCtx->ss & X86_SEL_RPL) == 3) ? X86_PTE_US : 0));
+                    rc = PGMVerifyAccess(pVM, GCPtrSrc, cTransfers * cbUnit, ((cpl == 3) ? X86_PTE_US : 0));
                     if (rc != VINF_SUCCESS)
                     {
@@ -1542 +1546 @@
     /** Scan kernel code that traps; we might not get another chance. */
     if (    (pCtx->ss & X86_SEL_RPL) <= 1
-        &&  pCtx->eflags.Bits.u1VM == 0)
+        &&  !pCtx->eflags.Bits.u1VM)
     {
         Assert(!PATMIsPatchGCAddr(pVM, pCtx->eip));
@@ -1955 +1959 @@
 #endif
         if (    (pCtx->ss & X86_SEL_RPL) == 0
+            &&  !pCtx->eflags.Bits.u1VM
             &&  SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid))
         {
@@ -2524 +2529 @@
          */
         if (    (pCtx->ss & X86_SEL_RPL) <= 1
-            &&  pCtx->eflags.Bits.u1VM == 0
+            &&  !pCtx->eflags.Bits.u1VM
             && !PATMIsPatchGCAddr(pVM, pCtx->eip))
         {
@@ -2888 +2893 @@
 
     unsigned uSS = pCtx->ss;
-    if ((uSS & X86_SEL_RPL) == 3)
+    if (    pCtx->eflags.Bits.u1VM 
+        ||  (uSS & X86_SEL_RPL) == 3)
     {
         if (!EMIsRawRing3Enabled(pVM))