Changeset 11424

Timestamp:

08/14/08 15:46:06 (3 months ago)

Author:

vboxsync

Message:

Emulate stosw/d/q ourselves.

Files:

• trunk/include/VBox/cpum.h (modified) (18 diffs)
• trunk/src/VBox/VMM/EM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/EMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (4 diffs)

trunk/include/VBox/cpum.h

@@ -90 +90 @@
-    union
-    {
+        uint16_t        di;
-        uint32_t        edi;
-        uint64_t        rdi;
@@ -95 +96 @@
-    union
-    {
+        uint16_t        si;
-        uint32_t        esi;
-        uint64_t        rsi;
@@ -100 +102 @@
-    union
-    {
+        uint16_t        bp;
-        uint32_t        ebp;
-        uint64_t        rbp;
@@ -105 +108 @@
-    union
-    {
+        uint16_t        ax;
-        uint32_t        eax;
-        uint64_t        rax;
@@ -110 +114 @@
-    union
-    {
+        uint16_t        bx;
-        uint32_t        ebx;
-        uint64_t        rbx;
@@ -115 +120 @@
-    union
-    {
+        uint16_t        dx;
-        uint32_t        edx;
-        uint64_t        rdx;
@@ -120 +126 @@
-    union
-    {
+        uint16_t        cx;
-        uint32_t        ecx;
-        uint64_t        rcx;
@@ -125 +132 @@
-    union
-    {
+        uint16_t        sp;
-        uint32_t        esp;
-        uint64_t        rsp;
@@ -151 +159 @@
-    union
-    {
+        uint16_t        ip;
-        uint32_t        eip;
-        uint64_t        rip;
@@ -193 +202 @@
-    union
-    {
+        uint16_t        di;
-        uint32_t        edi;
-        uint64_t        rdi;
@@ -198 +208 @@
-    union
-    {
+        uint16_t        si;
-        uint32_t        esi;
-        uint64_t        rsi;
@@ -203 +214 @@
-    union
-    {
+        uint16_t        bp;
-        uint32_t        ebp;
-        uint64_t        rbp;
@@ -208 +220 @@
-    union
-    {
+        uint16_t        ax;
-        uint32_t        eax;
-        uint64_t        rax;
@@ -213 +226 @@
-    union
-    {
+        uint16_t        bx;
-        uint32_t        ebx;
-        uint64_t        rbx;
@@ -218 +232 @@
-    union
-    {
+        uint16_t        dx;
-        uint32_t        edx;
-        uint64_t        rdx;
@@ -223 +238 @@
-    union
-    {
+        uint16_t        cx;
-        uint32_t        ecx;
-        uint64_t        rcx;
@@ -228 +244 @@
-    union
-    {
+        uint16_t        sp;
-        uint32_t        esp;
-        uint64_t        rsp;
@@ -254 +271 @@
-    union
-    {
+        uint16_t        ip;
-        uint32_t        eip;
-        uint64_t        rip;

trunk/src/VBox/VMM/EM.cpp

@@ -213 +213 @@
-    STAM_REG_USED(pVM, &pStats->StatHCWrmsr,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCWrmsr,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatHCStosWD,               STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatGCStosWD,               STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
-
-    STAM_REG(pVM, &pStats->StatGCInterpretFailed,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");

trunk/src/VBox/VMM/EMInternal.h

@@ -141 +141 @@
-    STAMCOUNTER             StatGCClts;
-    STAMCOUNTER             StatHCClts;
+    STAMCOUNTER             StatGCStosWD;
+    STAMCOUNTER             StatHCStosWD;
-    STAMCOUNTER             StatHCRdmsr;
-    STAMCOUNTER             StatHCWrmsr;

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

@@ -1301 +1301 @@
-    return VERR_EM_INTERPRETER;
-}
+
+#ifndef IN_GC
+/*
+ * [REP] STOSWD emulation
+ *
+ */
+static int emInterpretStosWD(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+{
+    int      rc;
+    RTGCPTR  GCDest, GCOffset;
+    uint32_t cbSize;
+    uint64_t cTransfers;
+
+    /* Don't support any but these three prefix bytes. */
+    if ((pCpu->prefix & ~(PREFIX_ADDRSIZE|PREFIX_OPSIZE|PREFIX_REP|PREFIX_REX)))
+        return VERR_EM_INTERPRETER;
+
+    switch (pCpu->addrmode)
+    {
+    case CPUMODE_16BIT:
+        GCOffset   = pRegFrame->di;
+        cTransfers = pRegFrame->cx;
+        break;
+    case CPUMODE_32BIT:
+        GCOffset   = pRegFrame->edi;
+        cTransfers = pRegFrame->ecx;
+        break;
+    case CPUMODE_64BIT:
+        GCOffset   = pRegFrame->rdi;
+        cTransfers = pRegFrame->rcx;
+        break;
+    default:
+        AssertFailed();
+        return VERR_EM_INTERPRETER;
+    }
+
+    GCDest = SELMToFlat(pVM, DIS_SELREG_ES, pRegFrame, GCOffset);
+    switch (pCpu->opmode)
+    {
+    case CPUMODE_16BIT:
+        cbSize = 2;
+        break;
+    case CPUMODE_32BIT:
+        cbSize = 4;
+        break;
+    case CPUMODE_64BIT:
+        cbSize = 8;
+        break;
+    default:
+        AssertFailed();
+        return VERR_EM_INTERPRETER;
+    }
+
+    LogFlow(("emInterpretStosWD dest=%VGv cbSize=%d\n", GCDest, cbSize));
+
+    if (!(pCpu->prefix & PREFIX_REP))
+    {
+        rc = PGMPhysWriteGCPtrSafe(pVM, GCDest, &pRegFrame->rax, cbSize);
+        if (VBOX_FAILURE(rc))
+            return VERR_EM_INTERPRETER;
+        Assert(rc == VINF_SUCCESS);
+    }
+    else
+    {    
+        /* REP case */
+        while (cTransfers)
+        {
+            rc = PGMPhysWriteGCPtrSafe(pVM, GCDest, &pRegFrame->rax, cbSize);
+            if (VBOX_FAILURE(rc))
+            {
+                rc = VERR_EM_INTERPRETER;
+                break;
+            }
+
+            Assert(rc == VINF_SUCCESS);
+            GCOffset += cbSize;
+            GCDest   += cbSize;
+            cTransfers--;
+        }
+
+        /* Update the registers. */
+        switch (pCpu->addrmode)
+        {
+        case CPUMODE_16BIT:
+            pRegFrame->di = GCOffset;
+            pRegFrame->cx = cTransfers;
+            break;
+        case CPUMODE_32BIT:
+            pRegFrame->edi = GCOffset;
+            pRegFrame->ecx = cTransfers;
+            break;
+        case CPUMODE_64BIT:
+            pRegFrame->rdi = GCOffset;
+            pRegFrame->rcx = cTransfers;
+            break;
+        }
+    }
+
+    *pcbSize = cbSize;
+    return rc;
+}
+#endif
+
-
-/*
@@ -2531 +2634 @@
-       )
-#else
-
+
+
+
+
-        ||  (   (pCpu->prefix & PREFIX_LOCK)
-             && pCpu->pCurInstr->opcode != OP_OR
@@ -2594 +2700 @@
-        INTERPRET_CASE_EX_PARAM3(OP_AND,And, OrXorAnd, EMEmulateAnd);
-        INTERPRET_CASE(OP_MOV,Mov);
+#ifndef IN_GC
+        INTERPRET_CASE(OP_STOSWD,StosWD);
+#endif
-        INTERPRET_CASE(OP_INVLPG,InvlPg);
-        INTERPRET_CASE(OP_CPUID,CpuId);
@@ -2626 +2735 @@
-#endif
-        INTERPRET_STAT_CASE(OP_MOVNTPS,MovNTPS);
-        INTERPRET_STAT_CASE(OP_STOSWD,StosWD);
-        INTERPRET_STAT_CASE(OP_WBINVD,WbInvd);
-#endif