diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-09 12:59:35 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-09 12:59:35 -0500 |
| commit | 6ae12424df58f0ea171fc75ca4b700ab1fffc192 (patch) | |
| tree | 93d87f3cb19d08541c6b8f8a9e0ceb730a2b13d9 /src/core/hle/kernel/kernel.cpp | |
| parent | 86e07124adcbe0ec8f35740d3ac2d516dc07f771 (diff) | |
| parent | 78ea76e12f22495b3b726a19147b60b2eaf50a9d (diff) | |
Merge pull request #444 from yuriks/handle-reform2
Kernel Lifetime Reform Pt. 2
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 391e833c01..a1bc6c5d83 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -6,6 +6,7 @@ #include "common/common.h" +#include "core/arm/arm_interface.h" #include "core/core.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/thread.h" @@ -13,7 +14,7 @@ namespace Kernel { -Handle g_main_thread = 0; +Thread* g_main_thread = nullptr; HandleTable g_handle_table; u64 g_program_id = 0; @@ -80,8 +81,7 @@ bool HandleTable::IsValid(Handle handle) const { Object* HandleTable::GetGeneric(Handle handle) const { if (handle == CurrentThread) { - // TODO(yuriks) Directly return the pointer once this is possible. - handle = GetCurrentThreadHandle(); + return GetCurrentThread(); } else if (handle == CurrentProcess) { LOG_ERROR(Kernel, "Current process (%08X) pseudo-handle not supported", CurrentProcess); return nullptr; |