mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-22 07:42:34 +08:00
Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-3-30-23'
This commit is contained in:
+9
-9
@@ -86,8 +86,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
init.executeSleigh("pc = 0x00400000;");
|
||||
|
||||
Assembler asm = Assemblers.getAssembler(tb.trace.getFixedProgramView(0));
|
||||
iit = asm.assemble(start,
|
||||
"imm r0, #0x123");
|
||||
iit = asm.assemble(start, "imm r0, #0x123");
|
||||
|
||||
}
|
||||
imm123 = iit.next();
|
||||
@@ -149,6 +148,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
|
||||
@PcodeUserop
|
||||
public void stepper_test_userop() {
|
||||
// stub
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -196,7 +196,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
goto <L0>;
|
||||
""");
|
||||
assertEquals(3, rows.size());
|
||||
assertEquals("<html><span class=\"lab\"><0></span></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><0></font></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html></html>", rows.get(1).getLabel());
|
||||
assertEquals(FallthroughPcodeRow.class, rows.get(2).getClass());
|
||||
}
|
||||
@@ -211,7 +211,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
assertEquals(4, rows.size());
|
||||
assertEquals("<html></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html></html>", rows.get(1).getLabel());
|
||||
assertEquals("<html><span class=\"lab\"><0></span></html>", rows.get(2).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><0></font></html>", rows.get(2).getLabel());
|
||||
assertEquals(FallthroughPcodeRow.class, rows.get(3).getClass());
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
assertEquals(3, rows.size());
|
||||
assertEquals("<html></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html></html>", rows.get(1).getLabel());
|
||||
assertEquals("<html><span class=\"lab\"><0></span></html>", rows.get(2).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><0></font></html>", rows.get(2).getLabel());
|
||||
assertEquals(FallthroughPcodeRow.class, rows.get(2).getClass());
|
||||
}
|
||||
|
||||
@@ -240,11 +240,11 @@ public class DebuggerPcodeStepperProviderTest extends AbstractGhidraHeadedDebugg
|
||||
""");
|
||||
assertEquals(5, rows.size());
|
||||
// NB. templates number labels in order of appearance in BRANCHes
|
||||
assertEquals("<html><span class=\"lab\"><3></span></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html><span class=\"lab\"><0></span></html>", rows.get(1).getLabel());
|
||||
assertEquals("<html><span class=\"lab\"><1></span></html>", rows.get(2).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><3></font></html>", rows.get(0).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><0></font></html>", rows.get(1).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><1></font></html>", rows.get(2).getLabel());
|
||||
assertEquals("<html></html>", rows.get(3).getLabel());
|
||||
assertEquals("<html><span class=\"lab\"><2></span></html>", rows.get(4).getLabel());
|
||||
assertEquals("<html><font color=\"Blue\"><2></font></html>", rows.get(4).getLabel());
|
||||
assertEquals(FallthroughPcodeRow.class, rows.get(4).getClass());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user