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

Timestamp:

Oct 14, 2008 2:26:42 PM (16 years ago)

Author:

vboxsync

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

37882

Message:

Lmsw emulation.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (2 diffs)
• EMInternal.h (modified) (2 diffs)
• VMMAll/EMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -226 +226 @@
     STAM_REG_USED(pVM, &pStats->StatR3StosWD,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was successfully interpreted.");
     STAM_REG_USED(pVM, &pStats->StatRZStosWD,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatRZWbInvd,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatR3WbInvd,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZWbInvd,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/WbInvd",     STAMUNIT_OCCURENCES,   "The number of times WBINVD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3WbInvd,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/WbInvd",     STAMUNIT_OCCURENCES,   "The number of times WBINVD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZLmsw,                 STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Lmsw",       STAMUNIT_OCCURENCES,   "The number of times LMSW was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Lmsw,                 STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Lmsw",       STAMUNIT_OCCURENCES,   "The number of times LMSW was successfully interpreted.");
 
     STAM_REG(pVM, &pStats->StatRZInterpretFailed,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");
@@ -278 +280 @@
     STAM_REG_USED(pVM, &pStats->StatRZFailedWrmsr,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
     STAM_REG_USED(pVM, &pStats->StatR3FailedWrmsr,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedLmsw,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Lmsw",       STAMUNIT_OCCURENCES,    "The number of times LMSW was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedLmsw,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Lmsw",       STAMUNIT_OCCURENCES,    "The number of times LMSW was not interpreted.");
 
     STAM_REG_USED(pVM, &pStats->StatRZFailedMisc,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Misc",       STAMUNIT_OCCURENCES,    "The number of times some misc instruction was encountered.");

trunk/src/VBox/VMM/EMInternal.h

@@ -146 +146 @@
     STAMCOUNTER             StatRZWbInvd;
     STAMCOUNTER             StatR3WbInvd;
+    STAMCOUNTER             StatRZLmsw;
+    STAMCOUNTER             StatR3Lmsw;
 
     STAMCOUNTER             StatRZInterpretFailed;
@@ -196 +198 @@
     STAMCOUNTER             StatRZFailedRdmsr;
     STAMCOUNTER             StatRZFailedWrmsr;
+    STAMCOUNTER             StatRZFailedLmsw;
+    STAMCOUNTER             StatR3FailedLmsw;
 
     STAMCOUNTER             StatRZFailedAdd;

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

@@ -420 +420 @@
         case OP_BTS:        return "Bts";
         case OP_BTC:        return "Btc";
+        case OP_LMSW:       return "Lmsw";
         case OP_CMPXCHG:    return pCpu->prefix & PREFIX_LOCK ? "Lock CmpXchg"   : "CmpXchg";
         case OP_CMPXCHG8B:  return pCpu->prefix & PREFIX_LOCK ? "Lock CmpXchg8b" : "CmpXchg8b";
@@ -1935 +1936 @@
 
     return CPUMSetGuestCR0(pVM, NewCr0);
+}
+
+/**
+ * LMSW Emulation.
+ */
+static int emInterpretLmsw(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+{
+    OP_PARAMVAL param1;
+    uint32_t    val;
+
+    int rc = DISQueryParamVal(pRegFrame, pCpu, &pCpu->param1, &param1, PARAM_SOURCE);
+    if(VBOX_FAILURE(rc))
+        return VERR_EM_INTERPRETER;
+
+    switch(param1.type)
+    {
+    case PARMTYPE_IMMEDIATE:
+    case PARMTYPE_ADDRESS:
+        if(!(param1.flags & (PARAM_VAL32|PARAM_VAL64)))
+            return VERR_EM_INTERPRETER;
+        val = param1.val.val32;
+        break;
+
+    default:
+        return VERR_EM_INTERPRETER;
+    }
+
+    LogFlow(("emInterpretLmsw %x\n", val));
+    return EMInterpretLMSW(pVM, val);
 }
 
@@ -2873 +2903 @@
         INTERPRET_CASE_EX_DUAL_PARAM2(OP_LGDT, LGdt, LIGdt);
 #endif
+        INTERPRET_CASE(OP_LMSW,Lmsw);
         INTERPRET_CASE(OP_CLTS,Clts);
         INTERPRET_CASE(OP_MONITOR, Monitor);