From 1323ab2f5f1627b39e48b6f970ad8208fa7af71e Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 19 Nov 2016 20:40:04 -0500 Subject: 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 --- src/core/loader/ncch.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/core/loader/ncch.cpp') diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index fadd7b16b..6fbaf4036 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."); -- cgit v1.2.3