aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-01-28 20:04:24 -0500
committerGitHub <noreply@github.com>2022-01-28 20:04:24 -0500
commit11099dda2e2ab67ba4861d1e927afaa2ccce1efa (patch)
treed89af13af3a1538f9fe676cdf58a3baec7a22fb0
parent64a68ccbb4ec533ba2ff378c60ff62c7be6315e9 (diff)
parente4c63d432de1805a97a6586e6610cf35f3b11889 (diff)
Merge pull request #7791 from german77/wall_clock
wall_clock: Use standard wall clock if rtsc frequency is too low
-rw-r--r--src/common/wall_clock.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp
index 49830b8ab6..ffa282e888 100644
--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@@ -72,7 +72,9 @@ std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency,
if (caps.invariant_tsc) {
rtsc_frequency = EstimateRDTSCFrequency();
}
- if (rtsc_frequency == 0) {
+
+ // Fallback to StandardWallClock if rtsc period is higher than a nano second
+ if (rtsc_frequency <= 1000000000) {
return std::make_unique<StandardWallClock>(emulated_cpu_frequency,
emulated_clock_frequency);
} else {