Changeset 72522 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 12, 2018 8:45:27 AM (6 years ago)

Author:

vboxsync

Message:

NEM,TM: Work on TSC and NEM/win. bugref:9044 [=>office]

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3Native-win.cpp (modified) (1 diff)
• TM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -27 +27 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_NEM
+#define VMCPU_INCL_CPUM_GST_CTX
 #include <iprt/nt/nt-and-windows.h>
 #include <iprt/nt/hyperv.h>

trunk/src/VBox/VMM/VMMR3/TM.cpp

@@ -436 +436 @@
                           pVM->tm.s.cTSCTicksPerSecond);
     else
-    {
         pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
-    }
 
     /** @cfgm{/TM/TSCTiedToExecution, bool, false}
@@ -1197 +1195 @@
     VM_ASSERT_EMT0(pVM);
     uint64_t offTscRawSrc;
-    if (pVM->tm.s.enmTSCMode == TMTSCMODE_REAL_TSC_OFFSET)
-        offTscRawSrc = SUPReadTsc();
-    else
-    {
-        offTscRawSrc = TMVirtualSyncGetNoCheck(pVM);
-        offTscRawSrc = ASMMultU64ByU32DivByU32(offTscRawSrc, pVM->tm.s.cTSCTicksPerSecond, TMCLOCK_FREQ_VIRTUAL);
+    switch (pVM->tm.s.enmTSCMode)
+    {
+        case TMTSCMODE_REAL_TSC_OFFSET:
+            offTscRawSrc = SUPReadTsc();
+            break;
+        case TMTSCMODE_DYNAMIC:
+        case TMTSCMODE_VIRT_TSC_EMULATED:
+            offTscRawSrc = TMVirtualSyncGetNoCheck(pVM);
+            offTscRawSrc = ASMMultU64ByU32DivByU32(offTscRawSrc, pVM->tm.s.cTSCTicksPerSecond, TMCLOCK_FREQ_VIRTUAL);
+            break;
+        case TMTSCMODE_NATIVE_API:
+            /** @todo NEM TSC reset on reset for Windows8+ bug workaround. */
+            offTscRawSrc = 0;
+            break;
+        default:
+            AssertFailedBreakStmt(offTscRawSrc = 0);
     }
     for (VMCPUID iCpu = 0; iCpu < pVM->cCpus; iCpu++)
@@ -3305 +3313 @@
     AssertPtr(pVM); Assert(pVM->tm.s.fTSCModeSwitchAllowed); NOREF(pVCpuEmt); NOREF(pvData);
     Assert(pVM->tm.s.enmTSCMode != TMTSCMODE_REAL_TSC_OFFSET);
+    Assert(pVM->tm.s.enmTSCMode != TMTSCMODE_NATIVE_API); /** @todo figure out NEM/win and paravirt */
     Assert(tmR3HasFixedTSC(pVM));
 
@@ -3584 +3593 @@
                 pHlp->pfnPrintf(pHlp, "\n          offset %RU64", pVCpu->tm.s.offTSCRawSrc);
         }
+        else if (pVM->tm.s.enmTSCMode == TMTSCMODE_NATIVE_API)
+            pHlp->pfnPrintf(pHlp, " - native api");
         else
             pHlp->pfnPrintf(pHlp, " - virtual clock");
@@ -3638 +3649 @@
         case TMTSCMODE_VIRT_TSC_EMULATED:  return "VirtTscEmulated";
         case TMTSCMODE_DYNAMIC:            return "Dynamic";
+        case TMTSCMODE_NATIVE_API:         return "NativeApi";
         default:                           return "???";
     }