dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-03 20:24:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14115 from techflashYT/elf-loader-fix

Browse Source 
Core/Boot: Fix ELF load address semantics
This commit is contained in:
Scott Mansell
2026-07-29 18:12:24 +12:00
committed by GitHub
parent a7345f8bde b2a57f4391
commit e9317dbe48
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/Boot/ElfReader.cpp
+10 -4
View File
@@ -195,17 +195,23 @@ bool ElfReader::LoadIntoMemory(Core::System& system, bool only_in_mem1) const
{
Elf32_Phdr* p = segments + i;
INFO_LOG_FMT(BOOT, "Type: {} Vaddr: {:08x} Filesz: {} Memsz: {}", p->p_type, p->p_vaddr,
p->p_filesz, p->p_memsz);
INFO_LOG_FMT(BOOT, "Type: {} Vaddr: {:08x} Paddr: {:08x} Filesz: {} Memsz: {}", p->p_type,
p->p_vaddr, p->p_paddr, p->p_filesz, p->p_memsz);
if (p->p_type == PT_LOAD)
{
u32 writeAddr = p->p_vaddr;
// Check LMA (paddr) first - some are nonsense, so fall back to VMA (vaddr) if invalid
u32 writeAddr = p->p_paddr;
if (writeAddr)
writeAddr |= 0x80000000; // map to virtual address
else
writeAddr = p->p_vaddr; // LMA is empty, fall back to VMA
const u8* src = GetSegmentPtr(i);
u32 srcSize = p->p_filesz;
u32 dstSize = p->p_memsz;
if (only_in_mem1 && p->p_vaddr >= memory.GetRamSizeReal())
if (only_in_mem1 && writeAddr >= memory.GetRamSizeReal())
continue;
memory.CopyToEmu(writeAddr, src, srcSize);