Changeset 468 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2007 3:20:06 PM (18 years ago)

Author:

vboxsync

Message:

Moved rdtsc emulation into EM.

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/EMInternal.h

@@ -125 +125 @@
     STAMCOUNTER             StatGCAdc;
     STAMCOUNTER             StatHCAdc;
+    STAMCOUNTER             StatGCRdtsc;
 
     STAMCOUNTER             StatGCInterpretFailed;
@@ -188 +189 @@
     STAMCOUNTER             StatGCFailedWbInvd;
     STAMCOUNTER             StatHCFailedWbInvd;
+    STAMCOUNTER             StatGCFailedRdtsc;
 
     STAMCOUNTER             StatGCFailedUserMode;

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

@@ -36 +36 @@
 #include <VBox/vm.h>
 #include <VBox/hwaccm.h>
+#include <VBox/tm.h>
 
 #include <VBox/param.h>
@@ -1715 +1716 @@
 }
 
+#ifdef IN_GC
+/**
+ * RDTSC Emulation.
+ */
+static int emInterpretRdtsc(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+{
+    unsigned uCR4 = CPUMGetGuestCR4(pVM);
+
+    if (uCR4 & X86_CR4_TSD)
+        return VERR_EM_INTERPRETER; /* genuine #GP */
+
+    uint64_t uTicks = TMCpuTickGet(pVM);
+
+    pRegFrame->eax = uTicks;
+    pRegFrame->edx = (uTicks >> 32ULL);
+
+    return VINF_SUCCESS;
+}
+#endif
 
 /**
@@ -1827 +1847 @@
         INTERPRET_CASE(OP_SUB,Sub);
 #ifdef IN_GC
+        INTERPRET_CASE(OP_RDTSC,Rdtsc);
         INTERPRET_CASE(OP_STI,Sti);
 #endif

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -561 +561 @@
         case OP_LLDT:
         case OP_STI:
+        case OP_RDTSC:
         {
             uint32_t cbIgnored;
@@ -569 +570 @@
                 rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;
             return trpmGCExitTrap(pVM, rc, pRegFrame);
-        }
-
-        case OP_RDTSC:
-        {
-            unsigned uCR4 = CPUMGetGuestCR4(pVM);
-
-            if (uCR4 & X86_CR4_TSD)
-                break; /* genuine #GP */
-
-            uint64_t uTicks = TMCpuTickGet(pVM);
-
-            pRegFrame->eax = uTicks;
-            pRegFrame->edx = (uTicks >> 32ULL);
-
-            pRegFrame->eip += pCpu->opsize;
-            return trpmGCExitTrap(pVM, VINF_SUCCESS, pRegFrame);
         }
     }