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

Timestamp:

Aug 18, 2009 4:12:18 PM (15 years ago)

Author:

vboxsync

Message:

Deal with small memsets in 64 bits mode too (pgm pool access handler)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (4 diffs)

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

@@ -961 +961 @@
                                           PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, RTGCPTR pvFault)
 {
-    Assert(pDis->mode == CPUMODE_32BIT);
+    unsigned uIncrement;
+
+    Assert(pDis->mode == CPUMODE_32BIT || pDis->mode == CPUMODE_64BIT);
+    Assert(pRegFrame->rcx <= 0x20);
+
+    if (pDis->mode == CPUMODE_32BIT)
+        uIncrement = 4;
+    else
+        uIncrement = 8;
 
     Log3(("pgmPoolAccessHandlerSTOSD\n"));
@@ -980 +988 @@
     PVMCPU      pVCpu = VMMGetCpu(pPool->CTX_SUFF(pVM));
     RTGCUINTPTR pu32 = (RTGCUINTPTR)pvFault;
-    while (pRegFrame->ecx)
+    while (pRegFrame->rcx)
     {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -992 +1000 @@
         *(uint32_t *)pu32 = pRegFrame->eax;
 #else
-        PGMPhysSimpleWriteGCPhys(pVM, GCPhysFault, &pRegFrame->eax, 4);
-#endif
-        pu32           += 4;
-        GCPhysFault    += 4;
-        pRegFrame->edi += 4;
-        pRegFrame->ecx--;
+        PGMPhysSimpleWriteGCPhys(pVM, GCPhysFault, &pRegFrame->rax, uIncrement);
+#endif
+        pu32           += uIncrement;
+        GCPhysFault    += uIncrement;
+        pRegFrame->rdi += uIncrement;
+        pRegFrame->rcx--;
     }
     pRegFrame->rip += pDis->opsize;
@@ -1155 +1163 @@
         if (    pDis->pCurInstr->opcode == OP_STOSWD
             &&  CPUMGetGuestCPL(pVCpu, pRegFrame) == 0
-            &&  pRegFrame->ecx <= 0x20
-            &&  pRegFrame->ecx * 4 <= PAGE_SIZE - ((uintptr_t)pvFault & PAGE_OFFSET_MASK)
-            &&  !((uintptr_t)pvFault & 3)
-            &&  (pRegFrame->eax == 0 || pRegFrame->eax == 0x80) /* the two values observed. */
-            &&  pDis->mode == CPUMODE_32BIT
-            &&  pDis->opmode == CPUMODE_32BIT
-            &&  pDis->addrmode == CPUMODE_32BIT
             &&  pDis->prefix == PREFIX_REP
             &&  !pRegFrame->eflags.Bits.u1DF
-            )
-        {
-             rc = pgmPoolAccessHandlerSTOSD(pVM, pPool, pPage, pDis, pRegFrame, GCPhysFault, pvFault);
-             STAM_PROFILE_STOP_EX(&pVM->pgm.s.CTX_SUFF(pPool)->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,RepStosd), a);
-             pgmUnlock(pVM);
-             return rc;
+            &&  pDis->opmode == pDis->mode
+            &&  pDis->addrmode == pDis->mode)
+        {
+            bool fValidStosd = false;
+
+            if (    pDis->mode == CPUMODE_32BIT
+                &&  pRegFrame->ecx <= 0x20
+                &&  pRegFrame->ecx * 4 <= PAGE_SIZE - ((uintptr_t)pvFault & PAGE_OFFSET_MASK)
+                &&  !((uintptr_t)pvFault & 3)
+                &&  (pRegFrame->eax == 0 || pRegFrame->eax == 0x80) /* the two values observed. */
+                )
+            {
+                fValidStosd = true;
+                pRegFrame->rcx &= 0xffffffff;   /* paranoia */
+            }
+            else
+            if (    pDis->mode == CPUMODE_64BIT
+                &&  pRegFrame->rcx <= 0x20
+                &&  pRegFrame->rcx * 4 <= PAGE_SIZE - ((uintptr_t)pvFault & PAGE_OFFSET_MASK)
+                &&  !((uintptr_t)pvFault & 3)
+                &&  (pRegFrame->rax == 0 || pRegFrame->rax == 0x80) /* the two values observed. */
+                )
+            {
+                fValidStosd = true;
+            }
+
+            if (fValidStosd)
+            {
+                rc = pgmPoolAccessHandlerSTOSD(pVM, pPool, pPage, pDis, pRegFrame, GCPhysFault, pvFault);
+                STAM_PROFILE_STOP_EX(&pVM->pgm.s.CTX_SUFF(pPool)->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,RepStosd), a);
+                pgmUnlock(pVM);
+                return rc;
+            }
         }