diff options
author | bunnei <bunneidev@gmail.com> | 2019-07-18 19:53:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-18 19:53:04 +0200 |
commit | 5d369112d9d467d4257e24ce57f3ebba824556f0 (patch) | |
tree | ff5dcc2c614dd7d257a0993b651a546e31c5ce9a /src/core/hle/kernel/process.cpp | |
parent | Merge pull request #2738 from lioncash/shader-ir (diff) | |
parent | kernel/process: Allocate the process' TLS region during initialization (diff) | |
download | yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar.gz yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar.bz2 yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar.lz yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar.xz yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.tar.zst yuzu-5d369112d9d467d4257e24ce57f3ebba824556f0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/process.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index db3ab14ce..92169a97b 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -184,19 +184,11 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) { } void Process::Run(s32 main_thread_priority, u64 stack_size) { - // The kernel always ensures that the given stack size is page aligned. - 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(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size), - 0, main_thread_stack_size, MemoryState::Stack) - .Unwrap(); + AllocateMainThreadStack(stack_size); + tls_region_address = CreateTLSRegion(); vm_manager.LogLayout(); + ChangeStatus(ProcessStatus::Running); SetupMainThread(*this, kernel, main_thread_priority); @@ -226,6 +218,9 @@ void Process::PrepareForTermination() { stop_threads(system.Scheduler(2).GetThreadList()); stop_threads(system.Scheduler(3).GetThreadList()); + FreeTLSRegion(tls_region_address); + tls_region_address = 0; + ChangeStatus(ProcessStatus::Exited); } @@ -325,4 +320,16 @@ void Process::ChangeStatus(ProcessStatus new_status) { WakeupAllWaitingThreads(); } +void Process::AllocateMainThreadStack(u64 stack_size) { + // The kernel always ensures that the given stack size is page aligned. + main_thread_stack_size = Common::AlignUp(stack_size, Memory::PAGE_SIZE); + + // Allocate and map the main thread stack + const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size; + vm_manager + .MapMemoryBlock(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size), + 0, main_thread_stack_size, MemoryState::Stack) + .Unwrap(); +} + } // namespace Kernel |