development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-13 21:52:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-1742_ghidra1_ELF_ARM_Relocations' into patch

Browse source
This commit is contained in:
ghidra1 2022-02-11 14:27:30 -05:00
parent f3f56677ac ff638aa85b
commit 6c971322a2
1 changed files with 62 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Ghidra/Processors/ARM/src/main/java/ghidra/app/util/bin/format/elf/relocation/ARM_ElfRelocationHandler.java
View file

@ -380,21 +380,48 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
case ARM_ElfRelocationConstants.R_ARM_MOVW_PREL_NC: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_MOVT_PREL: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_ABS_NC: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_ABS: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_PREL_NC: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_PREL: {
*/
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_ABS_NC:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_ABS:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_PREL_NC:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_PREL:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_BREL_NC:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_BREL:
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_BREL: {
oldValue = memory.getShort(relocationAddress, instructionBigEndian) << 16;
oldValue |= memory.getShort(relocationAddress.add(2), instructionBigEndian);
if (elfRelocationContext.extractAddend()) {
addend = ((oldValue >> 4) & 0xf000);
addend |= ((oldValue >> 15) & 0x0800);
addend |= ((oldValue >> 4) & 0x0700);
addend |= (oldValue & 0x00ff);
addend = (addend ^ 0x8000) - 0x8000;
}
int value = (int) (symbolValue + addend);
if (type == ARM_ElfRelocationConstants.R_ARM_THM_MOVW_PREL_NC ||
type == ARM_ElfRelocationConstants.R_ARM_THM_MOVT_PREL) {
value -= (offset + 4); // PC relative, PC will be 4 bytes past inst start
}
if (type == ARM_ElfRelocationConstants.R_ARM_THM_MOVT_ABS ||
type == ARM_ElfRelocationConstants.R_ARM_THM_MOVT_PREL ||
type == ARM_ElfRelocationConstants.R_ARM_THM_MOVT_BREL) {
value >>= 16;
}
newValue = oldValue & 0xfbf08f00;
newValue |= (value & 0xf000) << 4;
newValue |= (value & 0x0800) << 15;
newValue |= (value & 0x0700) << 4;
newValue |= (value & 0x00ff);
memory.setShort(relocationAddress, (short)(newValue >> 16), instructionBigEndian);
memory.setShort(relocationAddress.add(2), (short)newValue, instructionBigEndian);
break;
}
/*
case ARM_ElfRelocationConstants.R_ARM_THM_JUMP19: {
break;
}
@ -503,15 +530,6 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
case ARM_ElfRelocationConstants.R_ARM_MOVW_BREL: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_BREL_NC: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVT_BREL: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_MOVW_BREL: {
break;
}
case ARM_ElfRelocationConstants.R_ARM_TLS_GOTDESC: {
break;
}
@ -548,12 +566,34 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
case ARM_ElfRelocationConstants.R_ARM_GNU_VTINHERIT: {
break;
}
*/
case ARM_ElfRelocationConstants.R_ARM_THM_JUMP11: {
oldValue = memory.getShort(relocationAddress, instructionBigEndian);
if (elfRelocationContext.extractAddend()) {
addend = (oldValue << 21 >> 20); // extract addend and sign-extend with *2 factor
}
newValue = (int) (symbolValue + addend);
newValue -= (offset + 4); // PC relative, PC will be 4 bytes past inst start
newValue = (oldValue & 0x0000f800) | ((newValue >> 1) & 0x000007ff);
memory.setShort(relocationAddress, (short) newValue, instructionBigEndian);
break;
}
case ARM_ElfRelocationConstants.R_ARM_THM_JUMP8: {
oldValue = memory.getShort(relocationAddress, instructionBigEndian);
if (elfRelocationContext.extractAddend()) {
addend = (oldValue << 24 >> 23); // extract addend and sign-extend with *2 factor
}
newValue = (int) (symbolValue + addend);
newValue -= (offset + 4); // PC relative, PC will be 4 bytes past inst start
newValue = (oldValue & 0x0000ff00) | ((newValue >> 1) & 0x000000ff);
memory.setShort(relocationAddress, (short) newValue, instructionBigEndian);
break;
}
/*
case ARM_ElfRelocationConstants.R_ARM_TLS_GD32: {
break;
}