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

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
ghidra1
2026-01-14 10:43:05 -05:00
parent db2985c37e 404775f0de
commit 131976fac1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/exec/PcodeFrameTest.java
+5 -5
View File
@@ -15,7 +15,7 @@
*/ */
package ghidra.pcode.exec; package ghidra.pcode.exec;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import java.io.File; import java.io.File;
@@ -128,8 +128,8 @@ public class PcodeFrameTest extends AbstractGTest {
<PcodeProgram: <PcodeProgram:
<0> <0>
r0 = INT_ADD r0, 1:8 r0 = INT_ADD r0, 1:8
$U280:1 = INT_EQUAL r0, r1 $U300:1 = INT_EQUAL r0, r1
CBRANCH <0>, $U280:1 CBRANCH <0>, $U300:1
>""", >""",
program.toString()); program.toString());
} }
@@ -215,8 +215,8 @@ public class PcodeFrameTest extends AbstractGTest {
<p-code frame: index=0 { <p-code frame: index=0 {
<0> <0>
-> r0 = INT_ADD r0, 1:8 -> r0 = INT_ADD r0, 1:8
$U280:1 = INT_EQUAL r0, r1 $U300:1 = INT_EQUAL r0, r1
CBRANCH <0>, $U280:1 CBRANCH <0>, $U300:1
}>""", }>""",
frame.toString()); frame.toString());
} }
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcode/emu/jit/analysis/JitControlFlowModelTest.java
+2 -2
View File
@@ -439,8 +439,8 @@ public class JitControlFlowModelTest extends AbstractJitTest {
// For sanity, and so I can reason out the results // For sanity, and so I can reason out the results
assertEquals(""" assertEquals("""
<JitPassage: <JitPassage:
0,00000000.0: $U800:1 = BOOL_NEGATE Z 0,00000000.0: $U1000:1 = BOOL_NEGATE Z
1,00000000.1: CBRANCH *[ram]0x2:8, $U800:1 1,00000000.1: CBRANCH *[ram]0x2:8, $U1000:1
2,00000000.2: BRANCH *[ram]0x4:8 2,00000000.2: BRANCH *[ram]0x4:8
3,00000002.0: C = COPY 0:1 3,00000002.0: C = COPY 0:1
4,00000002.1: V = COPY 0:1 4,00000002.1: V = COPY 0:1