Changeset 11492 in vbox for trunk

Timestamp:

Aug 19, 2008 3:44:24 PM (17 years ago)

Author:

vboxsync

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

34992

Message:

Fixed the non-rep stoswd case (rdi must be updated).

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

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

@@ -1313 +1313 @@
     uint32_t cbSize;
     uint64_t cTransfers;
+    int      offIncrement;
 
     /* Don't support any but these three prefix bytes. */
@@ -1354 +1355 @@
     }
 
-    LogFlow(("emInterpretStosWD dest=%VGv cbSize=%d\n", GCDest, cbSize));
+    offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cbSize : (signed)cbSize;
 
     if (!(pCpu->prefix & PREFIX_REP))
     {
+        LogFlow(("emInterpretStosWD dest=%04X:%VGv (%VGv) cbSize=%d\n", pRegFrame->es, GCOffset, GCDest, cbSize));
+
         rc = PGMPhysWriteGCPtrSafe(pVM, GCDest, &pRegFrame->rax, cbSize);
         if (VBOX_FAILURE(rc))
             return VERR_EM_INTERPRETER;
         Assert(rc == VINF_SUCCESS);
+
+        /* Update (e/r)di. */
+        switch (pCpu->addrmode)
+        {
+        case CPUMODE_16BIT:
+            pRegFrame->di  += offIncrement;
+            break;
+        case CPUMODE_32BIT:
+            pRegFrame->edi += offIncrement;
+            break;
+        case CPUMODE_64BIT:
+            pRegFrame->rdi += offIncrement;
+            break;
+        }
+
     }
     else
     {    
-        int offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cbSize : (signed)cbSize;
-
         if (!cTransfers) 
             return VINF_SUCCESS;
+
+        LogFlow(("emInterpretStosWD dest=%04X:%VGv (%VGv) cbSize=%d cTransfers=%x DF=%d\n", pRegFrame->es, GCOffset, GCDest, cbSize, cTransfers, pRegFrame->eflags.Bits.u1DF));
 
         /* Access verification first; we currently can't recover properly from traps inside this instruction */