Browse Source

core: hle: kernel: Use CurrentPhysicalCoreIndex as appropriate.

bunnei 5 years ago
parent
commit
2dfb07388a
1 changed files with 2 additions and 6 deletions
  1. 2 6
      src/core/hle/kernel/kernel.cpp

+ 2 - 6
src/core/hle/kernel/kernel.cpp

@@ -827,15 +827,11 @@ size_t KernelCore::CurrentPhysicalCoreIndex() const {
 }
 }
 
 
 Kernel::PhysicalCore& KernelCore::CurrentPhysicalCore() {
 Kernel::PhysicalCore& KernelCore::CurrentPhysicalCore() {
-    u32 core_id = impl->GetCurrentHostThreadID();
-    ASSERT(core_id < Core::Hardware::NUM_CPU_CORES);
-    return impl->cores[core_id];
+    return impl->cores[CurrentPhysicalCoreIndex()];
 }
 }
 
 
 const Kernel::PhysicalCore& KernelCore::CurrentPhysicalCore() const {
 const Kernel::PhysicalCore& KernelCore::CurrentPhysicalCore() const {
-    u32 core_id = impl->GetCurrentHostThreadID();
-    ASSERT(core_id < Core::Hardware::NUM_CPU_CORES);
-    return impl->cores[core_id];
+    return impl->cores[CurrentPhysicalCoreIndex()];
 }
 }
 
 
 Kernel::KScheduler* KernelCore::CurrentScheduler() {
 Kernel::KScheduler* KernelCore::CurrentScheduler() {