Skip to content

Commit 404775f

Browse files
committed
GP-0 Corrected test failures caused by sleigh compiler changes
1 parent fe35e34 commit 404775f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/exec/PcodeFrameTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package ghidra.pcode.exec;
1717

18-
import static org.junit.Assert.assertEquals;
18+
import static org.junit.Assert.*;
1919

2020
import java.io.File;
2121

@@ -128,8 +128,8 @@ public void testProgramToStringLoop() throws Exception {
128128
<PcodeProgram:
129129
<0>
130130
r0 = INT_ADD r0, 1:8
131-
$U280:1 = INT_EQUAL r0, r1
132-
CBRANCH <0>, $U280:1
131+
$U300:1 = INT_EQUAL r0, r1
132+
CBRANCH <0>, $U300:1
133133
>""",
134134
program.toString());
135135
}
@@ -215,8 +215,8 @@ public void testFrameToStringLoop() throws Exception {
215215
<p-code frame: index=0 {
216216
<0>
217217
-> r0 = INT_ADD r0, 1:8
218-
$U280:1 = INT_EQUAL r0, r1
219-
CBRANCH <0>, $U280:1
218+
$U300:1 = INT_EQUAL r0, r1
219+
CBRANCH <0>, $U300:1
220220
}>""",
221221
frame.toString());
222222
}

Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcode/emu/jit/analysis/JitControlFlowModelTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ public void testInstructionsConditionalBranch() throws Exception {
439439
// For sanity, and so I can reason out the results
440440
assertEquals("""
441441
<JitPassage:
442-
0,00000000.0: $U800:1 = BOOL_NEGATE Z
443-
1,00000000.1: CBRANCH *[ram]0x2:8, $U800:1
442+
0,00000000.0: $U1000:1 = BOOL_NEGATE Z
443+
1,00000000.1: CBRANCH *[ram]0x2:8, $U1000:1
444444
2,00000000.2: BRANCH *[ram]0x4:8
445445
3,00000002.0: C = COPY 0:1
446446
4,00000002.1: V = COPY 0:1

0 commit comments

Comments
 (0)