Emulator-Archive/box64
1
0
Fork 0
mirror of https://github.com/ptitSeb/box64.git synced 2024-10-07 03:43:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[BOX32][NON4K] Try to fix elfloader when elf wants to load at an address not-compatible with pagesize

Browse Source
This commit is contained in:
ptitSeb 2024-09-23 13:54:48 +02:00
parent 5fe0a68b46
commit dd72a4542e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/elfs/elfloader32.c
View File

@ -158,6 +158,11 @@ int AllocLoadElfMemory32(box64context_t* context, elfheader_t* head, int mainbin
image = (void*)(((uintptr_t)raw+max_align)&~max_align);
} else {
image = raw = mmap64(from_ptrv(head->vaddr), sz, 0, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
if(from_ptr(head->vaddr)&(box64_pagesize-1)) {
// load address might be lower
if((uintptr_t)image == from_ptr(head->vaddr)&~(box64_pagesize-1))
image = from_ptrv(head->vaddr);
}
}
if(image!=MAP_FAILED && !head->vaddr && image!=from_ptrv(offs)) {
printf_log(LOG_INFO, "%s: Mmap64 for (@%p 0x%zx) for elf \"%s\" returned %p(%p/0x%zx) instead\n", (((uintptr_t)image)&max_align)?"Error":"Warning", from_ptrv(head->vaddr?head->vaddr:offs), head->memsz, head->name, image, raw, head->align);