summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2016-12-22 00:08:09 -0500
committerGravatar bunnei2016-12-22 00:27:49 -0500
commit8b1e269e5898ad0b6aadabee41fea777f0e62fdc (patch)
tree74040972517faa02fa84a819c5a39fcad12a8953 /src/core/hle/kernel
parentcore: Replace "AppCore" nomenclature with just "CPU". (diff)
downloadyuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.gz
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.xz
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.zip
ThreadContext: Move from "core" to "arm_interface".
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/thread.cpp6
-rw-r--r--src/core/hle/kernel/thread.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 60b7bea70..5fb95dada 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -384,9 +384,9 @@ std::tuple<u32, u32, bool> GetFreeThreadLocalSlot(std::vector<std::bitset<8>>& t
384 * @param entry_point Address of entry point for execution 384 * @param entry_point Address of entry point for execution
385 * @param arg User argument for thread 385 * @param arg User argument for thread
386 */ 386 */
387static void ResetThreadContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, 387static void ResetThreadContext(ARM_Interface::ThreadContext& context, u32 stack_top,
388 u32 arg) { 388 u32 entry_point, u32 arg) {
389 memset(&context, 0, sizeof(Core::ThreadContext)); 389 memset(&context, 0, sizeof(ARM_Interface::ThreadContext));
390 390
391 context.cpu_registers[0] = arg; 391 context.cpu_registers[0] = arg;
392 context.pc = entry_point; 392 context.pc = entry_point;
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 89acc12c1..c77ac644d 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -10,6 +10,7 @@
10#include <boost/container/flat_map.hpp> 10#include <boost/container/flat_map.hpp>
11#include <boost/container/flat_set.hpp> 11#include <boost/container/flat_set.hpp>
12#include "common/common_types.h" 12#include "common/common_types.h"
13#include "core/arm/arm_interface.h"
13#include "core/core.h" 14#include "core/core.h"
14#include "core/hle/kernel/kernel.h" 15#include "core/hle/kernel/kernel.h"
15#include "core/hle/result.h" 16#include "core/hle/result.h"
@@ -157,7 +158,7 @@ public:
157 return !wait_objects.empty(); 158 return !wait_objects.empty();
158 } 159 }
159 160
160 Core::ThreadContext context; 161 ARM_Interface::ThreadContext context;
161 162
162 u32 thread_id; 163 u32 thread_id;
163 164