catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrote relocations

This commit is contained in:
georgemoralis 2024-03-26 17:17:59 +02:00
parent 7dbe258edc
commit e5a224aa96
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/linker.cpp
View File

@ -433,7 +433,7 @@ void Linker::LoadSymbols(Module* m) {
break; break;
} }
symbol->AddSymbol(sym_r, symbol->AddSymbol(sym_r,
(export_func ? sym->st_value + m->base_virtual_addr : 0)); (export_func ? sym->st_value + m->base_virtual_addr : 0));
} }
} }
} }
@ -459,17 +459,18 @@ void Linker::Relocate(Module* m) {
switch (type) { switch (type) {
case R_X86_64_RELATIVE: case R_X86_64_RELATIVE:
if (symbol != 0) // should be always zero
{
// LOG_INFO(Core_Linker, "R_X86_64_RELATIVE symbol not zero = {:#010x}\n", type,
// symbol);//found it openorbis but i am not sure it worth logging
}
rel_value = rel_base_virtual_addr + addend; rel_value = rel_base_virtual_addr + addend;
rel_isResolved = true; rel_isResolved = true;
break; break;
case R_X86_64_64: case R_X86_64_DTPMOD64:
case R_X86_64_JUMP_SLOT: // similar but addend is not take into account rel_value = reinterpret_cast<uint64_t>(m);
{ rel_isResolved = true;
rel_sym_type = Loader::SymbolType::Tls;
break;
case R_X86_64_GLOB_DAT:
case R_X86_64_JUMP_SLOT:
addend = 0;
case R_X86_64_64: {
auto sym = symbolsTlb[symbol]; auto sym = symbolsTlb[symbol];
auto sym_bind = sym.GetBind(); auto sym_bind = sym.GetBind();
auto sym_type = sym.GetType(); auto sym_type = sym.GetType();
@ -483,36 +484,32 @@ void Linker::Relocate(Module* m) {
case STT_OBJECT: case STT_OBJECT:
rel_sym_type = Loader::SymbolType::Object; rel_sym_type = Loader::SymbolType::Object;
break; break;
case STT_NOTYPE:
rel_sym_type = Loader::SymbolType::NoType;
break;
default: default:
LOG_INFO(Core_Linker, "unknown symbol type {}", sym_type); ASSERT_MSG(0, "unknown symbol type {}", sym_type);
} }
if (sym_visibility != 0) // should be zero log if else if (sym_visibility != 0) // should be zero log if else
{ {
LOG_INFO(Core_Linker, "symbol visilibity !=0"); LOG_INFO(Core_Linker, "symbol visilibity !=0");
} }
switch (sym_bind) { switch (sym_bind) {
case STB_LOCAL:
symbol_vitrual_addr = rel_base_virtual_addr + sym.st_value;
break;
case STB_GLOBAL: case STB_GLOBAL:
case STB_WEAK: {
rel_name = namesTlb + sym.st_name; rel_name = namesTlb + sym.st_name;
Resolve(rel_name, rel_sym_type, m, &symrec); Resolve(rel_name, rel_sym_type, m, &symrec);
symbol_vitrual_addr = symrec.virtual_address; symbol_vitrual_addr = symrec.virtual_address;
rel_isResolved = (symbol_vitrual_addr != 0); } break;
rel_name = symrec.name;
if (type == R_X86_64_JUMP_SLOT) {
addend = 0;
}
rel_value = (rel_isResolved ? symbol_vitrual_addr + addend : 0);
if (!rel_isResolved) {
LOG_INFO(Core_Linker,
"R_X86_64_64-R_X86_64_JUMP_SLOT sym_type {} bind STB_GLOBAL symbol : "
"{:#010x}",
sym_type, symbol);
}
break;
default: default:
LOG_INFO(Core_Linker, "UNK bind {}", sym_bind); ASSERT_MSG(0, "unknown bind type {}", sym_bind);
} }
rel_isResolved = (symbol_vitrual_addr != 0);
rel_value = (rel_isResolved ? symbol_vitrual_addr + addend : 0);
rel_name = symrec.name;
} break; } break;
default: default:
LOG_INFO(Core_Linker, "UNK type {:#010x} rel symbol : {:#010x}", type, symbol); LOG_INFO(Core_Linker, "UNK type {:#010x} rel symbol : {:#010x}", type, symbol);

2
src/core/loader/symbols_resolver.cpp
View File

@ -29,7 +29,7 @@ const SymbolRecord* SymbolsResolver::FindSymbol(const SymbolResolver& s) const {
} }
} }
LOG_INFO(Core_Linker, "Unresolved! {}", name); //LOG_INFO(Core_Linker, "Unresolved! {}", name);
return nullptr; return nullptr;
} }