mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2714_ARM_external_issue--SQUASHED' into Ghidra_10.2

Browse Source
This commit is contained in:
ghidra1
2022-10-18 18:26:29 -04:00
parent c7d77ab2e7 1410ccb6f8
commit 89f5e5d4e9
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Processors/ARM/src/main/java/ghidra/app/plugin/core/analysis/ArmAnalyzer.java
View File

@@ -186,10 +186,11 @@ public class ArmAnalyzer extends ConstantPropagationAnalyzer {
return false;
}
}
else if (refType.isCall() && refType.isComputed()) {
else if (refType.isCall() && refType.isComputed() && !address.isExternalAddress()) {
// must disassemble right now, because TB flag could get set back at end of blx
doArmThumbDisassembly(program, instr, context, address, instr.getFlowType(),
true, monitor);
return false;
}
return super.evaluateReference(context, instr, pcodeop, address, size, refType);
@@ -826,8 +827,7 @@ public class ArmAnalyzer extends ConstantPropagationAnalyzer {
// this is here so the reference gets created, but not - disassembled if it is in a bad part of memory.
// something computed it into the memory
MemoryBlock block = program.getMemory().getBlock(target);
if (block == null || !block.isExecute() || !block.isInitialized() ||
block.getName().equals(MemoryBlock.EXTERNAL_BLOCK_NAME)) {
if (block == null || !block.isExecute() || !block.isInitialized() || block.isExternalBlock()) {
return;
}