yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-0: Fix tests (handle null ctxVals). Remove syserr.

Browse source
This commit is contained in:
Dan 2024-01-08 09:30:50 -05:00
parent 78e2ea086d
commit bccccac13e
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/ReDisassembler.java
View file

@ -102,7 +102,12 @@ public class ReDisassembler {
protected ReDisState addSeed(Address seed) { protected ReDisState addSeed(Address seed) {
RegisterValue seedCtx = programContext.getRegisterValue(ctxRegister, seed); RegisterValue seedCtx = programContext.getRegisterValue(ctxRegister, seed);
try { try {
tempContext.setRegisterValue(seed, seed, seedCtx); if (seedCtx == null) {
tempContext.remove(seed, seed, ctxRegister);
}
else {
tempContext.setRegisterValue(seed, seed, seedCtx);
}
} }
catch (ContextChangeException e) { catch (ContextChangeException e) {
throw new AssertionError(e); throw new AssertionError(e);
@ -147,16 +152,18 @@ public class ReDisassembler {
public void writeContext() { public void writeContext() {
for (Address addr : ctxAddrs) { for (Address addr : ctxAddrs) {
RegisterValue curCtxVal = programContext.getRegisterValue(ctxRegister, addr); RegisterValue curCtxVal = programContext.getRegisterValue(ctxRegister, addr);
System.err.println("Writing context at " + addr);
System.err.println(" Cur: " + curCtxVal);
RegisterValue newCtxVal = tempContext.getRegisterValue(ctxRegister, addr); RegisterValue newCtxVal = tempContext.getRegisterValue(ctxRegister, addr);
System.err.println(" New: " + newCtxVal);
if (curCtxVal.equals(newCtxVal)) { if (Objects.equals(curCtxVal, newCtxVal)) {
continue; continue;
} }
try { try {
programContext.setRegisterValue(addr, addr, newCtxVal); if (newCtxVal == null) {
programContext.remove(addr, addr, ctxRegister);
}
else {
programContext.setRegisterValue(addr, addr, newCtxVal);
}
} }
catch (ContextChangeException e) { catch (ContextChangeException e) {
Msg.error(this, "Cannot write context at " + addr + ": " + e); Msg.error(this, "Cannot write context at " + addr + ": " + e);
@ -181,9 +188,14 @@ public class ReDisassembler {
} }
protected void recordContext(Address to) { protected void recordContext(Address to) {
RegisterValue ctxValue = disassemblerContext.getRegisterValue(ctxRegister);
try { try {
state.tempContext.setRegisterValue(to, to, if (ctxValue == null) {
disassemblerContext.getRegisterValue(ctxRegister)); state.tempContext.remove(to, to, ctxRegister);
}
else {
state.tempContext.setRegisterValue(to, to, ctxValue);
}
state.ctxAddrs.add(to); state.ctxAddrs.add(to);
} }
catch (ContextChangeException e) { catch (ContextChangeException e) {
@ -197,8 +209,6 @@ public class ReDisassembler {
PseudoInstruction instruction = new PseudoInstruction(program, address, prototype, PseudoInstruction instruction = new PseudoInstruction(program, address, prototype,
memBuffer, ctx); memBuffer, ctx);
instruction.setInstructionBlock(block); instruction.setInstructionBlock(block);
System.err.println(
" " + instruction + " with " + instruction.getRegisterValue(ctxRegister));
return lastInstruction = instruction; return lastInstruction = instruction;
} }
@ -235,11 +245,10 @@ public class ReDisassembler {
MemBuffer buffer = state.createBuffer(flow.to); MemBuffer buffer = state.createBuffer(flow.to);
RegisterValue newCtxVal = disassemblerContext.getRegisterValue(ctxRegister); RegisterValue newCtxVal = disassemblerContext.getRegisterValue(ctxRegister);
RegisterValue curCtxVal = programContext.getRegisterValue(ctxRegister, flow.to); RegisterValue curCtxVal = programContext.getRegisterValue(ctxRegister, flow.to);
if (newCtxVal.equals(curCtxVal) && flow.type != FlowType.SEED) { if (Objects.equals(newCtxVal, curCtxVal) && flow.type != FlowType.SEED) {
// No need to re-disassemble if context has not changed. // No need to re-disassemble if context has not changed.
return null; return null;
} }
System.err.println("Re-disassembling " + flow + " with " + newCtxVal);
ReDisassemblerContext ctx = new ReDisassemblerContext(state, flow); ReDisassemblerContext ctx = new ReDisassemblerContext(state, flow);
try { try {
InstructionPrototype prototype = language.parse(buffer, ctx, false); InstructionPrototype prototype = language.parse(buffer, ctx, false);