summaryrefslogtreecommitdiffstats
path: root/src/core/loader/ncch.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-09-30 20:15:09 +0200
committerbunnei <bunneidev@gmail.com>2017-09-30 20:33:58 +0200
commit8c92435ded5c9c89290604a03e307c038b4d4117 (patch)
tree89640df0ae25ef5c78b79c1d8169f5ad6c25d63b /src/core/loader/ncch.cpp
parentprocess: Support loading multiple codesets. (diff)
downloadyuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.gz
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.bz2
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.lz
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.xz
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.tar.zst
yuzu-8c92435ded5c9c89290604a03e307c038b4d4117.zip
Diffstat (limited to '')
-rw-r--r--src/core/loader/ncch.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index fc4d14a59..728886ea8 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -168,7 +168,8 @@ ResultStatus AppLoader_NCCH::LoadExec() {
codeset->entrypoint = codeset->code.addr;
codeset->memory = std::make_shared<std::vector<u8>>(std::move(code));
- Kernel::g_current_process = Kernel::Process::Create(std::move(codeset));
+ Kernel::g_current_process = Kernel::Process::Create("main");
+ Kernel::g_current_process->LoadModule(codeset, codeset->entrypoint);
// Attach a resource limit to the process based on the resource limit category
Kernel::g_current_process->resource_limit =
@@ -187,7 +188,7 @@ ResultStatus AppLoader_NCCH::LoadExec() {
s32 priority = exheader_header.arm11_system_local_caps.priority;
u32 stack_size = exheader_header.codeset_info.stack_size;
- Kernel::g_current_process->Run(priority, stack_size);
+ Kernel::g_current_process->Run(codeset->entrypoint, priority, stack_size);
return ResultStatus::Success;
}
return ResultStatus::Error;