summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-05-11 01:43:59 +0200
committerSubv <subv2112@gmail.com>2015-05-11 01:43:59 +0200
commit115ad8e16a69c8823118f210654fc9ea70a03213 (patch)
tree945fc0617a3329e14f0b4ec3cf2679a0054cbb7b /src/core/arm/dyncom
parentCore/Memory: Give every emulated thread it's own TLS area. (diff)
downloadyuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar.gz
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar.bz2
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar.lz
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar.xz
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.tar.zst
yuzu-115ad8e16a69c8823118f210654fc9ea70a03213.zip
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp5
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index 1de1d2612..0072ae533 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -90,14 +90,13 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) {
AddTicks(ticks_executed);
}
-void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg, u32 tls_address) {
+void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) {
memset(&context, 0, sizeof(Core::ThreadContext));
context.cpu_registers[0] = arg;
context.pc = entry_point;
context.sp = stack_top;
context.cpsr = 0x1F; // Usermode
- context.tls = tls_address;
}
void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {
@@ -124,8 +123,6 @@ void ARM_DynCom::LoadContext(const Core::ThreadContext& ctx) {
state->VFP[1] = ctx.fpscr;
state->VFP[2] = ctx.fpexc;
-
- SetCP15Register(CP15_THREAD_URO, ctx.tls);
}
void ARM_DynCom::PrepareReschedule() {
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index b3fd708f1..2488c879c 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -27,7 +27,7 @@ public:
void AddTicks(u64 ticks) override;
- void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg, u32 tls_address) override;
+ void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) override;
void SaveContext(Core::ThreadContext& ctx) override;
void LoadContext(const Core::ThreadContext& ctx) override;