summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-31 15:03:28 -0400
committerGravatar bunnei2018-03-31 16:06:45 -0400
commitb27ab46bde8bd0c376747284435fcfa2b35aea75 (patch)
tree7cc608033e61e4697bad475699d74c35c8bd5370 /src/core/hle/kernel
parentMerge pull request #293 from N00byKing/drkthm (diff)
downloadyuzu-b27ab46bde8bd0c376747284435fcfa2b35aea75.tar.gz
yuzu-b27ab46bde8bd0c376747284435fcfa2b35aea75.tar.xz
yuzu-b27ab46bde8bd0c376747284435fcfa2b35aea75.zip
memory: Fix stack region.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/process.cpp5
-rw-r--r--src/core/hle/kernel/thread.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 3694afc60..2cffec198 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -121,8 +121,9 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) {
121 // TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part 121 // TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part
122 // of the user address space. 122 // of the user address space.
123 vm_manager 123 vm_manager
124 .MapMemoryBlock(Memory::STACK_VADDR, std::make_shared<std::vector<u8>>(stack_size, 0), 0, 124 .MapMemoryBlock(Memory::STACK_AREA_VADDR_END - stack_size,
125 stack_size, MemoryState::Mapped) 125 std::make_shared<std::vector<u8>>(stack_size, 0), 0, stack_size,
126 MemoryState::Mapped)
126 .Unwrap(); 127 .Unwrap();
127 misc_memory_used += stack_size; 128 misc_memory_used += stack_size;
128 memory_region->used += stack_size; 129 memory_region->used += stack_size;
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 145f50887..f3a8aa4aa 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -342,7 +342,7 @@ SharedPtr<Thread> SetupMainThread(VAddr entry_point, u32 priority,
342 342
343 // Initialize new "main" thread 343 // Initialize new "main" thread
344 auto thread_res = Thread::Create("main", entry_point, priority, 0, THREADPROCESSORID_0, 344 auto thread_res = Thread::Create("main", entry_point, priority, 0, THREADPROCESSORID_0,
345 Memory::STACK_VADDR_END, owner_process); 345 Memory::STACK_AREA_VADDR_END, owner_process);
346 346
347 SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); 347 SharedPtr<Thread> thread = std::move(thread_res).Unwrap();
348 348