Changeset 2555 in vbox for trunk/src/VBox

Timestamp:

May 9, 2007 12:58:47 PM (18 years ago)

Author:

vboxsync

Message:

Added intercept code for rdtsc (not yet enabled).

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -184 +184 @@
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitInvd,      STAMTYPE_COUNTER, "/HWACCM/Exit/Instr/Invd",        STAMUNIT_OCCURENCES,    "Nr of occurances");
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitCpuid,     STAMTYPE_COUNTER, "/HWACCM/Exit/Instr/Cpuid",       STAMUNIT_OCCURENCES,    "Nr of occurances");
+    STAM_REG(pVM, &pVM->hwaccm.s.StatExitRdtsc,     STAMTYPE_COUNTER, "/HWACCM/Exit/Instr/Rdtsc",       STAMUNIT_OCCURENCES,    "Nr of occurances");
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitCRxWrite,  STAMTYPE_COUNTER, "/HWACCM/Exit/Instr/CRx/Write",   STAMUNIT_OCCURENCES,    "Nr of occurances");
     STAM_REG(pVM, &pVM->hwaccm.s.StatExitCRxRead,   STAMTYPE_COUNTER, "/HWACCM/Exit/Instr/CRx/Read",    STAMUNIT_OCCURENCES,    "Nr of occurances");

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -268 +268 @@
     STAMCOUNTER             StatExitInvd;
     STAMCOUNTER             StatExitCpuid;
+    STAMCOUNTER             StatExitRdtsc;
     STAMCOUNTER             StatExitCRxWrite;
     STAMCOUNTER             StatExitCRxRead;

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

@@ -1057 +1057 @@
     }
 
+    case SVM_EXIT_RDTSC:                /* Guest software attempted to execute RDTSC. */
+    {
+        Log2(("SVM: Rdtsc\n"));
+        STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitRdtsc);
+        rc = EMInterpretRdtsc(pVM, CPUMCTX2CORE(pCtx));
+        if (rc == VINF_SUCCESS)
+        {
+            /* Update EIP and continue execution. */
+            pCtx->eip += 2;             /** @note hardcoded opcode size! */
+            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+            goto ResumeExecution;
+        }
+        AssertMsgFailed(("EMU: rdtsc failed with %Vrc\n", rc));
+        rc = VINF_EM_RAW_EMULATE_INSTR;
+        break;
+    }
+
     case SVM_EXIT_INVLPG:               /* Guest software attempted to execute INVPG. */
     {

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

@@ -1411 +1411 @@
         {
             /* Update EIP and continue execution. */
+            Assert(cbInstr == 2);
             pCtx->eip += cbInstr;
             STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
@@ -1416 +1417 @@
         }
         AssertMsgFailed(("EMU: cpuid failed with %Vrc\n", rc));
+        rc = VINF_EM_RAW_EMULATE_INSTR;
+        break;
+    }
+
+    case VMX_EXIT_RDTSC:                /* 16 Guest software attempted to execute RDTSC. */
+    {
+        Log2(("VMX: Rdtsc\n"));
+        STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitRdtsc);
+        rc = EMInterpretRdtsc(pVM, CPUMCTX2CORE(pCtx));
+        if (rc == VINF_SUCCESS)
+        {
+            /* Update EIP and continue execution. */
+            Assert(cbInstr == 2);
+            pCtx->eip += cbInstr;
+            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+            goto ResumeExecution;
+        }
+        AssertMsgFailed(("EMU: rdtsc failed with %Vrc\n", rc));
         rc = VINF_EM_RAW_EMULATE_INSTR;
         break;
@@ -1686 +1705 @@
         break;
 
-    case VMX_EXIT_RDTSC:                /* 16 Guest software attempted to execute RDTSC. */
-        rc = VERR_EM_INTERNAL_ERROR;
-        AssertFailed(); /* we don't let it fault. */
-        break;
-
     case VMX_EXIT_RSM:                  /* 17 Guest software attempted to execute RSM in SMM. */
         AssertFailed(); /* can't happen. */
@@ -1711 +1725 @@
 
     case VMX_EXIT_CPUID:                /* 10 Guest software attempted to execute CPUID. */
+    case VMX_EXIT_RDTSC:                /* 16 Guest software attempted to execute RDTSC. */
     case VMX_EXIT_INVPG:                /* 14 Guest software attempted to execute INVPG. */
     case VMX_EXIT_CRX_MOVE:             /* 28 Control-register accesses. */