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-0_Dan_testFixes-20220825-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-08-25 09:59:19 -04:00
parent a01a3f9083 c8a8ca8c98
commit 09d326ddbb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlanTests.java
View File

@@ -188,8 +188,8 @@ public class DebuggerCopyPlanTests extends AbstractGhidraHeadedDebuggerGUITest {
DBTraceMemoryManager memory = tb.trace.getMemoryManager(); DBTraceMemoryManager memory = tb.trace.getMemoryManager();
memory.createRegion(".text", 0, trng, TraceMemoryFlag.READ, TraceMemoryFlag.EXECUTE); memory.createRegion(".text", 0, trng, TraceMemoryFlag.READ, TraceMemoryFlag.EXECUTE);
InstructionIterator iit = asm.assemble(tb.addr(0x55550000), InstructionIterator iit = asm.assemble(tb.addr(0x55550000),
"imm r0, #1234", "imm r0, #123",
"imm r1, #2045", "imm r1, #234",
"add r0, r1"); "add r0, r1");
assertTrue(iit.hasNext()); assertTrue(iit.hasNext());
} }
@@ -211,10 +211,10 @@ public class DebuggerCopyPlanTests extends AbstractGhidraHeadedDebuggerGUITest {
ins = instructions.get(0); ins = instructions.get(0);
assertEquals(tb.addr(stSpace, 0x00400000), ins.getAddress()); assertEquals(tb.addr(stSpace, 0x00400000), ins.getAddress());
assertEquals("imm r0,#0x4d2", ins.toString()); assertEquals("imm r0,#0x7b", ins.toString());
ins = instructions.get(1); ins = instructions.get(1);
assertEquals(tb.addr(stSpace, 0x00400002), ins.getAddress()); assertEquals(tb.addr(stSpace, 0x00400002), ins.getAddress());
assertEquals("imm r1,#0x7fd", ins.toString()); assertEquals("imm r1,#0xea", ins.toString());
ins = instructions.get(2); ins = instructions.get(2);
assertEquals(tb.addr(stSpace, 0x00400004), ins.getAddress()); assertEquals(tb.addr(stSpace, 0x00400004), ins.getAddress());
assertEquals("add r0,r1", ins.toString()); assertEquals("add r0,r1", ins.toString());