franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Lioncash 2019-03-28 18:30:58 -04:00
parent 427f1e3e3d
commit 5d4ab5ec2f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/kernel/process.cpp
View File

@ -110,15 +110,15 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) {
void Process::Run(VAddr entry_point, s32 main_thread_priority, u64 stack_size) { 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. // 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 // 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 // TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part
// of the user address space. // of the user address space.
const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size;
vm_manager vm_manager
.MapMemoryBlock(vm_manager.GetTLSIORegionEndAddress() - stack_size, .MapMemoryBlock(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size),
std::make_shared<std::vector<u8>>(stack_size, 0), 0, stack_size, 0, main_thread_stack_size, MemoryState::Stack)
MemoryState::Stack)
.Unwrap(); .Unwrap();
vm_manager.LogLayout(); vm_manager.LogLayout();

3
src/core/hle/kernel/process.h
View File

@ -247,6 +247,9 @@ private:
/// Memory manager for this process. /// Memory manager for this process.
Kernel::VMManager vm_manager; Kernel::VMManager vm_manager;
/// Size of the main thread's stack in bytes.
u64 main_thread_stack_size = 0;
/// Current status of the process /// Current status of the process
ProcessStatus status; ProcessStatus status;