aboutsummaryrefslogtreecommitdiff
path: root/src/core/loader/ncch.cpp
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2016-11-19 20:40:04 -0500
committerSubv <subv2112@gmail.com>2016-11-19 20:40:04 -0500
commit1323ab2f5f1627b39e48b6f970ad8208fa7af71e (patch)
tree6b3257864d76a4cdd3d8bb9847e55a2a51ff7573 /src/core/loader/ncch.cpp
parentfb13bfe693e9536df700b675fef3affe09622fdd (diff)
Kernel/Loader: Grab the system mode from the NCCH ExHeader.
3dsx and elf files default to system mode 2 (96MB allocated to the application). This allows Home Menu to boot without modifications. Closes #1849
Diffstat (limited to 'src/core/loader/ncch.cpp')
-rw-r--r--src/core/loader/ncch.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index fadd7b16b1..6fbaf4036c 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -117,6 +117,14 @@ FileType AppLoader_NCCH::IdentifyType(FileUtil::IOFile& file) {
return FileType::Error;
}
+ResultStatus AppLoader_NCCH::LoadKernelSystemMode(u32& memory_type) {
+ ResultStatus result = LoadExeFS();
+ if (result != ResultStatus::Success)
+ return result;
+ memory_type = exheader_header.arm11_system_local_caps.system_mode;
+ return ResultStatus::Success;
+}
+
ResultStatus AppLoader_NCCH::LoadExec() {
using Kernel::SharedPtr;
using Kernel::CodeSet;
@@ -277,6 +285,7 @@ ResultStatus AppLoader_NCCH::LoadExeFS() {
LOG_DEBUG(Loader, "Core version: %d", core_version);
LOG_DEBUG(Loader, "Thread priority: 0x%X", priority);
LOG_DEBUG(Loader, "Resource limit category: %d", resource_limit_category);
+ LOG_DEBUG(Loader, "System Mode: %d", exheader_header.arm11_system_local_caps.system_mode);
if (exheader_header.arm11_system_local_caps.program_id != ncch_header.program_id) {
LOG_ERROR(Loader, "ExHeader Program ID mismatch: the ROM is probably encrypted.");