summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-22 06:08:09 +0100
committerbunnei <bunneidev@gmail.com>2016-12-22 06:27:49 +0100
commit8b1e269e5898ad0b6aadabee41fea777f0e62fdc (patch)
tree74040972517faa02fa84a819c5a39fcad12a8953 /src/core/hle
parentcore: Replace "AppCore" nomenclature with just "CPU". (diff)
downloadyuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.gz
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.bz2
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.lz
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.xz
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.zst
yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.zip
Diffstat (limited to 'src/core/hle')
-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
* @param entry_point Address of entry point for execution
* @param arg User argument for thread
*/
-static void ResetThreadContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point,
- u32 arg) {
- memset(&context, 0, sizeof(Core::ThreadContext));
+static void ResetThreadContext(ARM_Interface::ThreadContext& context, u32 stack_top,
+ u32 entry_point, u32 arg) {
+ memset(&context, 0, sizeof(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 89acc12c1..c77ac644d 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -10,6 +10,7 @@
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
#include "common/common_types.h"
+#include "core/arm/arm_interface.h"
#include "core/core.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/result.h"
@@ -157,7 +158,7 @@ public:
return !wait_objects.empty();
}
- Core::ThreadContext context;
+ ARM_Interface::ThreadContext context;
u32 thread_id;