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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2021-07-07 15:04:15 -04:00
parent 9a29408419 a1bee163d1
commit cad6b3c9d9
3 changed files with 54 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressIterator.java
View file

@ -16,7 +16,6 @@
package ghidra.program.model.address;
import java.util.Iterator;
import java.util.NoSuchElementException;
import util.CollectionUtils;
@ -41,7 +40,7 @@ public interface AddressIterator extends Iterator<Address>, Iterable<Address> {
@Override
public Address next() {
throw new NoSuchElementException();
return null;
}
@Override
@ -51,4 +50,21 @@ public interface AddressIterator extends Iterator<Address>, Iterable<Address> {
};
/**
* Get the next address.
* <P>NOTE: This deviates from the standard {@link Iterator} interface
* by returning null instead of throwing an exception.
* @return the next address in the iteration.
*/
@Override
public Address next();
/**
* Checks if there is a next address in the iteration.
*
* @return true if there is a next address.
*/
@Override
public boolean hasNext();
}

3
Ghidra/Processors/SuperH4/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfSH4RelocationFixupHandler.java
View file

@ -34,6 +34,9 @@ public class ElfSH4RelocationFixupHandler extends RelocationFixupHandler {
switch (relocation.getType()) {
case SH_ElfRelocationConstants.R_SH_DIR32:
case SH_ElfRelocationConstants.R_SH_REL32:
case SH_ElfRelocationConstants.R_SH_GLOB_DAT:
case SH_ElfRelocationConstants.R_SH_JMP_SLOT:
case SH_ElfRelocationConstants.R_SH_RELATIVE:
return process32BitRelocation(program, relocation, oldImageBase, newImageBase);
// case SH_ElfRelocationConstants.R_SH_DIR8WPN:

57
Ghidra/Processors/SuperH4/src/main/java/ghidra/app/util/bin/format/elf/relocation/SH_ElfRelocationHandler.java
View file

@ -59,9 +59,13 @@ public class SH_ElfRelocationHandler extends ElfRelocationHandler {
int symbolValue = (int) elfRelocationContext.getSymbolValue(sym);
int newValue = 0;
int oldValue;
switch (type) {
case SH_ElfRelocationConstants.R_SH_DIR32: { //32 bit absolute relocation
case SH_ElfRelocationConstants.R_SH_DIR32:
case SH_ElfRelocationConstants.R_SH_GLOB_DAT:
case SH_ElfRelocationConstants.R_SH_JMP_SLOT:
// 32-bit absolute relocations
if (elfRelocationContext.extractAddend()) {
addend = memory.getInt(relocationAddress);
}
@ -72,64 +76,69 @@ public class SH_ElfRelocationHandler extends ElfRelocationHandler {
newValue = symbolValue + addend;
memory.setInt(relocationAddress, newValue);
break;
}
case SH_ElfRelocationConstants.R_SH_REL32: { // 32 bit PC relative relocation
case SH_ElfRelocationConstants.R_SH_REL32: // 32-bit PC relative relocation
if (elfRelocationContext.extractAddend()) {
addend = memory.getInt(relocationAddress);
}
newValue = (symbolValue + addend) - offset;
memory.setInt(relocationAddress, newValue);
break;
}
case SH_ElfRelocationConstants.R_SH_DIR8WPN: // 8-bit PC relative branch divided by 2
case SH_ElfRelocationConstants.R_SH_DIR8WPZ: { // 8-bit PC unsigned-relative branch divided by 2
short oldShortValue = memory.getShort(relocationAddress);
case SH_ElfRelocationConstants.R_SH_DIR8WPN: // 8-bit PC relative branch divided by 2
case SH_ElfRelocationConstants.R_SH_DIR8WPZ: // 8-bit PC unsigned-relative branch divided by 2
oldValue = memory.getShort(relocationAddress);
if (elfRelocationContext.extractAddend()) {
addend = oldShortValue & 0xff;
addend = oldValue & 0xff;
if (type == SH_ElfRelocationConstants.R_SH_DIR8WPN && (addend & 0x80) != 0) {
addend -= 0x100; // sign-extend addend for R_SH_DIR8WPN
}
}
newValue = ((symbolValue + addend) - offset) >> 1;
newValue = (oldShortValue & 0xff00) | (newValue & 0xff);
newValue = (oldValue & 0xff00) | (newValue & 0xff);
memory.setShort(relocationAddress, (short) newValue);
break;
}
case SH_ElfRelocationConstants.R_SH_IND12W: { // 12-bit PC relative branch divided by 2
short oldShortValue = memory.getShort(relocationAddress);
case SH_ElfRelocationConstants.R_SH_IND12W: // 12-bit PC relative branch divided by 2
oldValue = memory.getShort(relocationAddress);
if (elfRelocationContext.extractAddend()) {
addend = oldShortValue & 0xfff;
addend = oldValue & 0xfff;
if ((addend & 0x800) != 0) {
addend -= 0x1000; // sign-extend addend
}
}
newValue = ((symbolValue + addend) - offset) >> 1;
newValue = (oldShortValue & 0xf000) | (newValue & 0xfff);
newValue = (oldValue & 0xf000) | (newValue & 0xfff);
memory.setShort(relocationAddress, (short) newValue);
break;
}
case SH_ElfRelocationConstants.R_SH_DIR8WPL: { // 8-bit PC unsigned-relative branch divided by 4
short oldShortValue = memory.getShort(relocationAddress);
case SH_ElfRelocationConstants.R_SH_DIR8WPL: // 8-bit PC unsigned-relative branch divided by 4
oldValue = memory.getShort(relocationAddress);
if (elfRelocationContext.extractAddend()) {
addend = oldShortValue & 0xff;
addend = oldValue & 0xff;
}
newValue = ((symbolValue + addend) - offset) >> 2;
newValue = (oldShortValue & 0xff00) | (newValue & 0xff);
newValue = (oldValue & 0xff00) | (newValue & 0xff);
memory.setShort(relocationAddress, (short) newValue);
break;
}
case SH_ElfRelocationConstants.R_SH_COPY: {
case SH_ElfRelocationConstants.R_SH_COPY:
markAsWarning(program, relocationAddress, "R_SH_COPY", symbolName, symbolIndex,
"Runtime copy not supported", elfRelocationContext.getLog());
break;
}
default: {
case SH_ElfRelocationConstants.R_SH_RELATIVE:
if (elfRelocationContext.extractAddend()) {
addend = memory.getInt(relocationAddress);
}
newValue = (int) (elfRelocationContext.getImageBaseWordAdjustmentOffset()) + addend;
memory.setInt(relocationAddress, newValue);
break;
default:
markAsUnhandled(program, relocationAddress, type, symbolIndex, symbolName,
elfRelocationContext.getLog());
break;
}
}
}