mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
@@ -564,7 +564,6 @@ public class MIPS_ElfExtension extends ElfExtension {
|
|||||||
processMipsOptions(elfLoadHelper, mipsOptionsAddr);
|
processMipsOptions(elfLoadHelper, mipsOptionsAddr);
|
||||||
}
|
}
|
||||||
if (regInfoAddr != null) {
|
if (regInfoAddr != null) {
|
||||||
// TODO: don't do this if mips options present and processed
|
|
||||||
processMipsRegInfo(elfLoadHelper, regInfoAddr);
|
processMipsRegInfo(elfLoadHelper, regInfoAddr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -645,7 +644,7 @@ public class MIPS_ElfExtension extends ElfExtension {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (AddressOutOfBoundsException | MemoryAccessException e) {
|
catch (AddressOutOfBoundsException | MemoryAccessException e) {
|
||||||
// ignore
|
// Ignore - No memory defined - possible *.debug file
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -723,6 +722,10 @@ public class MIPS_ElfExtension extends ElfExtension {
|
|||||||
try {
|
try {
|
||||||
// Create gp0 symbol in default space which represents a constant value (pinned)
|
// Create gp0 symbol in default space which represents a constant value (pinned)
|
||||||
Scalar gp0Value = gpValueComponent.getScalar(0);
|
Scalar gp0Value = gpValueComponent.getScalar(0);
|
||||||
|
if (gp0Value == null) {
|
||||||
|
// No memory defined - possible *.debug file
|
||||||
|
return;
|
||||||
|
}
|
||||||
long gp0 = gp0Value.getUnsignedValue();
|
long gp0 = gp0Value.getUnsignedValue();
|
||||||
if (multipleGp0.get() || otherGp0Value != null) {
|
if (multipleGp0.get() || otherGp0Value != null) {
|
||||||
if (multipleGp0.get() || gp0 != otherGp0Value) {
|
if (multipleGp0.get() || gp0 != otherGp0Value) {
|
||||||
|
|||||||
Reference in New Issue
Block a user