Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kernel/Loader: Grab the system mode from the NCCH ExHeader.

Browse source 
3dsx and elf files default to system mode 2 (96MB allocated to the application).

This allows Home Menu to boot without modifications.
Closes #1849
This commit is contained in:
Subv 2016-11-26 23:13:40 -05:00
parent 1323ab2f5f
commit d171409f29
5 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core/loader/ncch.cpp
View file

@ -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.");