Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fix tests: Removed parens for const:size

Browse Source
This commit is contained in:
Dan 2022-05-23 09:19:55 -04:00
parent 126a4bd5fc
commit 4afe956113
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Ghidra/Debug/ProposedUtils/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java
View File

@ -65,7 +65,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
} }
}; };
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("__op_output = (param_1 * (0x2:4));\n"), myUserop.getLines()); assertEquals(List.of("__op_output = (param_1 * 0x2:4);\n"), myUserop.getLines());
} }
@Test(expected = SleighException.class) @Test(expected = SleighException.class)
@ -90,7 +90,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
} }
}; };
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("__op_output = (r0 * (0x2:4));\n"), myUserop.getLines()); assertEquals(List.of("__op_output = (r0 * 0x2:4);\n"), myUserop.getLines());
} }
@Test @Test
@ -105,7 +105,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("" + assertEquals(List.of("" +
"local my_var:4;\n" + "local my_var:4;\n" +
"__op_output = (my_var * (0x2:4));\n"), "__op_output = (my_var * 0x2:4);\n"),
myUserop.getLines()); myUserop.getLines());
// Verify the source compiles // Verify the source compiles
myUserop.programFor(new Varnode(r0.getAddress(), r0.getNumBytes()), List.of(), myUserop.programFor(new Varnode(r0.getAddress(), r0.getNumBytes()), List.of(),
@ -138,11 +138,11 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
}; };
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("" + assertEquals(List.of("" +
"if (0x1:1) goto <L1>;\n" + "if 0x1:1 goto <L1>;\n" +
"tmp = (0x2:4);\n" + "tmp = 0x2:4;\n" +
"goto <L2>;\n" + "goto <L2>;\n" +
"<L1>\n" + "<L1>\n" +
"tmp = (0x1:4);\n" + "tmp = 0x1:4;\n" +
"<L2>\n"), "<L2>\n"),
myUserop.getLines()); myUserop.getLines());
} }
@ -159,8 +159,8 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
}; };
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("" + assertEquals(List.of("" +
"if (!(0x1:1)) goto <L1>;\n" + "if (!0x1:1) goto <L1>;\n" +
"tmp = (0x1:4);\n" + "tmp = 0x1:4;\n" +
"<L1>\n"), "<L1>\n"),
myUserop.getLines()); myUserop.getLines());
} }
@ -181,11 +181,11 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("" + "local i:4;\n" + assertEquals(List.of("" + "local i:4;\n" +
"local sum:4;\n" + "local sum:4;\n" +
"i = (0x0:4);\n" + "i = 0x0:4;\n" +
"<L2>\n" + "<L2>\n" +
"if (i >= n) goto <L1>;\n" + "if (i >= n) goto <L1>;\n" +
"sum = (sum + i);\n" + "sum = (sum + i);\n" +
"i = (i + (0x1:4));\n" + "i = (i + 0x1:4);\n" +
"goto <L2>;\n" + "goto <L2>;\n" +
"<L1>\n" + "<L1>\n" +
"__op_output = sum;\n"), "__op_output = sum;\n"),
@ -212,12 +212,12 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
assertEquals(List.of("" + assertEquals(List.of("" +
"local i:4;\n" + "local i:4;\n" +
"local sum:4;\n" + "local sum:4;\n" +
"i = (0x0:4);\n" + "i = 0x0:4;\n" +
"<L2>\n" + "<L2>\n" +
"if (i >= n) goto <L1>;\n" + "if (i >= n) goto <L1>;\n" +
"sum = (sum + i);\n" + "sum = (sum + i);\n" +
"if (sum >= (0x3e8:4)) goto <L1>;\n" + "if (sum >= 0x3e8:4) goto <L1>;\n" +
"i = (i + (0x1:4));\n" + "i = (i + 0x1:4);\n" +
"goto <L2>;\n" + "goto <L2>;\n" +
"<L1>\n" + "<L1>\n" +
"__op_output = sum;\n"), "__op_output = sum;\n"),
@ -233,7 +233,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
} }
}; };
SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop"); SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
assertEquals(List.of("return (* (0xdeadbeef:8));\n"), myUserop.getLines()); assertEquals(List.of("return (* 0xdeadbeef:8);\n"), myUserop.getLines());
// TODO: Test that the generated code compiles in a slaspec file. // TODO: Test that the generated code compiles in a slaspec file.
// It's rejected for injects because "return" is not valid there. // It's rejected for injects because "return" is not valid there.
} }