diff options
author | Subv <subv2112@gmail.com> | 2017-09-27 01:17:47 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2017-09-27 01:17:47 +0200 |
commit | 7f48aa8d2580da6b3b83a389e31804e493aba69f (patch) | |
tree | 287b04f23f2d195f123fd15dca68d6a1cebf945c /src/core/loader/3dsx.cpp | |
parent | Kernel/Thread: Allow specifying which process a thread belongs to when creating it. (diff) | |
download | yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar.gz yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar.bz2 yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar.lz yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar.xz yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.tar.zst yuzu-7f48aa8d2580da6b3b83a389e31804e493aba69f.zip |
Diffstat (limited to 'src/core/loader/3dsx.cpp')
-rw-r--r-- | src/core/loader/3dsx.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 5ad5c5287..918038f1e 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp @@ -91,8 +91,8 @@ static u32 TranslateAddr(u32 addr, const THREEloadinfo* loadinfo, u32* offsets) return loadinfo->seg_addrs[2] + addr - offsets[1]; } -using Kernel::SharedPtr; using Kernel::CodeSet; +using Kernel::SharedPtr; static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, SharedPtr<CodeSet>* out_codeset) { @@ -255,7 +255,7 @@ FileType AppLoader_THREEDSX::IdentifyType(FileUtil::IOFile& file) { return FileType::Error; } -ResultStatus AppLoader_THREEDSX::Load() { +ResultStatus AppLoader_THREEDSX::Load(Kernel::SharedPtr<Kernel::Process>& process) { if (is_loaded) return ResultStatus::ErrorAlreadyLoaded; @@ -267,16 +267,15 @@ ResultStatus AppLoader_THREEDSX::Load() { return ResultStatus::Error; codeset->name = filename; - Kernel::g_current_process = Kernel::Process::Create(std::move(codeset)); - Kernel::g_current_process->svc_access_mask.set(); - Kernel::g_current_process->address_mappings = default_address_mappings; - Memory::SetCurrentPageTable(&Kernel::g_current_process->vm_manager.page_table); + process = Kernel::Process::Create(std::move(codeset)); + process->svc_access_mask.set(); + process->address_mappings = default_address_mappings; // Attach the default resource limit (APPLICATION) to the process - Kernel::g_current_process->resource_limit = + process->resource_limit = Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); - Kernel::g_current_process->Run(48, Kernel::DEFAULT_STACK_SIZE); + process->Run(48, Kernel::DEFAULT_STACK_SIZE); Service::FS::RegisterSelfNCCH(*this); |