yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1111_ghidra1_PropogateStructPackSetting' into patch (Closes
#3193)
This commit is contained in:
ghidra1 2021-08-02 17:06:58 -04:00
commit 10db074bcc
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java
View file

@ -1216,11 +1216,13 @@ class StructureEditorModel extends CompEditorModel {
final StructureDataType structureDataType =
new StructureDataType(originalCategoryPath, uniqueName, length, originalDTM);
// if (isPackingEnabled()) {
// structureDataType.setPackingValue(getPackingValue());
// }
// adopt pack setting from current structure
structureDataType.setPackingEnabled(isPackingEnabled());
if (getPackingType() == PackingType.EXPLICIT) {
structureDataType.setExplicitPackingValue(getExplicitPackingValue());
}
// Get data type components to make into structure.
// Get data type components to make into structure.
DataTypeComponent firstDtc = null;
DataTypeComponent lastDtc = null;
for (int rowIndex = minRow; rowIndex < maxRow; rowIndex++) {

16
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureFactory.java
View file

@ -238,9 +238,19 @@ public class StructureFactory {
throw new IllegalArgumentException("No data type components found");
}
for (int i = 0; i < dataComps.length; i++) {
structure.add(dataComps[i].getDataType(), dataComps[i].getLength(),
dataComps[i].getFieldName(), dataComps[i].getComment());
// adopt pack settings from parent - things could move as a result
DataType parent = dataComps[0].getParent();
if (parent instanceof Composite) {
Composite c = (Composite) parent;
structure.setPackingEnabled(c.isPackingEnabled());
if (c.getPackingType() == PackingType.EXPLICIT) {
structure.setExplicitPackingValue(c.getExplicitPackingValue());
}
}
for (DataTypeComponent dataComp : dataComps) {
structure.add(dataComp.getDataType(), dataComp.getLength(),
dataComp.getFieldName(), dataComp.getComment());
}
}
}