yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1246_d-millar_delay_slot_issue'

Browse source 
into patch (Closes #3358)
This commit is contained in:
Ryan Kurtz 2021-08-26 07:21:04 -04:00
commit 00157dfd59
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java
View file

@ -139,10 +139,8 @@ public class DBTraceInstructionsView extends AbstractBaseDBTraceDefinedUnitsView
lastInstruction = replaceIfNotNull(lastInstruction, lastInstruction = replaceIfNotNull(lastInstruction,
doAddInstructions(lifespan, delayed.iterator(), true)); doAddInstructions(lifespan, delayed.iterator(), true));
} }
else { lastInstruction =
lastInstruction = doCreateInstruction(lifespan, startAddress, prototype, protoInstr);
doCreateInstruction(lifespan, startAddress, prototype, protoInstr);
}
} }
if (errorAddress != null && conflictCodeUnit == null && if (errorAddress != null && conflictCodeUnit == null &&
errorAddress.compareTo(startAddress) <= 0) { errorAddress.compareTo(startAddress) <= 0) {

32
Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/program/DBTraceDisassemblerIntegrationTest.java
View file

@ -29,6 +29,7 @@ import org.junit.runner.Description;
import com.google.common.collect.Range; import com.google.common.collect.Range;
import ghidra.app.cmd.disassemble.ArmDisassembleCommand; import ghidra.app.cmd.disassemble.ArmDisassembleCommand;
import ghidra.app.cmd.disassemble.MipsDisassembleCommand;
import ghidra.program.database.ProgramBuilder; import ghidra.program.database.ProgramBuilder;
import ghidra.program.disassemble.Disassembler; import ghidra.program.disassemble.Disassembler;
import ghidra.program.model.address.AddressOverflowException; import ghidra.program.model.address.AddressOverflowException;
@ -209,10 +210,37 @@ public class DBTraceDisassemblerIntegrationTest extends AbstractGhidraHeadlessIn
new ArmDisassembleCommand(b.addr(0xb6fa2cdc), restricted, true); new ArmDisassembleCommand(b.addr(0xb6fa2cdc), restricted, true);
thumbDis.applyTo(b.trace.getFixedProgramView(0), TaskMonitor.DUMMY); thumbDis.applyTo(b.trace.getFixedProgramView(0), TaskMonitor.DUMMY);
CodeUnit cu1 = b.trace.getCodeManager().codeUnits().getAt(0, b.addr(0xb6fa2cdc)); DBTraceCodeUnitsMemoryView cuManager = b.trace.getCodeManager().codeUnits();
CodeUnit cu1 = cuManager.getAt(0, b.addr(0xb6fa2cdc));
assertEquals("push { r4, r5, r6, r7, r8, lr }", cu1.toString()); assertEquals("push { r4, r5, r6, r7, r8, lr }", cu1.toString());
CodeUnit cu2 = b.trace.getCodeManager().codeUnits().getAt(0, b.addr(0xb6fa2ce0)); CodeUnit cu2 = cuManager.getAt(0, b.addr(0xb6fa2ce0));
assertEquals("sub sp,#0x1d8", cu2.toString()); assertEquals("sub sp,#0x1d8", cu2.toString());
} }
} }
@Test
@TestLanguage("MIPS:BE:64:default")
public void testDelaySlotSampleDBTrace() throws Exception {
try (UndoableTransaction tid = b.startTransaction()) {
DBTraceMemoryManager memory = b.trace.getMemoryManager();
memory.createRegion(".text", 0, b.range(0x120000000L, 0x120010000L),
Set.of(TraceMemoryFlag.READ, TraceMemoryFlag.EXECUTE));
memory.putBytes(0, b.addr(0x1200035b4L), b.buf(
// bal LAB_1200035bc
0x04, 0x11, 0x00, 0x01,
// _nop
0x00, 0x00, 0x00, 0x00));
AddressSet restricted = new AddressSet(b.addr(0x1200035b4L), b.addr(0x1200035bbL));
MipsDisassembleCommand mipsDis =
new MipsDisassembleCommand(b.addr(0x1200035b4L), restricted, false);
mipsDis.applyTo(b.trace.getFixedProgramView(0), TaskMonitor.DUMMY);
DBTraceCodeUnitsMemoryView cuManager = b.trace.getCodeManager().codeUnits();
CodeUnit cu1 = cuManager.getAt(0, b.addr(0x1200035b4L));
assertEquals("bal 0x1200035bc", cu1.toString());
CodeUnit cu2 = cuManager.getAt(0, b.addr(0x1200035b8L));
assertEquals("_nop", cu2.toString());
}
}
} }