OpenPunk/yuzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

15
src/citra/citra.cpp
View File

@@ -129,16 +129,23 @@ int main(int argc, char** argv) {
std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>();
System::Init(emu_window.get());
SCOPE_EXIT({ System::Shutdown(); });
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(boot_filename);
if (!loader) {
LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!", boot_filename.c_str());
return -1;
}
Loader::ResultStatus load_result = loader->Load();
u32 system_mode;
Loader::ResultStatus load_result = loader->LoadKernelSystemMode(system_mode);
if (Loader::ResultStatus::Success != load_result) {
LOG_CRITICAL(Frontend, "Failed to load ROM (Error %i)!", load_result);
return -1;
}
System::Init(emu_window.get(), system_mode);
SCOPE_EXIT({ System::Shutdown(); });
load_result = loader->Load();
if (Loader::ResultStatus::Success != load_result) {
LOG_CRITICAL(Frontend, "Failed to load ROM (Error %i)!", load_result);
return -1;