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/GP-2791_pcode_override_tests--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-11-30 12:18:44 -05:00
parent 2cd77234d2 d470adfde2
commit 0d72cce015
4 changed files with 1811 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
View File

@@ -353,7 +353,7 @@ public abstract class PcodeEmit {
else if (opcode == PcodeOp.CBRANCH) { else if (opcode == PcodeOp.CBRANCH) {
int offsetType = inputs[0].getOffset().getType(); int offsetType = inputs[0].getOffset().getType();
if (offsetType == ConstTpl.J_RELATIVE || offsetType == ConstTpl.J_START || if (offsetType == ConstTpl.J_RELATIVE || offsetType == ConstTpl.J_START ||
offsetType == ConstTpl.J_NEXT) { offsetType == ConstTpl.J_NEXT || offsetType == ConstTpl.J_NEXT2) {
return false; return false;
} }

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FlowOverride.java
View File

@@ -32,6 +32,7 @@ public enum FlowOverride {
* <pre>{@literal * <pre>{@literal
* Pcode mapping: * Pcode mapping:
* CALL -> BRANCH * CALL -> BRANCH
* CALLIND -> BRANCHIND
* RETURN -> BRANCHIND * RETURN -> BRANCHIND
* }</pre> * }</pre>
*/ */
@@ -54,7 +55,7 @@ public enum FlowOverride {
CALL, CALL,
/** /**
* Override the primary BRANCH or RETURN with a suitable CALL/RETURN operation. * Override the primary BRANCH, CALL, or RETURN with a suitable CALL/RETURN operation
* <pre>{@literal * <pre>{@literal
* Pcode mapping: * Pcode mapping:
* BRANCH -> CALL/RETURN * BRANCH -> CALL/RETURN
@@ -65,6 +66,8 @@ public enum FlowOverride {
* CALL <addr> * CALL <addr>
* RETURN 0 * RETURN 0
* <label> * <label>
* CALL -> CALL/RETURN
* CALLIND -> CALLIND/RETURN
* RETURN -> CALLIND/RETURN * RETURN -> CALLIND/RETURN
* }</pre> * }</pre>
*/ */

9
Ghidra/Processors/Toy/data/languages/toy.cspec
View File

@@ -87,4 +87,13 @@
</unaffected> </unaffected>
</prototype> </prototype>
<callfixup name="testCallFixup">
<target name="fixme"/>
<pcode>
<body><![CDATA[
sp = sp + 4;
]]></body>
</pcode>
</callfixup>
</compiler_spec> </compiler_spec>

1797
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/pcode/PcodeEmitContextTest.java Normal file
View File

File diff suppressed because it is too large Load Diff