Merge remote-tracking branch 'origin/GP-2480_ghidra1_Sleigh_inst_next2'

Conflicts:
	Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/pcode/exec/trace/TracePcodeEmulatorTest.java
This commit is contained in:
Ryan Kurtz 2022-08-25 01:19:02 -04:00
commit ca80be44ff
121 changed files with 4074 additions and 4553 deletions

View file

@ -246,7 +246,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
"pc = 0x00400000;",
"sp = 0x00110000;"),
List.of(
"imm r0, #1234")); // decimal
"imm r0, #911")); // decimal
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.trace, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -261,7 +261,7 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
TraceSleighUtils.evaluate("sp", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(0x00400002),
TraceSleighUtils.evaluate("pc", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(1234),
assertEquals(BigInteger.valueOf(911),
TraceSleighUtils.evaluate("r0", tb.trace, 1, thread, 0));
}
}
@ -278,9 +278,9 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
"sp = 0x00110000;"),
List.of(
"brds 0x00400006",
"imm r0, #1234", // decimal
"imm r0, #2020",
"imm r1, #2021"));
"imm r0, #911", // decimal
"imm r0, #860",
"imm r1, #861"));
BytesTracePcodeEmulator emu = new BytesTracePcodeEmulator(tb.trace, 0);
PcodeThread<byte[]> emuThread = emu.newThread(thread.getPath());
@ -294,9 +294,9 @@ public class BytesTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
assertEquals(BigInteger.valueOf(0x00400008),
TraceSleighUtils.evaluate("pc", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(1234),
assertEquals(BigInteger.valueOf(911),
TraceSleighUtils.evaluate("r0", tb.trace, 1, thread, 0));
assertEquals(BigInteger.valueOf(2021),
assertEquals(BigInteger.valueOf(861),
TraceSleighUtils.evaluate("r1", tb.trace, 1, thread, 0));
}
}