aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-05-13 23:18:28 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-05-13 23:18:28 -0400
commit0de78eb3c4407cfedb8779422d96b7ee73fc19ed (patch)
treef73e18968732eeaec4f8833c7f7a1d0954e5f2bb /src/core/hle/kernel/thread.cpp
parent7d078189daec2db8a465a401b6867739fea5043d (diff)
fixed thread reset to not set stack address
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 95ef2c17..c59d2a68 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -417,7 +417,6 @@ void ThreadContext::reset() {
for (int i = 0; i < 16; i++) {
reg[i] = 0;
}
- reg[13] = Memory::SCRATCHPAD_VADDR_END;
cpsr = 0;
}
@@ -464,6 +463,7 @@ Thread* __KernelCreateThread(UID& id, UID module_id, const char* name, u32 prior
void __KernelResetThread(Thread *t, int lowest_priority) {
t->context.reset();
t->context.pc = t->nt.entry_point;
+ t->context.reg[13] = t->nt.initial_stack;
// If the thread would be better than lowestPriority, reset to its initial. Yes, kinda odd...
if (t->nt.current_priority < lowest_priority) {