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

GP-134: Fixed typo in toy.sinc. Fixed ExternalFunctionMergeManagerTest.

Browse Source
This commit is contained in:
Dan
2020-09-18 08:34:46 -04:00
parent bd99aa2687
commit 8cc2ce4eb4
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/ExternalFunctionMergeManagerTest.java
View File

@@ -2787,6 +2787,7 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
/** /**
* Remove a register parameter vs change the register on a register parameter. * Remove a register parameter vs change the register on a register parameter.
*
* @throws Exception * @throws Exception
*/ */
@Test @Test
@@ -2900,7 +2901,9 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
} }
/** /**
* Remove a register parameter vs change an attribute (name, dt, comment) of a register parameter. * Remove a register parameter vs change an attribute (name, dt, comment) of a register
* parameter.
*
* @throws Exception * @throws Exception
*/ */
@Test @Test
@@ -3009,7 +3012,9 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
} }
/** /**
* Remove a register parameter vs change an attribute (name, dt, comment) of a register parameter. * Remove a register parameter vs change an attribute (name, dt, comment) of a register
* parameter.
*
* @throws Exception * @throws Exception
*/ */
@Test @Test
@@ -3118,7 +3123,9 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
} }
/** /**
* Remove a register parameter vs change an attribute (name, dt, comment) of a register parameter. * Remove a register parameter vs change an attribute (name, dt, comment) of a register
* parameter.
*
* @throws Exception * @throws Exception
*/ */
@Test @Test
@@ -3229,6 +3236,7 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
/** /**
* Remove a register parameter vs change the register on a register parameter. * Remove a register parameter vs change the register on a register parameter.
*
* @throws Exception * @throws Exception
*/ */
@Test @Test
@@ -3567,8 +3575,9 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
func.getParameter(0).setName("NewName_0", SourceType.USER_DEFINED); func.getParameter(0).setName("NewName_0", SourceType.USER_DEFINED);
func = getExternalFunction(program, new String[] { "user32.dll", "grapes" }); func = getExternalFunction(program, new String[] { "user32.dll", "grapes" });
func.getParameter(1).setDataType(new ArrayDataType(new ByteDataType(), 2, 1), func.getParameter(1)
SourceType.USER_DEFINED); .setDataType(new ArrayDataType(new ByteDataType(), 2, 1),
SourceType.USER_DEFINED);
func = getExternalFunction(program, new String[] { "user32.dll", "berries" }); func = getExternalFunction(program, new String[] { "user32.dll", "berries" });
func.getParameter(0).setComment("My sample comment."); func.getParameter(0).setComment("My sample comment.");
@@ -3633,7 +3642,7 @@ public class ExternalFunctionMergeManagerTest extends AbstractExternalMergerTest
assertEquals("r12", parameters[0].getRegister().getName()); assertEquals("r12", parameters[0].getRegister().getName());
assertTrue(new DWordDataType().isEquivalent(parameters[0].getDataType())); assertTrue(new DWordDataType().isEquivalent(parameters[0].getDataType()));
assertEquals("C2", parameters[1].getName()); assertEquals("C2", parameters[1].getName());
assertEquals("r11", parameters[1].getRegister().getName()); assertEquals("r11l", parameters[1].getRegister().getName());
assertTrue( assertTrue(
new ArrayDataType(new ByteDataType(), 2, 1).isEquivalent(parameters[1].getDataType())); new ArrayDataType(new ByteDataType(), 2, 1).isEquivalent(parameters[1].getDataType()));
localVariables = func.getLocalVariables(); localVariables = func.getLocalVariables();

4
Ghidra/Processors/Toy/data/languages/toy.sinc
View File

@@ -41,11 +41,11 @@ define register offset=0x1100 size=1 [
@if ENDIAN == "little" @if ENDIAN == "little"
define register offset=0x1000 size=$(HALFSIZE) [ define register offset=0x1000 size=$(HALFSIZE) [
r0l r0h r1l r1h r2l r2h r3l r3h r4l r4h r5l r5h r6l r6h r7l r7h r0l r0h r1l r1h r2l r2h r3l r3h r4l r4h r5l r5h r6l r6h r7l r7h
r8l r8h r9l r9h r10l r10h r11l r1lh r12l r12h spl sph lrl lrh pcl pch r8l r8h r9l r9h r10l r10h r11l r11h r12l r12h spl sph lrl lrh pcl pch
]; ];
@else # ENDIAN == "big" @else # ENDIAN == "big"
define register offset=0x1000 size=$(HALFSIZE) [ define register offset=0x1000 size=$(HALFSIZE) [
r0h r0l r1h r1l r2h r2l r3h r3l r4h r4l r5h r5l r6h r6l r7h r7l r0h r0l r1h r1l r2h r2l r3h r3l r4h r4l r5h r5l r6h r6l r7h r7l
r8h r8l r9h r9l r10h r10l r11h r1ll r12h r12l sph spl lrh lrl pch pcl r8h r8l r9h r9l r10h r10l r11h r11l r12h r12l sph spl lrh lrl pch pcl
]; ];
#endif # ENDIAN #endif # ENDIAN