Changeset 1057 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 23, 2007 8:38:37 PM (18 years ago)

Author:

vboxsync

Message:

Trapping and virtualizing TSC (both disabled).

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• TMAll.cpp (modified) (1 diff)
• TMAllCpu.cpp (modified) (6 diffs)
• TMAllVirtual.cpp (modified) (2 diffs)

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

@@ -609 +609 @@
 
         case TMCLOCK_TSC:
-        {
-            PCSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
-            if (pGip)
-                return SUPGetCpuHzFromGIP(pGip) ;
-            return pTimer->CTXALLSUFF(pVM)->tm.s.cTSCTicksPerSecond;
-        }
+            return TMCpuTicksPerSecond(pTimer->CTXALLSUFF(pVM));
 
         default:

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

@@ -28 +28 @@
 #include "TMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/sup.h>
 
 #include <VBox/param.h>
@@ -33 +34 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
+
+
+/**
+ * Gets the raw cpu tick from current virtual time.
+ */
+DECLINLINE(uint64_t) tmCpuTickGetRawVirtual(PVM pVM)
+{
+    uint64_t u64 = TMVirtualGet(pVM);
+    /** @todo calc tsc from virtual time. */
+    return u64;
+}
 
 
@@ -46 +58 @@
     {
         pVM->tm.s.fTSCTicking = true;
-#ifndef TM_REAL_CPU_TICK
-        pVM->tm.s.u64TSCOffset = ASMReadTSC() - pVM->tm.s.u64TSC;
-#endif
+        if (pVM->tm.s.fTSCVirtualized)
+        {
+            if (pVM->tm.s.fTSCUseRealTSC)
+                pVM->tm.s.u64TSCOffset = ASMReadTSC() - pVM->tm.s.u64TSC;
+            else
+                pVM->tm.s.u64TSCOffset = tmCpuTickGetRawVirtual(pVM) - pVM->tm.s.u64TSC;
+        }
         return VINF_SUCCESS;
     }
@@ -66 +82 @@
     if (pVM->tm.s.fTSCTicking)
     {
-#ifndef TM_REAL_CPU_TICK
-        pVM->tm.s.u64TSC = ASMReadTSC() - pVM->tm.s.u64TSCOffset;
-#endif
+        if (!pVM->tm.s.fTSCVirtualized)
+        {
+            if (pVM->tm.s.fTSCUseRealTSC)
+                pVM->tm.s.u64TSC = ASMReadTSC() - pVM->tm.s.u64TSCOffset;
+            else
+                pVM->tm.s.u64TSC = tmCpuTickGetRawVirtual(pVM) - pVM->tm.s.u64TSCOffset;
+        }
         pVM->tm.s.fTSCTicking = false;
         return VINF_SUCCESS;
@@ -86 +106 @@
 TMDECL(uint64_t) TMCpuTickGet(PVM pVM)
 {
-#ifdef TM_REAL_CPU_TICK
-    return ASMReadTSC();
-#else
-    if (pVM->tm.s.fTSCTicking)
-        return ASMReadTSC() - pVM->tm.s.u64TSCOffset;
-    return pVM->tm.s.u64TSC;
-#endif
+    uint64_t u64;
+    if (pVM->tm.s.fTSCUseRealTSC)
+        u64 = ASMReadTSC();
+    else
+    {
+        if (pVM->tm.s.fTSCTicking)
+        {
+            if (pVM->tm.s.fTSCUseRealTSC)
+                u64 = ASMReadTSC() - pVM->tm.s.u64TSCOffset;
+            else
+                u64 = tmCpuTickGetRawVirtual(pVM) - pVM->tm.s.u64TSCOffset;
+        }
+        else
+            u64 = pVM->tm.s.u64TSC;
+    }
+    return u64;
 }
 
@@ -119 +148 @@
 TMDECL(uint64_t) TMCpuTicksPerSecond(PVM pVM)
 {
+    if (pVM->tm.s.fTSCUseRealTSC)
+    {
+        uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGIP(g_pSUPGlobalInfoPage);
+        if (RT_LIKELY(cTSCTicksPerSecond != ~(uint64_t)0))
+            return cTSCTicksPerSecond;
+    }
     return pVM->tm.s.cTSCTicksPerSecond;
 }

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

@@ -372 +372 @@
         int rc = TMVirtualPause(pVM);
         AssertRCReturn(rc, rc);
+        rc = TMCpuTickPause(pVM);
+        AssertRCReturn(rc, rc);
     }
 
@@ -383 +385 @@
         int rc = TMVirtualResume(pVM);
         AssertRCReturn(rc, rc);
+        rc = TMCpuTickResume(pVM);
+        AssertRCReturn(rc, rc);
     }