summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-22 21:55:42 +0100
committerbunnei <bunneidev@gmail.com>2019-11-23 21:29:15 +0100
commit6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00 (patch)
treeda13cd439ea2b6a983b8e74f9f31b5f314e6cf79
parentMerge pull request #3114 from FernandoS27/cond-var (diff)
downloadyuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar.gz
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar.bz2
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar.lz
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar.xz
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.tar.zst
yuzu-6eaf7ab55f9ca6df9439d3e382d49faeb1dffe00.zip
-rw-r--r--src/core/hle/kernel/svc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 8c67ada43..04ca09482 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -1777,7 +1777,9 @@ static u64 GetSystemTick(Core::System& system) {
LOG_TRACE(Kernel_SVC, "called");
auto& core_timing = system.CoreTiming();
- const u64 result{core_timing.GetTicks()};
+
+ // Returns the value of cntpct_el0 (https://switchbrew.org/wiki/SVC#svcGetSystemTick)
+ const u64 result{Core::Timing::CpuCyclesToClockCycles(system.CoreTiming().GetTicks())};
// Advance time to defeat dumb games that busy-wait for the frame to end.
core_timing.AddTicks(400);