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-19 20:40:04 -05:00
parent fb13bfe693
commit 1323ab2f5f
10 changed files with 67 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/loader/loader.h
View file

@ -95,6 +95,17 @@ public:
*/
virtual ResultStatus Load() = 0;
/**
* Loads the system mode that this application needs.
* This function defaults to 2 (96MB allocated to the application) if it can't read the information.
* @param system_mode Out variable where the system mode will be stored.
* @returns ResultStatus result of the operation
*/
virtual ResultStatus LoadKernelSystemMode(u32& system_mode) {
system_mode = 2; // 96MB allocated to the application.
return ResultStatus::Success;
}
/**
* Get the code (typically .code section) of the application
* @param buffer Reference to buffer to store data

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

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

7
src/core/loader/ncch.h
View file

@ -185,6 +185,13 @@ public:
*/
ResultStatus Load() override;
/**
* Loads the Exheader and returns the system mode for this application.
* @param system_mode Out variable where the system mode will be stored.
* @return ResultStatus result of the operation
*/
ResultStatus LoadKernelSystemMode(u32& system_mode);
/**
* Get the code (typically .code section) of the application
* @param buffer Reference to buffer to store data