From 1f99f5473c7a03c791ea20256c7fc2f1caba8adc Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 19 Jan 2021 21:07:07 -0800
Subject: kernel: k_light_lock: Simplify EmuThreadHandle implementation.
---
src/core/hle/kernel/kernel.cpp | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
(limited to 'src/core/hle/kernel/kernel.cpp')
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 97a5dc2e0f..39d5122f54 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -237,20 +237,13 @@ struct KernelCore::Impl {
is_phantom_mode_for_singlecore = value;
}
- [[nodiscard]] Core::EmuThreadHandle GetCurrentEmuThreadID() {
- Core::EmuThreadHandle result = Core::EmuThreadHandle::InvalidHandle();
- result.host_handle = GetCurrentHostThreadID();
- if (result.host_handle >= Core::Hardware::NUM_CPU_CORES) {
- return result;
+ [[nodiscard]] EmuThreadHandle GetCurrentEmuThreadID() {
+ const auto thread_id = GetCurrentHostThreadID();
+ if (thread_id >= Core::Hardware::NUM_CPU_CORES) {
+ // Reserved value for HLE threads
+ return EmuThreadHandleReserved + (static_cast<u64>(thread_id) << 1);
}
- const Kernel::KScheduler& sched = cores[result.host_handle].Scheduler();
- const Kernel::KThread* current = sched.GetCurrentThread();
- if (current != nullptr && !IsPhantomModeForSingleCore()) {
- result.guest_handle = current->GetGlobalHandle();
- } else {
- result.guest_handle = InvalidHandle;
- }
- return result;
+ return reinterpret_cast<uintptr_t>(schedulers[thread_id].get());
}
void InitializeMemoryLayout() {
@@ -555,7 +548,7 @@ u32 KernelCore::GetCurrentHostThreadID() const {
return impl->GetCurrentHostThreadID();
}
-Core::EmuThreadHandle KernelCore::GetCurrentEmuThreadID() const {
+EmuThreadHandle KernelCore::GetCurrentEmuThreadID() const {
return impl->GetCurrentEmuThreadID();
}
--
cgit v1.2.3-70-g09d2