mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

ElfLinkerArmLe fixes

Browse Source
This commit is contained in:
László Molnár 2006-07-01 12:25:26 +02:00
parent fd56e2534c
commit f14dc4a4e9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/linker.cpp
View File

@ -639,6 +639,8 @@ unsigned ElfLinker::getSymbolOffset(const char *name) const
{ {
assert(frozen); assert(frozen);
Symbol *symbol = const_cast<ElfLinker *>(this)->findSymbol(name); Symbol *symbol = const_cast<ElfLinker *>(this)->findSymbol(name);
if (symbol->section->output == NULL)
return 0xdeaddead;
return symbol->section->offset + symbol->offset; return symbol->section->offset + symbol->offset;
} }
@ -692,8 +694,8 @@ void ElfLinkerArmLE::relocate1(Relocation *rel, upx_byte *location,
{ {
if (strcmp(type, "R_ARM_PC24") == 0) if (strcmp(type, "R_ARM_PC24") == 0)
{ {
value -= location - output; value -= rel->section->offset + rel->offset;
set_le32(location, get_le32(location) + value / 4); set_le24(location, get_le24(location) + value / 4);
} }
else if (strcmp(type, "R_ARM_ABS32") == 0) else if (strcmp(type, "R_ARM_ABS32") == 0)
{ {
@ -701,12 +703,12 @@ void ElfLinkerArmLE::relocate1(Relocation *rel, upx_byte *location,
} }
else if (strcmp(type, "R_ARM_THM_CALL") == 0) else if (strcmp(type, "R_ARM_THM_CALL") == 0)
{ {
value -= location - output; value -= rel->section->offset + rel->offset;
value += ((get_le16(location) & 0x7ff) << 12); value += ((get_le16(location) & 0x7ff) << 12);
value += (get_le16(location + 2) & 0x7ff) << 1; value += (get_le16(location + 2) & 0x7ff) << 1;
set_le16(location, 0xf000 + (value) >> 12); set_le16(location, 0xf000 + ((value >> 12) & 0x7ff));
set_le16(location + 2, 0xf800 + (value) >> 1); set_le16(location + 2, 0xf800 + ((value >> 1) & 0x7ff));
//(b, 0xF000 + ((v - 1) / 2) * 0x10000); //(b, 0xF000 + ((v - 1) / 2) * 0x10000);
//set_le32(location, get_le32(location) + value / 4); //set_le32(location, get_le32(location) + value / 4);