Changeset 11488 in vbox

Timestamp:

Aug 19, 2008 2:24:46 PM (17 years ago)

Author:

vboxsync

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

34985

Message:

stoswd emulation fix (DF).

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1365 +1365 @@
     else
     {    
+        int offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cbSize : (signed)cbSize;
+
+        if (!cTransfers) 
+            return VINF_SUCCESS;
+
         /* Access verification first; we currently can't recover properly from traps inside this instruction */
-        rc = PGMVerifyAccess(pVM, GCDest, cTransfers * cbSize, X86_PTE_RW | X86_PTE_US);
+        rc = PGMVerifyAccess(pVM, GCDest - (offIncrement > 0) ? 0 : ((cTransfers-1) * cbSize), cTransfers * cbSize, X86_PTE_RW | X86_PTE_US);
         if (rc != VINF_SUCCESS)
         {
@@ -1384 +1389 @@
 
             Assert(rc == VINF_SUCCESS);
-            GCOffset += cbSize;
-            GCDest   += cbSize;
+            GCOffset += offIncrement;
+            GCDest   += offIncrement;
             cTransfers--;
         }

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1186 +1186 @@
         /* Two options here:
          * - external interrupt pending, but masked by the TPR value.
-         *   -> CR8 updates that lower the TPR value to below the current value should cause an exit
+         *   -> a CR8 update that lower the current TPR value should cause an exit
          * - no pending interrupts
          *   -> We don't need to be explicitely notified. There are enough world switches for detecting pending interrupts.