diff options
| author | Subv <subv2112@gmail.com> | 2016-11-26 23:13:40 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2016-11-27 18:03:48 -0500 |
| commit | d171409f29ce3d8bcf7ed6ce16392b4b4ec97c4b (patch) | |
| tree | 25b4b0c9fd1f316812c3eb74310b9a31f872a4f5 /src/core/loader/ncch.cpp | |
| parent | 1323ab2f5f1627b39e48b6f970ad8208fa7af71e (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.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 6fbaf4036c..d4be61e0e4 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -117,12 +117,12 @@ 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; +boost::optional<u32> AppLoader_NCCH::LoadKernelSystemMode() { + if (!is_loaded) { + if (LoadExeFS() != ResultStatus::Success) + return boost::none; + } + return exheader_header.arm11_system_local_caps.system_mode.Value(); } ResultStatus AppLoader_NCCH::LoadExec() { @@ -285,7 +285,8 @@ 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); + 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."); |