diff options
| author | 2018-04-02 13:05:25 -0400 | |
|---|---|---|
| committer | 2018-04-02 13:05:25 -0400 | |
| commit | f92594d744eedc6f8b01c5d5f761b55b7035be1f (patch) | |
| tree | 487a643bbd523b37e95ba1fc1bd3baa576831485 /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #288 from Subv/macro_interpreter (diff) | |
| parent | hle_ipc, fsp_srv: Cleanup logging. (diff) | |
| download | yuzu-f92594d744eedc6f8b01c5d5f761b55b7035be1f.tar.gz yuzu-f92594d744eedc6f8b01c5d5f761b55b7035be1f.tar.xz yuzu-f92594d744eedc6f8b01c5d5f761b55b7035be1f.zip | |
Merge pull request #296 from bunnei/misc-mem-fsp-fixes
Fix stack region, implement FSP GetSize/SetSize, and some stubs
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 5 |
1 files changed, 3 insertions, 2 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; |