yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-3608: Handling more complex cases of pointer/array combinations

Browse source 
(#5248)
This commit is contained in:
Ryan Kurtz 2023-09-20 09:14:18 -04:00
parent b25dc180ef
commit dbbfb13a82
2 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java
View file

@ -520,22 +520,31 @@ public class DataTypeWriter {
} }
if (componentString == null) { if (componentString == null) {
if (dataType instanceof BitFieldDataType) { if (dataType instanceof BitFieldDataType) {
BitFieldDataType bfDt = (BitFieldDataType) dataType; BitFieldDataType bfDt = (BitFieldDataType) dataType;
name += ":" + bfDt.getDeclaredBitSize(); name += ":" + bfDt.getDeclaredBitSize();
dataType = bfDt.getBaseDataType(); dataType = bfDt.getBaseDataType();
} }
else if (dataType instanceof Array) {
Array array = (Array) dataType; while (true) {
name += getArrayDimensions(array); if (dataType instanceof Array array) {
dataType = getArrayBaseType(array); name += "[" + array.getNumElements() + "]";
} dataType = array.getDataType();
else if (dataType instanceof Pointer ptr && }
getPointerBaseDataType(ptr) instanceof Array array) { else if (dataType instanceof Pointer pointer) {
name = "(%s%s)%s".formatted("*".repeat(getPointerDepth(ptr)), name, DataType elem = pointer.getDataType();
getArrayDimensions(array)); if (elem == null) {
dataType = getArrayBaseType(array); break;
}
name = "*" + name;
dataType = elem;
if (dataType instanceof Array) {
name = "(" + name + ")";
}
}
else {
break;
}
} }
DataType baseDataType = getBaseDataType(dataType); DataType baseDataType = getBaseDataType(dataType);

37
Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/model/data/DataTypeWriterTest.java
View file

@ -236,7 +236,7 @@ public class DataTypeWriterTest extends AbstractGTest {
" qword myQWord; /* this is a qword */" + EOL + " qword myQWord; /* this is a qword */" + EOL +
" float myFloat; /* this is a float */" + EOL + " float myFloat; /* this is a float */" + EOL +
" double myDouble; /* this is a double */" + EOL + " double myDouble; /* this is a double */" + EOL +
" float * myFloatPointer; /* this is a float pointer */" + EOL + " float *myFloatPointer; /* this is a float pointer */" + EOL +
" char myFlexArray[0]; /* this is a flex array */" + EOL + "};" + EOL + EOL; " char myFlexArray[0]; /* this is a flex array */" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -260,7 +260,7 @@ public class DataTypeWriterTest extends AbstractGTest {
"struct MyBasicStruct {" + EOL + " char field0_0x0;" + EOL + " byte field1_0x1;" + "struct MyBasicStruct {" + EOL + " char field0_0x0;" + EOL + " byte field1_0x1;" +
EOL + " word field2_0x2;" + EOL + " dword field3_0x4;" + EOL + EOL + " word field2_0x2;" + EOL + " dword field3_0x4;" + EOL +
" qword field4_0x8;" + EOL + " float field5_0x10;" + EOL + " qword field4_0x8;" + EOL + " float field5_0x10;" + EOL +
" double field6_0x14;" + EOL + " float * field7_0x1c;" + EOL + "};" + EOL + EOL; " double field6_0x14;" + EOL + " float *field7_0x1c;" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -344,7 +344,7 @@ public class DataTypeWriterTest extends AbstractGTest {
String actual = writer.getBuffer().toString(); String actual = writer.getBuffer().toString();
String expected = "typedef struct MySelfRefStruct MySelfRefStruct, *PMySelfRefStruct;" + String expected = "typedef struct MySelfRefStruct MySelfRefStruct, *PMySelfRefStruct;" +
EOL + EOL + "typedef unsigned short word;" + EOL + "struct MySelfRefStruct {" + EOL + EOL + EOL + "typedef unsigned short word;" + EOL + "struct MySelfRefStruct {" + EOL +
" word field0_0x0;" + EOL + " struct MySelfRefStruct * field1_0x2;" + EOL + " word field0_0x0;" + EOL + " struct MySelfRefStruct *field1_0x2;" + EOL +
" double field2_0x6;" + EOL + "};" + EOL + EOL; " double field2_0x6;" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
@ -376,7 +376,7 @@ public class DataTypeWriterTest extends AbstractGTest {
" qword myQWord; /* this is a qword */" + EOL + " qword myQWord; /* this is a qword */" + EOL +
" float myFloat; /* this is a float */" + EOL + " float myFloat; /* this is a float */" + EOL +
" double myDouble; /* this is a double */" + EOL + " double myDouble; /* this is a double */" + EOL +
" float * myFloatPointer; /* this is a float pointer */" + EOL + "};" + EOL + EOL; " float *myFloatPointer; /* this is a float pointer */" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -474,7 +474,7 @@ public class DataTypeWriterTest extends AbstractGTest {
" qword myQWord; /* this is my qword */" + EOL + " qword myQWord; /* this is my qword */" + EOL +
" char myStr[10]; /* this is my string */" + EOL + " char myStr[10]; /* this is my string */" + EOL +
" double myDouble; /* this is my double */" + EOL + " double myDouble; /* this is my double */" + EOL +
" float * myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL; " float *myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -502,7 +502,7 @@ public class DataTypeWriterTest extends AbstractGTest {
" qword myQWord; /* this is my qword */" + EOL + " qword myQWord; /* this is my qword */" + EOL +
" float myArray[300]; /* this is my array */" + EOL + " float myArray[300]; /* this is my array */" + EOL +
" double myDouble; /* this is my double */" + EOL + " double myDouble; /* this is my double */" + EOL +
" float * myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL; " float *myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -530,7 +530,7 @@ public class DataTypeWriterTest extends AbstractGTest {
" qword myQWord; /* this is my qword */" + EOL + " qword myQWord; /* this is my qword */" + EOL +
" float myArray[300]; /* this is my array */" + EOL + " float myArray[300]; /* this is my array */" + EOL +
" double myDouble; /* this is my double */" + EOL + " double myDouble; /* this is my double */" + EOL +
" float * myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL; " float *myFloatPointer; /* this is my float pointer */" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
} }
@ -546,7 +546,7 @@ public class DataTypeWriterTest extends AbstractGTest {
String actual = writer.getBuffer().toString(); String actual = writer.getBuffer().toString();
String expected = "typedef union MySelfRefUnion MySelfRefUnion, *PMySelfRefUnion;" + EOL + String expected = "typedef union MySelfRefUnion MySelfRefUnion, *PMySelfRefUnion;" + EOL +
EOL + "typedef unsigned short word;" + EOL + "union MySelfRefUnion {" + EOL + EOL + "typedef unsigned short word;" + EOL + "union MySelfRefUnion {" + EOL +
" word field0;" + EOL + " union MySelfRefUnion * field1;" + EOL + " word field0;" + EOL + " union MySelfRefUnion *field1;" + EOL +
" double field2;" + EOL + "};" + EOL + EOL; " double field2;" + EOL + "};" + EOL + EOL;
assertEquals(expected, actual); assertEquals(expected, actual);
@ -580,14 +580,23 @@ public class DataTypeWriterTest extends AbstractGTest {
@Test @Test
public void testArrayPointerInStructure() throws IOException, CancelledException { public void testArrayPointerInStructure() throws IOException, CancelledException {
DataType dt = new IntegerDataType(); DataType dt = new IntegerDataType();
Array array = new ArrayDataType(dt, 300, dt.getLength()); Array array300 = new ArrayDataType(dt, 300, dt.getLength());
Pointer ptr1 = PointerDataType.getPointer(array, null); Pointer ptrArray300 = PointerDataType.getPointer(array300, null);
Array array3 = new ArrayDataType(dt, 3, dt.getLength());
Array array2 = new ArrayDataType(array3, 2, array3.getLength());
Pointer ptr0 = PointerDataType.getPointer(array2, null);
Array array12 = new ArrayDataType(ptr0, 12, dt.getLength());
Pointer ptr1 = PointerDataType.getPointer(array12, null);
Pointer ptr2 = PointerDataType.getPointer(ptr1, null); Pointer ptr2 = PointerDataType.getPointer(ptr1, null);
Pointer ptr3 = PointerDataType.getPointer(ptr2, null);
Pointer ptr4 = PointerDataType.getPointer(ptr3, null);
Pointer ptr5 = PointerDataType.getPointer(ptr4, null);
Structure struct = new StructureDataType("MyStruct", 0); Structure struct = new StructureDataType("MyStruct", 0);
struct.setDescription("this is my structure"); struct.setDescription("this is my structure");
struct.add(ptr1, "myPtr1", "this is my array pointer"); struct.add(ptrArray300, "something", "this is my array pointer");
struct.add(ptr2, "myPtr2", "this is my array pointer pointer"); struct.add(ptr5, "something", "this is my complex one");
dtWriter.write(struct, TaskMonitor.DUMMY); dtWriter.write(struct, TaskMonitor.DUMMY);
@ -597,8 +606,8 @@ public class DataTypeWriterTest extends AbstractGTest {
typedef struct MyStruct MyStruct, *PMyStruct; typedef struct MyStruct MyStruct, *PMyStruct;
struct MyStruct { /* this is my structure */ struct MyStruct { /* this is my structure */
int (*myPtr1)[300]; /* this is my array pointer */ int (*something)[300]; /* this is my array pointer */
int (**myPtr2)[300]; /* this is my array pointer pointer */ int (*(*****something)[12])[2][3]; /* this is my complex one */
}; };
"""; """;