jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

R_AARCH64_CONDBR19

Browse Source 
modified:   linker.cpp
This commit is contained in:
John Reiser 2017-03-14 21:35:01 -07:00
parent 9f554a14fd
commit e8aabc9980
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/linker.cpp
View File

@ -472,9 +472,9 @@ void ElfLinker::relocate() {
value = rel->value->section->offset + rel->value->offset + rel->add; value = rel->value->section->offset + rel->value->offset + rel->add;
} }
upx_byte *location = rel->section->output + rel->offset; upx_byte *location = rel->section->output + rel->offset;
// printf("%-28s %-28s %-10s 0x%16llx 0x%16llx\n", rel->section->name, rel->value->name, // printf("%-28s %-28s %-10s %#16llx %#16llx\n", rel->section->name, rel->value->name,
// rel->type, (long long) value, (long long) value - rel->section->offset - rel->offset); // rel->type, (long long) value, (long long) value - rel->section->offset - rel->offset);
// printf(" %llx %d %llx %d %llx : %d\n", (long long) value, rel->value->section->offset, // printf(" %llx %d %llx %d %llx : %d\n", (long long) value, (int)rel->value->section->offset,
// rel->value->offset, rel->offset, (long long) rel->add, *location); // rel->value->offset, rel->offset, (long long) rel->add, *location);
relocate1(rel, location, value, rel->type); relocate1(rel, location, value, rel->type);
} }
@ -607,11 +607,17 @@ void ElfLinkerARM64::relocate1(const Relocation *rel, upx_byte *location, upx_ui
set_le32(location, get_le32(location) + value); set_le32(location, get_le32(location) + value);
else if (!strcmp(type, "64")) else if (!strcmp(type, "64"))
set_le64(location, get_le64(location) + value); set_le64(location, get_le64(location) + value);
} else if (!strcmp(type, "ABS32") == 0) { } else if (!strcmp(type, "ABS32")) {
set_le32(location, get_le32(location) + value); set_le32(location, get_le32(location) + value);
} else if (!strcmp(type, "ABS64") == 0) { } else if (!strcmp(type, "ABS64")) {
set_le64(location, get_le64(location) + value); set_le64(location, get_le64(location) + value);
} }
else if (!strcmp(type, "CONDBR19")) {
value -= rel->section->offset + rel->offset;
uint32_t const m19 = ~(~0u << 19);
uint32_t w = get_le32(location);
set_le32(location, (w &~(m19<<5)) | ((((w>>5) + (value>>2)) & m19) << 5) );
}
else else
super::relocate1(rel, location, value, type); super::relocate1(rel, location, value, type);
} }