Просмотр исходного кода

svc: GetSystemTick should return cntpct_el0, not core ticks.

bunnei 6 лет назад
Родитель
Сommit
6eaf7ab55f
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      src/core/hle/kernel/svc.cpp

+ 3 - 1
src/core/hle/kernel/svc.cpp

@@ -1777,7 +1777,9 @@ static u64 GetSystemTick(Core::System& system) {
     LOG_TRACE(Kernel_SVC, "called");
     LOG_TRACE(Kernel_SVC, "called");
 
 
     auto& core_timing = system.CoreTiming();
     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.
     // Advance time to defeat dumb games that busy-wait for the frame to end.
     core_timing.AddTicks(400);
     core_timing.AddTicks(400);