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/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-21 11:11:28 -04:00
parent 0e0a5c1614 293444d396
commit 9af309e53c
6 changed files with 110 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/pcode/exec/trace/TraceEmulationIntegration.java
View File

@@ -764,6 +764,9 @@ public enum TraceEmulationIntegration {
value)) {
return;
}
if (length == 0) {
return;
}
Address end = address.addWrap(length - 1);
if (address.compareTo(end) <= 0) {
written.add(address, end);

69
Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/pcode/exec/trace/BytesTracePcodeEmulatorTest.java
View File

@@ -32,6 +32,7 @@ import ghidra.pcode.emu.PcodeEmulator;
import ghidra.pcode.emu.PcodeThread;
import ghidra.pcode.exec.*;
import ghidra.pcode.exec.PcodeExecutorStatePiece.Reason;
import ghidra.pcode.exec.trace.TraceEmulationIntegration.TraceWriter;
import ghidra.pcode.exec.trace.TraceEmulationIntegration.Writer;
import ghidra.program.model.address.*;
import ghidra.program.model.lang.*;
@@ -54,6 +55,74 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
return new PcodeEmulator(platform.getLanguage(), writer.callbacks());
}
@Test
public void testSetVarSize0() throws Throwable {
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("Test", "x86:LE:64:default")) {
initTrace(tb, """
RIP = 0x00400000;
""",
List.of());
Writer writer = createWriter(tb.host, 0);
PcodeEmulator emu = createEmulator(tb.host, writer);
emu.getSharedState().setVar(tb.addr(0x00400000), 0, false, tb.arr());
TraceWriter tw = (TraceWriter) writer;
assertEquals(tb.set(), tw.memWritten);
}
}
@Test
public void testGetVarSize0Uninit() throws Throwable {
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("Test", "x86:LE:64:default")) {
initTrace(tb, """
RIP = 0x00400000;
""",
List.of());
Writer writer = createWriter(tb.host, 0);
PcodeEmulator emu = createEmulator(tb.host, writer);
PcodeExecutorState<byte[]> state = emu.getSharedState();
Address addr = tb.addr(0x00400000);
byte[] result = state.getVar(addr, 0, false, Reason.EXECUTE_READ);
assertArrayEquals(new byte[0], result);
assertNull(state.getNextEntryInternal(addr.getAddressSpace(), 0));
}
}
@Test
public void testGetVarSize0Init() throws Throwable {
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("Test", "x86:LE:64:default")) {
// Put some known data in a place likely to show in erroneous "uninitialized" set
initTrace(tb, """
RIP = 0x00400000;
*:8 RIP = 0xdeadbeefcafeface;
""",
List.of());
Writer writer = createWriter(tb.host, 0);
PcodeEmulator emu = createEmulator(tb.host, writer);
PcodeExecutorState<byte[]> state = emu.getSharedState();
Address addr = tb.addr(0x00400000);
state.setVar(addr, 4, false, tb.arr(1, 2, 3, 4));
var entry = state.getNextEntryInternal(addr.getAddressSpace(), 0);
assertEquals(0x00400000L, entry.getKey().longValue());
assertArrayEquals(tb.arr(1, 2, 3, 4), entry.getValue());
assertNull(state.getNextEntryInternal(addr.getAddressSpace(), 0x00400004));
byte[] result = state.getVar(addr, 0, false, Reason.EXECUTE_READ);
assertArrayEquals(tb.arr(), result);
entry = state.getNextEntryInternal(addr.getAddressSpace(), 0);
assertEquals(0x00400000L, entry.getKey().longValue());
assertArrayEquals(tb.arr(1, 2, 3, 4), entry.getValue());
assertNull(state.getNextEntryInternal(addr.getAddressSpace(), 0x00400004));
}
}
/**
* Test a single instruction
*