summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/handle_table.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-07-15 19:18:03 +0200
committerLioncash <mathew1800@gmail.com>2020-07-15 19:40:15 +0200
commit52e83f0d5c5dbef89fa789ef1da1245781ee183d (patch)
treefed5fa3fc37d890a6187ed18fc87dfb4890efb0e /src/core/hle/kernel/handle_table.cpp
parentkernel/thread: Remove global GetCurrentThread() (diff)
downloadyuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar.gz
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar.bz2
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar.lz
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar.xz
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.tar.zst
yuzu-52e83f0d5c5dbef89fa789ef1da1245781ee183d.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/handle_table.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp
index aaf048243..fb30b6f8b 100644
--- a/src/core/hle/kernel/handle_table.cpp
+++ b/src/core/hle/kernel/handle_table.cpp
@@ -8,8 +8,9 @@
#include "core/core.h"
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/handle_table.h"
-#include "core/hle/kernel/scheduler.h"
+#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h"
+#include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/thread.h"
namespace Kernel {
@@ -23,7 +24,7 @@ constexpr u16 GetGeneration(Handle handle) {
}
} // Anonymous namespace
-HandleTable::HandleTable() {
+HandleTable::HandleTable(KernelCore& kernel) : kernel{kernel} {
Clear();
}
@@ -104,9 +105,9 @@ bool HandleTable::IsValid(Handle handle) const {
std::shared_ptr<Object> HandleTable::GetGeneric(Handle handle) const {
if (handle == CurrentThread) {
- return SharedFrom(Core::System::GetInstance().CurrentScheduler().GetCurrentThread());
+ return SharedFrom(kernel.CurrentScheduler().GetCurrentThread());
} else if (handle == CurrentProcess) {
- return SharedFrom(Core::System::GetInstance().CurrentProcess());
+ return SharedFrom(kernel.CurrentProcess());
}
if (!IsValid(handle)) {