Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

kernel/thread: Remove global GetCurrentThread()

Browse source 
This is only used in one place, so we can fold it into the calling code,
eliminating a place for the global system instance to be used.
This commit is contained in:
Lioncash 2020-07-15 13:13:31 -04:00
parent 263200f982
commit 4ad69ca96e
3 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/handle_table.cpp
View file

@ -8,6 +8,7 @@
#include "core/core.h" #include "core/core.h"
#include "core/hle/kernel/errors.h" #include "core/hle/kernel/errors.h"
#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
@ -103,7 +104,7 @@ bool HandleTable::IsValid(Handle handle) const {
std::shared_ptr<Object> HandleTable::GetGeneric(Handle handle) const { std::shared_ptr<Object> HandleTable::GetGeneric(Handle handle) const {
if (handle == CurrentThread) { if (handle == CurrentThread) {
return SharedFrom(GetCurrentThread()); return SharedFrom(Core::System::GetInstance().CurrentScheduler().GetCurrentThread());
} else if (handle == CurrentProcess) { } else if (handle == CurrentProcess) {
return SharedFrom(Core::System::GetInstance().CurrentProcess()); return SharedFrom(Core::System::GetInstance().CurrentProcess());
} }

22
src/core/hle/kernel/thread.cpp
View file

@ -13,16 +13,8 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/thread_queue_list.h" #include "common/thread_queue_list.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
#ifdef ARCHITECTURE_x86_64
#include "core/arm/dynarmic/arm_dynarmic_32.h"
#include "core/arm/dynarmic/arm_dynarmic_64.h"
#endif
#include "core/arm/cpu_interrupt_handler.h"
#include "core/arm/exclusive_monitor.h"
#include "core/arm/unicorn/arm_unicorn.h" #include "core/arm/unicorn/arm_unicorn.h"
#include "core/core.h" #include "core/core.h"
#include "core/core_timing.h"
#include "core/core_timing_util.h"
#include "core/cpu_manager.h" #include "core/cpu_manager.h"
#include "core/hardware_properties.h" #include "core/hardware_properties.h"
#include "core/hle/kernel/errors.h" #include "core/hle/kernel/errors.h"
@ -36,6 +28,11 @@
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/memory.h" #include "core/memory.h"
#ifdef ARCHITECTURE_x86_64
#include "core/arm/dynarmic/arm_dynarmic_32.h"
#include "core/arm/dynarmic/arm_dynarmic_64.h"
#endif
namespace Kernel { namespace Kernel {
bool Thread::ShouldWait(const Thread* thread) const { bool Thread::ShouldWait(const Thread* thread) const {
@ -540,13 +537,4 @@ ResultCode Thread::SetCoreAndAffinityMask(s32 new_core, u64 new_affinity_mask) {
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Gets the current thread
*/
Thread* GetCurrentThread() {
return Core::System::GetInstance().CurrentScheduler().GetCurrentThread();
}
} // namespace Kernel } // namespace Kernel

5
src/core/hle/kernel/thread.h
View file

@ -680,9 +680,4 @@ private:
std::string name; std::string name;
}; };
/**
* Gets the current thread
*/
Thread* GetCurrentThread();
} // namespace Kernel } // namespace Kernel