Emulator-Archive/box86
1
0
Fork 0
mirror of https://github.com/ptitSeb/box86.git synced 2024-12-02 20:17:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some issue with Find386CopyRel in elfloader

Browse Source
This commit is contained in:
ptitSeb 2021-11-30 22:39:17 +01:00
parent 4e2f50eee7
commit 5478879a37
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/elfs/elfloader.c
View File

@ -368,41 +368,45 @@ int FindR386COPYRel(elfheader_t* h, const char* name, uintptr_t *offs, uint32_t*
{
if(!h)
return 0;
Elf32_Rel * rel = (Elf32_Rel *)(h->rel + h->delta);
if(!h->rel)
return 0;
int cnt = h->relsz / h->relent;
for (int i=0; i<cnt; ++i) {
int t = ELF32_R_TYPE(rel[i].r_info);
Elf32_Sym *sym = &h->DynSym[ELF32_R_SYM(rel[i].r_info)];
const char* symname = SymName(h, sym);
if(t==R_386_COPY && symname && !strcmp(symname, name)) {
int version2 = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[ELF32_R_SYM(rel[i].r_info)]:-1;
if(version2!=-1) version2 &= 0x7fff;
if(version && !version2) version2=-1; // match a versionned symbol against a global "local" symbol
const char* vername2 = GetSymbolVersion(h, version2);
if(SameVersionnedSymbol(name, version, vername, symname, version2, vername2)) {
*offs = sym->st_value + h->delta;
*p = (uint32_t*)(rel[i].r_offset + h->delta);
return 1;
if(h->relent) {
Elf32_Rel * rel = (Elf32_Rel *)(h->rel + h->delta);
int cnt = h->relsz / h->relent;
for (int i=0; i<cnt; ++i) {
int t = ELF32_R_TYPE(rel[i].r_info);
Elf32_Sym *sym = &h->DynSym[ELF32_R_SYM(rel[i].r_info)];
const char* symname = SymName(h, sym);
if(t==R_386_COPY && symname && !strcmp(symname, name)) {
int version2 = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[ELF32_R_SYM(rel[i].r_info)]:-1;
if(version2!=-1) version2 &= 0x7fff;
if(version && !version2) version2=-1; // match a versionned symbol against a global "local" symbol
const char* vername2 = GetSymbolVersion(h, version2);
if(SameVersionnedSymbol(name, version, vername, symname, version2, vername2)) {
*offs = sym->st_value + h->delta;
*p = (uint32_t*)(rel[i].r_offset + h->delta);
return 1;
}
}
}
}
Elf32_Rela * rela = (Elf32_Rela *)(h->rela + h->delta);
cnt = h->relasz / h->relaent;
for (int i=0; i<cnt; ++i) {
int t = ELF32_R_TYPE(rela[i].r_info);
Elf32_Sym *sym = &h->DynSym[ELF32_R_SYM(rela[i].r_info)];
const char* symname = SymName(h, sym);
if(t==R_386_COPY && symname && !strcmp(symname, name)) {
int version2 = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[ELF32_R_SYM(rela[i].r_info)]:-1;
if(version2!=-1) version2 &= 0x7fff;
if(version && !version2) version2=-1; // match a versionned symbol against a global "local" symbol
const char* vername2 = GetSymbolVersion(h, version2);
if(SameVersionnedSymbol(name, version, vername, symname, version2, vername2)) {
*offs = sym->st_value + h->delta;
*p = (uint32_t*)(rela[i].r_offset + h->delta + rela[i].r_addend);
return 1;
if(h->relaent) {
int cnt = h->relasz / h->relaent;
for (int i=0; i<cnt; ++i) {
Elf32_Rela * rela = (Elf32_Rela *)(h->rela + h->delta);
int t = ELF32_R_TYPE(rela[i].r_info);
Elf32_Sym *sym = &h->DynSym[ELF32_R_SYM(rela[i].r_info)];
const char* symname = SymName(h, sym);
if(t==R_386_COPY && symname && !strcmp(symname, name)) {
int version2 = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[ELF32_R_SYM(rela[i].r_info)]:-1;
if(version2!=-1) version2 &= 0x7fff;
if(version && !version2) version2=-1; // match a versionned symbol against a global "local" symbol
const char* vername2 = GetSymbolVersion(h, version2);
if(SameVersionnedSymbol(name, version, vername, symname, version2, vername2)) {
*offs = sym->st_value + h->delta;
*p = (uint32_t*)(rela[i].r_offset + h->delta + rela[i].r_addend);
return 1;
}
}
}
}