yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2022-02-11 18:27:46 -05:00
commit 1a1d06b749
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -573,9 +573,7 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
addend = (oldValue << 21 >> 20); // extract addend and sign-extend with *2 factor addend = (oldValue << 21 >> 20); // extract addend and sign-extend with *2 factor
} }
newValue = (int) (symbolValue + addend); newValue = (int) (symbolValue + addend);
newValue -= offset; // PC relative
newValue -= (offset + 4); // PC relative, PC will be 4 bytes past inst start
newValue = (oldValue & 0x0000f800) | ((newValue >> 1) & 0x000007ff); newValue = (oldValue & 0x0000f800) | ((newValue >> 1) & 0x000007ff);
memory.setShort(relocationAddress, (short) newValue, instructionBigEndian); memory.setShort(relocationAddress, (short) newValue, instructionBigEndian);
break; break;
@ -586,9 +584,7 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
addend = (oldValue << 24 >> 23); // extract addend and sign-extend with *2 factor addend = (oldValue << 24 >> 23); // extract addend and sign-extend with *2 factor
} }
newValue = (int) (symbolValue + addend); newValue = (int) (symbolValue + addend);
newValue -= offset; // PC relative
newValue -= (offset + 4); // PC relative, PC will be 4 bytes past inst start
newValue = (oldValue & 0x0000ff00) | ((newValue >> 1) & 0x000000ff); newValue = (oldValue & 0x0000ff00) | ((newValue >> 1) & 0x000000ff);
memory.setShort(relocationAddress, (short) newValue, instructionBigEndian); memory.setShort(relocationAddress, (short) newValue, instructionBigEndian);
break; break;