Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-18 00:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3975_ghidra1_StructureDBParentTracking' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2023-10-27 19:01:24 -04:00
commit 82db482d96
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Ghidra/Features/Base/src/test.slow/java/ghidra/program/model/data/DataTypeTest.java
View File

@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import org.junit.*;
import db.Transaction;
import ghidra.program.database.ProgramBuilder;
import ghidra.program.model.listing.Program;
import ghidra.test.AbstractGhidraHeadedIntegrationTest;
@ -147,6 +148,84 @@ public class DataTypeTest extends AbstractGhidraHeadedIntegrationTest {
}
@Test
public void testStructureReplace() {
try (Transaction tx = program.openTransaction("Test")) {
Structure struct1 = createStruct("abc", Undefined1DataType.dataType,
2 * dtm.getDataOrganization().getPointerSize());
struct1.setExplicitMinimumAlignment(
dtm.getDataOrganization().getDefaultPointerAlignment());
Structure resolvedStruct1 = (Structure) dtm.resolve(struct1, null);
assertEquals(0, resolvedStruct1.getParents().size());
Structure struct2 = createStruct("xyz", resolvedStruct1, 1);
struct2.setPackingEnabled(true);
Structure resolvedStruct2 = (Structure) dtm.resolve(struct2, null);
assertEquals(1, resolvedStruct1.getParents().size());
DataType dt =
new ArrayDataType(new PointerDataType(new IntegerDataType(dtm), dtm), 2, -1);
resolvedStruct2.replace(0, dt, -1);
assertEquals(0, resolvedStruct1.getParents().size());
//@formatter:off
assertEquals(
"/xyz\n" +
"pack()\n" +
"Structure xyz {\n" +
" 0 int *[2] 8 \"\"\n" +
"}\n" +
"Size = 8 Actual Alignment = 4\n",
resolvedStruct2.toString());
//@formatter:on
}
}
@Test
public void testStructureReplace2() {
try (Transaction tx = program.openTransaction("Test")) {
Structure struct1 = new StructureDataType("abc", 0);
struct1.setPackingEnabled(true);
struct1.setExplicitMinimumAlignment(
dtm.getDataOrganization().getDefaultPointerAlignment());
Structure resolvedStruct1 = (Structure) dtm.resolve(struct1, null);
assertEquals(0, resolvedStruct1.getParents().size());
Structure struct2 = createStruct("xyz", resolvedStruct1, 1);
struct2.setPackingEnabled(true);
Structure resolvedStruct2 = (Structure) dtm.resolve(struct2, null);
assertEquals(1, resolvedStruct1.getParents().size());
DataType dt =
new ArrayDataType(new PointerDataType(new IntegerDataType(dtm), dtm), 0, -1);
resolvedStruct2.replace(0, dt, -1);
assertEquals(0, resolvedStruct1.getParents().size());
//@formatter:off
assertEquals(
"/xyz\n" +
"pack()\n" +
"Structure xyz {\n" +
" 0 int *[0] 0 \"\"\n" +
"}\n" +
"Size = 1 Actual Alignment = 4\n",
resolvedStruct2.toString());
//@formatter:on
}
}
private StructureDataType createStruct(String name, DataType contentType, int count) {
StructureDataType struct = new StructureDataType(name, 0, dtm);
for (int i = 0; i < count; i++) {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/StructureDB.java
View File

@ -1317,6 +1317,8 @@ class StructureDB extends CompositeDB implements StructureInternal {
(!isPackingEnabled() || dataType.getAlignment() == oldDt.getAlignment())) {
oldComponent.update(componentName, dataType, comment);
oldDt.removeParent(this);
dataType.addParent(this);
setLastChangeTime(System.currentTimeMillis());
dataMgr.dataTypeChanged(this, false);