JPikachu/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

kernel: k_light_lock: Simplify EmuThreadHandle implementation.

Browse source
This commit is contained in:
bunnei 2021-01-19 21:07:07 -08:00
parent c0f5830323
commit 1f99f5473c
5 changed files with 33 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/hle/kernel/kernel.cpp
View file

@ -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();
}