summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-11 17:03:08 +0200
committerbunnei <bunneidev@gmail.com>2015-05-11 17:03:08 +0200
commit10eb8b0c02badb2f87ec2d71f1679a27b679c171 (patch)
tree920742b7261c7c801d2c6e21e35ded349dceda08
parentMerge pull request #742 from archshift/i4 (diff)
parentThread: Correctly set main thread initial stack position (diff)
downloadyuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar.gz
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar.bz2
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar.lz
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar.xz
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.tar.zst
yuzu-10eb8b0c02badb2f87ec2d71f1679a27b679c171.zip
-rw-r--r--src/core/hle/kernel/process.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/kernel/thread.h3
3 files changed, 4 insertions, 5 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 26a9c2360..efae4a179 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -85,7 +85,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
}
void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) {
- Kernel::SetupMainThread(stack_size, entry_point, main_thread_priority);
+ Kernel::SetupMainThread(entry_point, main_thread_priority);
}
Kernel::Process::Process() {}
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 5de8f9a73..957cbdfee 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -458,12 +458,12 @@ SharedPtr<Thread> SetupIdleThread() {
return thread;
}
-SharedPtr<Thread> SetupMainThread(u32 stack_size, u32 entry_point, s32 priority) {
+SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) {
DEBUG_ASSERT(!GetCurrentThread());
// Initialize new "main" thread
auto thread_res = Thread::Create("main", entry_point, priority, 0,
- THREADPROCESSORID_0, Memory::HEAP_VADDR_END - stack_size);
+ THREADPROCESSORID_0, Memory::HEAP_VADDR_END);
SharedPtr<Thread> thread = thread_res.MoveFrom();
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 6891c8c2f..afdaf8511 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -181,12 +181,11 @@ private:
/**
* Sets up the primary application thread
- * @param stack_size The size of the thread's stack
* @param entry_point The address at which the thread should start execution
* @param priority The priority to give the main thread
* @return A shared pointer to the main thread
*/
-SharedPtr<Thread> SetupMainThread(u32 stack_size, u32 entry_point, s32 priority);
+SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority);
/**
* Reschedules to the next available thread (call after current thread is suspended)