summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-08-07 07:45:18 +0200
committerbunnei <bunneidev@gmail.com>2021-12-07 01:39:16 +0100
commit669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154 (patch)
treec2c3228add0d937de938081d000f62b3d6e4d2d2 /src/core/hle/kernel/svc.cpp
parentMerge pull request #7529 from german77/sdl2.0.18 (diff)
downloadyuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar.gz
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar.bz2
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar.lz
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar.xz
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.tar.zst
yuzu-669a2d2c67bd9a3267286bc0c2e6e3c1dc98c154.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/svc.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index f0cd8471e..e5e879eb5 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -873,7 +873,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle
const u64 thread_ticks = current_thread->GetCpuTime();
out_ticks = thread_ticks + (core_timing.GetCPUTicks() - prev_ctx_ticks);
- } else if (same_thread && info_sub_id == system.CurrentCoreIndex()) {
+ } else if (same_thread && info_sub_id == system.Kernel().CurrentPhysicalCoreIndex()) {
out_ticks = core_timing.GetCPUTicks() - prev_ctx_ticks;
}
@@ -887,7 +887,8 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, Handle
return ResultInvalidHandle;
}
- if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id != system.CurrentCoreIndex()) {
+ if (info_sub_id != 0xFFFFFFFFFFFFFFFF &&
+ info_sub_id != system.Kernel().CurrentPhysicalCoreIndex()) {
LOG_ERROR(Kernel_SVC, "Core is not the current core, got {}", info_sub_id);
return ResultInvalidCombination;
}