Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-15 00:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-3766 allow possible values with low-bit set to be used as pointers to

Browse Source 
functions on ARM/MIPS
This commit is contained in:
emteere 2023-08-21 21:29:54 +00:00
parent ba5fcdf4ed
commit 1c0c4a9765
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
View File

@ -20,8 +20,8 @@ import java.util.*;
import org.apache.commons.collections4.map.LRUMap;
import ghidra.app.cmd.disassemble.DisassembleCommand;
import ghidra.app.cmd.function.CallDepthChangeInfo;
import ghidra.app.util.PseudoDisassembler;
import ghidra.pcode.opbehavior.*;
import ghidra.program.model.address.*;
import ghidra.program.model.data.*;
@ -32,7 +32,6 @@ import ghidra.program.model.pcode.PcodeOp;
import ghidra.program.model.pcode.Varnode;
import ghidra.program.model.scalar.Scalar;
import ghidra.program.model.symbol.*;
import ghidra.program.model.util.CodeUnitInsertionException;
import ghidra.util.BigEndianDataConverter;
import ghidra.util.Msg;
import ghidra.util.exception.*;
@ -2620,7 +2619,8 @@ public class SymbolicPropogator {
Instruction targetInstr = getInstructionContaining(target);
if (targetInstr != null) {
// if not at the top of an instruction, don't do it
if (!targetInstr.getMinAddress().equals(target)) {
Address disassemblyAddress = PseudoDisassembler.getNormalizedDisassemblyAddress(program, target);
if (!targetInstr.getMinAddress().equals(disassemblyAddress)) {
return false;
}
if (targetInstr.isInDelaySlot()) {
@ -2629,7 +2629,7 @@ public class SymbolicPropogator {
// if not at the top of an instruction flow, don't do it
Function func = program.getFunctionManager().getFunctionContaining(target);
if (func != null && !func.getEntryPoint().equals(target)) {
if (func != null && !func.getEntryPoint().equals(disassemblyAddress)) {
return false;
}
}