development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-11-05 18:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-0_ghidorarex_BytesTracePcodeEm_fix' into patch
This commit is contained in:
Ryan Kurtz 2023-06-01 11:57:00 -04:00
commit dd5129daa8
1 changed files with 45 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RSP = 0x00110000;
""",
List.of(
"PUSH 0xdeadbeef"));
"PUSH 0x0dedbeef"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -77,17 +77,16 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
assertEquals(BigInteger.valueOf(0x00110000),
TraceSleighUtils.evaluate("RSP", tb.trace, 0, thread, 0));
assertEquals(BigInteger.valueOf(0),
TraceSleighUtils.evaluate("*:4 0x0010fffc:8", tb.trace, 0, thread, 0));
TraceSleighUtils.evaluate("*:8 0x0010fff8:8", tb.trace, 0, thread, 0));
try (Transaction tx = tb.startTransaction()) {
emu.writeDown(tb.host, 1, 1);
}
// 4, not 8 bytes pushed?
assertEquals(BigInteger.valueOf(0x0010fffc),
assertEquals(BigInteger.valueOf(0x0010fff8),
TraceSleighUtils.evaluate("RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xdeadbeefL),
TraceSleighUtils.evaluate("*:4 RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0dedbeefL),
TraceSleighUtils.evaluate("*:8 RSP", tb.trace, 1, thread, 0));
}
}
@ -106,8 +105,8 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RSP = 0x00110000;
""",
List.of(
"PUSH 0xdeadbeef",
"PUSH 0xbaadf00d"));
"PUSH 0x0dedbeef",
"PUSH 0x0badf00d"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -118,12 +117,12 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
emu.writeDown(tb.host, 1, 1);
}
assertEquals(BigInteger.valueOf(0x0010fff8),
assertEquals(BigInteger.valueOf(0x0010fff0),
TraceSleighUtils.evaluate("RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xdeadbeefL),
TraceSleighUtils.evaluate("*:4 (RSP + 4)", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xbaadf00dL),
TraceSleighUtils.evaluate("*:4 RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0dedbeefL),
TraceSleighUtils.evaluate("*:8 (RSP + 8)", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0badf00dL),
TraceSleighUtils.evaluate("*:8 RSP", tb.trace, 1, thread, 0));
}
}
@ -146,8 +145,8 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
""",
List.of(
"JMP 0x00400007", // 2 bytes
"MOV EAX,0xdeadbeef", // 5 bytes
"MOV ECX,0xbaadf00d")); // 5 bytes
"MOV EAX,0x0dedbeef", // 5 bytes
"MOV ECX,0x0badf00d")); // 5 bytes
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -169,7 +168,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
TraceSleighUtils.evaluate("RIP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x12345678),
TraceSleighUtils.evaluate("RAX", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xbaadf00dL),
assertEquals(BigInteger.valueOf(0x0badf00dL),
TraceSleighUtils.evaluate("RCX", tb.trace, 1, thread, 0));
}
}
@ -327,7 +326,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
List.of(
// First instruction undoes the modification above
"XOR byte ptr [0x00400007], 0xcc", // 7 bytes
"MOV EAX,0xdeadbeef")); // 5 bytes
"MOV EAX,0x0dedbeef")); // 5 bytes
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -343,7 +342,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
TraceSleighUtils.evaluate("RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0040000c),
TraceSleighUtils.evaluate("RIP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xdeadbeefL),
assertEquals(BigInteger.valueOf(0x0dedbeefL),
TraceSleighUtils.evaluate("RAX", tb.trace, 1, thread, 0));
}
}
@ -363,8 +362,8 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RSP = 0x00110000;
""",
List.of(
"PUSH 0xdeadbeef",
"PUSH 0xbaadf00d"));
"PUSH 0x0dedbeef",
"PUSH 0x0badf00d"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -380,7 +379,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
emuThread.stepPcodeOp();
assertNull(emuThread.getFrame());
assertEquals(tb.addr(0x00400006), emuThread.getCounter());
assertEquals(tb.addr(0x00400005), emuThread.getCounter());
emuThread.stepPcodeOp();
assertEquals(0, emuThread.getFrame().index());
@ -392,14 +391,14 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
emu.writeDown(tb.host, 1, 1);
}
assertEquals(BigInteger.valueOf(0x0040000c),
assertEquals(BigInteger.valueOf(0x0040000a),
TraceSleighUtils.evaluate("RIP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0010fff8),
assertEquals(BigInteger.valueOf(0x0010fff0),
TraceSleighUtils.evaluate("RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xdeadbeefL),
TraceSleighUtils.evaluate("*:4 (RSP + 4)", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0xbaadf00dL),
TraceSleighUtils.evaluate("*:4 RSP", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0dedbeefL),
TraceSleighUtils.evaluate("*:8 (RSP + 8)", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x0badf00dL),
TraceSleighUtils.evaluate("*:8 RSP", tb.trace, 1, thread, 0));
}
}
@ -430,8 +429,8 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RSP = 0x00110000;
""",
List.of(
"PUSH 0xdeadbeef",
"PUSH 0xbaadf00d"));
"PUSH 0x0dedbeef",
"PUSH 0x0badf00d"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0) {
@Override
@ -439,14 +438,14 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
return hexLib;
}
};
emu.inject(tb.addr(0x00400006), "hexdump(RSP);");
emu.inject(tb.addr(0x00400005), "hexdump(RSP);");
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
emuThread.stepInstruction();
assertEquals("", dumped.toString());
emuThread.stepInstruction();
assertEquals("fcff100000000000", dumped.toString()); // LE
assertEquals("f8ff100000000000", dumped.toString()); // LE
}
}
@ -477,8 +476,8 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RSP = 0x00110000;
""",
List.of(
"PUSH 0xdeadbeef",
"PUSH 0xbaadf00d"));
"PUSH 0x0dedbeef",
"PUSH 0x0badf00d"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0) {
@Override
@ -486,7 +485,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
return hexLib;
}
};
emu.inject(tb.addr(0x00400006), """
emu.inject(tb.addr(0x00400005), """
hexdump(RSP);
emu_swi();
hexdump(RIP);
@ -501,22 +500,22 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
catch (InterruptPcodeExecutionException e) {
assertEquals(e.getFrame(), emuThread.getFrame());
}
assertEquals("fcff100000000000", dumped.toString()); // LE
assertEquals("f8ff100000000000", dumped.toString()); // LE
dumped.delete(0, dumped.length());
emuThread.stepPcodeOp();
assertEquals("0600400000000000", dumped.toString());
assertEquals("0500400000000000", dumped.toString());
dumped.delete(0, dumped.length());
emuThread.finishInstruction();
assertEquals("0c00400000000000", dumped.toString());
assertEquals("0a00400000000000", dumped.toString());
dumped.delete(0, dumped.length());
try (Transaction tx = tb.startTransaction()) {
emu.writeDown(tb.host, 1, 1);
}
assertEquals(BigInteger.valueOf(0xbaadf00dL),
assertEquals(BigInteger.valueOf(0x0badf00dL),
TraceSleighUtils.evaluate("*:4 RSP", tb.trace, 1, thread, 0));
}
}
@ -533,12 +532,12 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
RAX = 0;
""",
List.of(
"PUSH 0xdeadbeef",
"PUSH 0xbaadf00d"));
"PUSH 0x0dedbeef",
"PUSH 0x0badf00d"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.host, 0);
emu.addBreakpoint(tb.addr(0x00400000), "RAX == 1");
emu.addBreakpoint(tb.addr(0x00400006), "RAX == 0");
emu.addBreakpoint(tb.addr(0x00400005), "RAX == 0");
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
try {
@ -547,7 +546,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
catch (InterruptPcodeExecutionException e) {
assertEquals(e.getFrame(), emuThread.getFrame());
}
assertEquals(tb.addr(0x00400006), emuThread.getCounter());
assertEquals(tb.addr(0x00400005), emuThread.getCounter());
}
}
@ -919,7 +918,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
Assembler asm = Assemblers.getAssembler(x64.getLanguage());
AssemblyBuffer buf = new AssemblyBuffer(asm, tb.addr(x64, 0x00400000));
buf.assemble("PUSH 0xdeadbeef");
buf.assemble("PUSH 0x0dedbeef");
mm.putBytes(0, tb.addr(0x00000000), ByteBuffer.wrap(buf.getBytes()));
}
@ -927,7 +926,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
emuThread.stepInstruction();
String changedExpr = "*:4 0x2000fffc:8";
String changedExpr = "*:8 0x2000fff8:8";
// Verify no changes to trace
TraceMemorySpace regs = mm.getMemoryRegisterSpace(thread, 0, false);
assertEquals(BigInteger.valueOf(0x00110000),
@ -939,10 +938,9 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
emu.writeDown(x64, 1, 1);
}
// 4, not 8 bytes pushed?
assertEquals(BigInteger.valueOf(0x0010fffc),
assertEquals(BigInteger.valueOf(0x0010fff8),
regs.getValue(x64, 1, tb.reg(x64, "RSP")).getUnsignedValue());
assertEquals(BigInteger.valueOf(0xefbeaddeL), // Guest is LE, host is BE
assertEquals(new BigInteger("efbeed0d00000000",16), // Guest is LE, host is BE
TraceSleighUtils.evaluate(changedExpr, tb.trace, 1, thread, 0));
}
}