From 5d4ab5ec2fe36fa06d3adccb66261a4a8077c74e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 28 Mar 2019 18:30:58 -0400 Subject: [PATCH] kernel/process: Store the main thread stack size to a data member This will be necessary in order to properly report memory usage within svcGetInfo. --- src/core/hle/kernel/process.cpp | 8 ++++---- src/core/hle/kernel/process.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index f18789a606..bb26737325 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -110,15 +110,15 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) { void Process::Run(VAddr entry_point, s32 main_thread_priority, u64 stack_size) { // The kernel always ensures that the given stack size is page aligned. - stack_size = Common::AlignUp(stack_size, Memory::PAGE_SIZE); + main_thread_stack_size = Common::AlignUp(stack_size, Memory::PAGE_SIZE); // Allocate and map the main thread stack // TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part // of the user address space. + const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size; vm_manager - .MapMemoryBlock(vm_manager.GetTLSIORegionEndAddress() - stack_size, - std::make_shared>(stack_size, 0), 0, stack_size, - MemoryState::Stack) + .MapMemoryBlock(mapping_address, std::make_shared>(main_thread_stack_size), + 0, main_thread_stack_size, MemoryState::Stack) .Unwrap(); vm_manager.LogLayout(); diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index db14dd4b4c..ee559fe4ce 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -247,6 +247,9 @@ private: /// Memory manager for this process. Kernel::VMManager vm_manager; + /// Size of the main thread's stack in bytes. + u64 main_thread_stack_size = 0; + /// Current status of the process ProcessStatus status;