From 7b3452c7303cf348377de6702ddda0307533663c Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Mon, 22 Dec 2014 04:30:09 -0200
Subject: Move ThreadContext to core/core.h and deal with the fallout

---
 src/core/hle/kernel/kernel.cpp | 1 +
 1 file changed, 1 insertion(+)

(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 391e833c0..1537702cf 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"
-- 
cgit v1.2.3


From ba72208cd4905410eab8b996da0fa05fd05c72ff Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Mon, 22 Dec 2014 04:32:03 -0200
Subject: Kernel: Move Thread's definition to the header file

---
 src/core/hle/kernel/kernel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 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 1537702cf..5dfc41bab 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -81,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;
-- 
cgit v1.2.3


From 9bf8462b96d34b30f62b8aca745dd558e7f0a450 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Mon, 22 Dec 2014 11:07:22 -0200
Subject: Thread: Reduce use of Handles and move some funcs to inside the
 class.

---
 src/core/hle/kernel/kernel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 5dfc41bab..a1bc6c5d8 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -14,7 +14,7 @@
 
 namespace Kernel {
 
-Handle g_main_thread = 0;
+Thread* g_main_thread = nullptr;
 HandleTable g_handle_table;
 u64 g_program_id = 0;
 
-- 
cgit v1.2.3