diff options
| author | 2020-06-28 12:37:50 -0400 | |
|---|---|---|
| committer | 2020-06-28 12:37:50 -0400 | |
| commit | b05795d704e0c194215f815a5703db09e524b59a (patch) | |
| tree | ecf4023b4ee0c91555c1d8263762fcb9dcb04a17 /src/common/wall_clock.cpp | |
| parent | Merge pull request #4196 from ogniK5377/nrr-nro-fixes (diff) | |
| parent | Core/Common: Address Feedback. (diff) | |
| download | yuzu-b05795d704e0c194215f815a5703db09e524b59a.tar.gz yuzu-b05795d704e0c194215f815a5703db09e524b59a.tar.xz yuzu-b05795d704e0c194215f815a5703db09e524b59a.zip | |
Merge pull request #3955 from FernandoS27/prometheus-2b
Remake Kernel Scheduling, CPU Management & Boot Management (Prometheus)
Diffstat (limited to 'src/common/wall_clock.cpp')
| -rw-r--r-- | src/common/wall_clock.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index d4d35f4e7..3afbdb898 100644 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp | |||
| @@ -53,6 +53,10 @@ public: | |||
| 53 | return Common::Divide128On32(temporary, 1000000000).first; | 53 | return Common::Divide128On32(temporary, 1000000000).first; |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | void Pause(bool is_paused) override { | ||
| 57 | // Do nothing in this clock type. | ||
| 58 | } | ||
| 59 | |||
| 56 | private: | 60 | private: |
| 57 | base_time_point start_time; | 61 | base_time_point start_time; |
| 58 | }; | 62 | }; |
| @@ -64,12 +68,7 @@ std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency, | |||
| 64 | const auto& caps = GetCPUCaps(); | 68 | const auto& caps = GetCPUCaps(); |
| 65 | u64 rtsc_frequency = 0; | 69 | u64 rtsc_frequency = 0; |
| 66 | if (caps.invariant_tsc) { | 70 | if (caps.invariant_tsc) { |
| 67 | if (caps.base_frequency != 0) { | 71 | rtsc_frequency = EstimateRDTSCFrequency(); |
| 68 | rtsc_frequency = static_cast<u64>(caps.base_frequency) * 1000000U; | ||
| 69 | } | ||
| 70 | if (rtsc_frequency == 0) { | ||
| 71 | rtsc_frequency = EstimateRDTSCFrequency(); | ||
| 72 | } | ||
| 73 | } | 72 | } |
| 74 | if (rtsc_frequency == 0) { | 73 | if (rtsc_frequency == 0) { |
| 75 | return std::make_unique<StandardWallClock>(emulated_cpu_frequency, | 74 | return std::make_unique<StandardWallClock>(emulated_cpu_frequency, |