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

GP-6295: Fix ReDisassembler: MemBuffer address, avoid equiv prototype replacement.

Browse Source
This commit is contained in:
Dan
2026-01-07 16:59:27 +00:00
parent 37698aecb9
commit d95e9e35d7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/ReDisassembler.java
View File

@@ -86,7 +86,7 @@ public class ReDisassembler {
protected class ReDisState {
protected final TaskMonitor monitor;
protected final Map<AddressSpace, MemBuffer> progMemBuffers = new HashMap<>();
protected final Map<AddressSpace, DumbMemBufferImpl> progMemBuffers = new HashMap<>();
protected final ProgramContext tempContext = new ProgramContextImpl(language);
protected final AddressSet visited = new AddressSet();
protected final Deque<Flow> queue = new LinkedList<>();
@@ -121,9 +121,10 @@ public class ReDisassembler {
}
protected MemBuffer createBuffer(Address at) {
return progMemBuffers.computeIfAbsent(at.getAddressSpace(), space -> {
return new DumbMemBufferImpl(program.getMemory(), space.getMinAddress());
});
DumbMemBufferImpl buffer = progMemBuffers.computeIfAbsent(at.getAddressSpace(),
space -> new DumbMemBufferImpl(program.getMemory(), space.getMinAddress()));
buffer.setPosition(at);
return buffer;
}
/**
@@ -253,6 +254,11 @@ public class ReDisassembler {
ReDisassemblerContext ctx = new ReDisassemblerContext(state, flow);
try {
InstructionPrototype prototype = language.parse(buffer, ctx, false);
Instruction exists = program.getListing().getInstructionAt(flow.to);
if (exists != null && exists.getPrototype().equals(prototype) &&
flow.type != FlowType.SEED) {
return null;
}
return createInstruction(flow.to, prototype, buffer, ctx);
}
catch (UnknownInstructionException e) {