Merge remote-tracking branch 'origin/patch'

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