ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11249 from JosJuice/load-dol-elf-after-mem 

Boot: Load DOL/ELF after memory setup
This commit is contained in:
Admiral H. Curtiss 2022-11-06 05:40:54 +01:00 committed by GitHub
parent e1f5eb3d8d fb916a4c33
commit db679ab620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Boot/Boot.cpp
View File

@ -540,12 +540,6 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> boot)
if (!executable.reader->IsValid()) if (!executable.reader->IsValid())
return false; return false;
if (!executable.reader->LoadIntoMemory())
{
PanicAlertFmtT("Failed to load the executable to memory.");
return false;
}
SetDefaultDisc(); SetDefaultDisc();
SetupMSR(); SetupMSR();
@ -569,6 +563,12 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> boot)
SetupGCMemory(); SetupGCMemory();
} }
if (!executable.reader->LoadIntoMemory())
{
PanicAlertFmtT("Failed to load the executable to memory.");
return false;
}
SConfig::OnNewTitleLoad(); SConfig::OnNewTitleLoad();
PC = executable.reader->GetEntryPoint(); PC = executable.reader->GetEntryPoint();