diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-25 03:43:32 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-25 03:50:39 +0200 |
commit | 43e0d865faa932b980580a79a87d5ea464e9545c (patch) | |
tree | b4f06db70fe68a3edffc29e9373b9d98b8e35306 /src/core/hle | |
parent | Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) (diff) | |
download | yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.gz yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.bz2 yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.lz yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.xz yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.zst yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/scheduler.h | 6 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index e770b9103..69c812f16 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -17,7 +17,7 @@ namespace Kernel { std::mutex Scheduler::scheduler_mutex; -Scheduler::Scheduler(ARM_Interface* cpu_core) : cpu_core(cpu_core) {} +Scheduler::Scheduler(Core::ARM_Interface* cpu_core) : cpu_core(cpu_core) {} Scheduler::~Scheduler() { for (auto& thread : thread_list) { diff --git a/src/core/hle/kernel/scheduler.h b/src/core/hle/kernel/scheduler.h index 6a61ef64e..744990c9b 100644 --- a/src/core/hle/kernel/scheduler.h +++ b/src/core/hle/kernel/scheduler.h @@ -11,13 +11,15 @@ #include "core/hle/kernel/object.h" #include "core/hle/kernel/thread.h" +namespace Core { class ARM_Interface; +} namespace Kernel { class Scheduler final { public: - explicit Scheduler(ARM_Interface* cpu_core); + explicit Scheduler(Core::ARM_Interface* cpu_core); ~Scheduler(); /// Returns whether there are any threads that are ready to run. @@ -70,7 +72,7 @@ private: SharedPtr<Thread> current_thread = nullptr; - ARM_Interface* cpu_core; + Core::ARM_Interface* cpu_core; static std::mutex scheduler_mutex; }; diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index cf4f94822..4ffd8d5cc 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -283,9 +283,9 @@ static std::tuple<std::size_t, std::size_t, bool> GetFreeThreadLocalSlot( * @param entry_point Address of entry point for execution * @param arg User argument for thread */ -static void ResetThreadContext(ARM_Interface::ThreadContext& context, VAddr stack_top, +static void ResetThreadContext(Core::ARM_Interface::ThreadContext& context, VAddr stack_top, VAddr entry_point, u64 arg) { - memset(&context, 0, sizeof(ARM_Interface::ThreadContext)); + memset(&context, 0, sizeof(Core::ARM_Interface::ThreadContext)); context.cpu_registers[0] = arg; context.pc = entry_point; diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index adc804248..06edc296d 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -204,7 +204,7 @@ public: return status == ThreadStatus::WaitSynchAll; } - ARM_Interface::ThreadContext context; + Core::ARM_Interface::ThreadContext context; u32 thread_id; |