Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 16:01:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-6159: Require op argument in PcodeUseropDefinition.execute().

Browse Source
This commit is contained in:
Dan
2025-12-22 15:57:37 +00:00
parent dc5836119f
commit 7d2a11d803
14 changed files with 379 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcode/emu/jit/gen/AbstractJitCodeGeneratorTest.java
+4 -1
View File
@@ -49,6 +49,7 @@ import ghidra.pcode.exec.PcodeExecutorStatePiece.Reason;
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressSpace;
import ghidra.program.model.lang.*;
import ghidra.program.model.pcode.PcodeOp;
import ghidra.program.model.pcode.Varnode;
import ghidra.program.util.DefaultLanguageService;
import ghidra.util.NumericUtilities;
@@ -220,12 +221,14 @@ public abstract class AbstractJitCodeGeneratorTest extends AbstractJitTest {
public static class TestUseropLibrary extends AnnotatedPcodeUseropLibrary<byte[]> {
boolean gotJavaUseropCall = false;
PcodeOp recordedOp = null;
boolean gotFuncUseropCall = false;
boolean gotSleighUseropCall = false;
@PcodeUserop
public long java_userop(long a, long b) {
public long java_userop(long a, long b, @OpOp PcodeOp op) {
gotJavaUseropCall = true;
recordedOp = op;
return 2 * a + b;
}
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcode/emu/jit/gen/AbstractToyJitCodeGeneratorTest.java
+26 -2
View File
@@ -26,11 +26,14 @@ import org.junit.Ignore;
import org.junit.Test;
import org.objectweb.asm.tree.MethodInsnNode;
import ghidra.pcode.emu.jit.gen.JitCodeGenerator.PcodeOpKey;
import ghidra.pcode.exec.InterruptPcodeExecutionException;
import ghidra.pcode.exec.SleighLinkException;
import ghidra.pcode.floatformat.FloatFormat;
import ghidra.program.model.lang.Endian;
import ghidra.program.model.lang.LanguageID;
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressFactory;
import ghidra.program.model.lang.*;
import ghidra.program.model.pcode.PcodeOp;
import ghidra.program.model.pcode.Varnode;
public abstract class AbstractToyJitCodeGeneratorTest extends AbstractJitCodeGeneratorTest {
@@ -434,10 +437,21 @@ public abstract class AbstractToyJitCodeGeneratorTest extends AbstractJitCodeGen
Translation tr = translateSleigh(getLanguageID(), """
r0 = java_userop(6:8, 2:8);
""");
AddressFactory factory = tr.program().getLanguage().getAddressFactory();
Register regR0 = tr.program().getLanguage().getRegister("r0");
assertFalse(tr.library().gotJavaUseropCall);
tr.runFallthrough();
assertTrue(tr.library().gotJavaUseropCall);
assertEquals(14, tr.getLongRegVal("r0"));
int opNo = tr.program().getUseropNumber("java_userop");
PcodeOp exp = new PcodeOp(Address.NO_ADDRESS, 0, PcodeOp.CALLOTHER, new Varnode[] {
new Varnode(factory.getConstantAddress(opNo), 4),
new Varnode(factory.getConstantAddress(6), 8),
new Varnode(factory.getConstantAddress(2), 8)
}, new Varnode(regR0.getAddress(), regR0.getNumBytes()));
assertEquals(new PcodeOpKey(exp), new PcodeOpKey(tr.library().recordedOp));
}
@Test
@@ -445,10 +459,20 @@ public abstract class AbstractToyJitCodeGeneratorTest extends AbstractJitCodeGen
Translation tr = translateSleigh(getLanguageID(), """
java_userop(6:8, 2:8);
""");
AddressFactory factory = tr.program().getLanguage().getAddressFactory();
assertFalse(tr.library().gotJavaUseropCall);
tr.runFallthrough();
assertTrue(tr.library().gotJavaUseropCall);
assertEquals(0, tr.getLongRegVal("r0"));
int opNo = tr.program().getUseropNumber("java_userop");
PcodeOp exp = new PcodeOp(Address.NO_ADDRESS, 0, PcodeOp.CALLOTHER, new Varnode[] {
new Varnode(factory.getConstantAddress(opNo), 4),
new Varnode(factory.getConstantAddress(6), 8),
new Varnode(factory.getConstantAddress(2), 8)
}, null);
assertEquals(new PcodeOpKey(exp), new PcodeOpKey(tr.library().recordedOp));
}
@Test