Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/patch'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanmkurtz
ryanmkurtz committed Jun 8, 2022
2 parents 18bc6af + f5a5bbf commit 35d84d5
Showing 1 changed file with 53 additions and 30 deletions.
83 changes: 53 additions & 30 deletions Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ public class DataTypeMergeManager implements MergeResolver {
private DataTypeMergePanel dtMergePanel;
private int totalConflictCount;
private int currentConflictIndex;
private Map<Long, DataType> myResolvedDts; // maps My data type key -> resolved Data type
private Map<Long, DataType> latestResolvedDts; // maps Latest data type key -> resolved Data type
private Map<Long, DataType> origResolvedDts; // maps Original data type key -> resolved Data type

private MyIdentityHashMap<Long, DataType> myResolvedDts; // maps My data type key -> resolved Data type
private MyIdentityHashMap<Long, DataType> latestResolvedDts; // maps Latest data type key -> resolved Data type
private MyIdentityHashMap<Long, DataType> origResolvedDts; // maps Original data type key -> resolved Data type

private List<FixUpInfo> fixUpList; // FixUpInfo objects that must be resolved after
private HashSet<Long> fixUpIDSet; // track types with fixups
// data types have been added and conflicts resolved.
Expand Down Expand Up @@ -695,7 +697,7 @@ private boolean dataTypeRenamedOrMoved(long id) {
* the data type existed
*/
private DataType updateDataTypeName(long id, DataType dt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType resultDt = dtms[RESULT].getDataType(id);
DataType newDt = null;
if (resultDt != null) {
Expand Down Expand Up @@ -766,7 +768,7 @@ private void setCategoryPath(DataType dt, CategoryPath newPath) {
}

private DataType updateDataType(long id, DataTypeManager dtm,
Map<Long, DataType> resolvedDataTypes, boolean updatePath) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes, boolean updatePath) {
DataType resultDt = dtms[RESULT].getDataType(id);
DataType myDt = dtm.getDataType(id);

Expand Down Expand Up @@ -811,7 +813,7 @@ else if (resultDt instanceof Enum) {
}

private DataType updateDataTypeSource(long id, DataTypeManager dtm,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType resultDt = dtms[RESULT].getDataType(id);
DataType myDt = dtm.getDataType(id);
SourceArchive mySourceArchive = myDt.getSourceArchive();
Expand Down Expand Up @@ -846,7 +848,7 @@ private DataType updateDataTypeSource(long id, DataTypeManager dtm,
* @return the resulting data type in this data type manager.
*/
private DataType addDataType(long dataTypeID, DataType dataType,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

DataType existingDt = resolvedDataTypes.get(dataTypeID);
if (existingDt != null) {
Expand Down Expand Up @@ -895,7 +897,7 @@ else if (dataType instanceof FunctionDefinition) {
* @return resolved data type that corresponds to id
*/
private DataType getResolvedBaseType(long id, DataType dt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataTypeManager dtm = dt.getDataTypeManager();
DataType baseDt = getBaseDataType(dt);
if (baseDt == DataType.DEFAULT) {
Expand Down Expand Up @@ -932,7 +934,7 @@ private DataType getResolvedBaseType(long id, DataType dt,
}

private DataType createPointer(long id, Pointer pointerDt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType innerDt = pointerDt.getDataType();
if (innerDt == DataType.DEFAULT) {
return pointerDt;
Expand All @@ -953,7 +955,7 @@ private DataType createPointer(long id, Pointer pointerDt,
}

private DataType createTypeDef(long id, TypeDef originalTypeDef,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType innerDataType = originalTypeDef.getDataType();
if (innerDataType == DataType.DEFAULT) {
return originalTypeDef;
Expand Down Expand Up @@ -984,7 +986,7 @@ private DataType createTypeDef(long id, TypeDef originalTypeDef,
}

private DataType createArray(long id, Array array,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType dt = array.getDataType();
if (dt == DataType.DEFAULT) {
return array;
Expand All @@ -1005,7 +1007,7 @@ private DataType createArray(long id, Array array,
}

private DataType addComposite(long id, Composite myDt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

long oldLastChangeTime = myDt.getLastChangeTime();
long oldLastChangeTimeInSourceArchive = myDt.getLastChangeTimeInSourceArchive();
Expand All @@ -1025,7 +1027,7 @@ private DataType addComposite(long id, Composite myDt,
}

private DataType addFunctionDef(long id, FunctionDefinition myDt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
FunctionDefinition newDt = (FunctionDefinition) myDt.clone(dtms[RESULT]);
setCategoryPath(newDt, myDt.getCategoryPath());
updateFunctionDef(id, myDt, newDt, resolvedDataTypes);
Expand Down Expand Up @@ -1094,7 +1096,7 @@ private void removeFixUps(long sourceDtID) {
}

private void updateStructure(long sourceDtID, Structure sourceDt, Structure destStruct,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

// NOTE: it is possible for the same destStruct to be updated more than once;
// therefor we must cleanup any previous obsolete fixups
Expand Down Expand Up @@ -1312,7 +1314,7 @@ private void displayError(Composite destComposite, Exception e) {
}

private void updateUnion(long sourceDtID, Union sourceDt, Union destUnion,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

// NOTE: it is possible for the same destUnion to be updated more than once;
// therefor we must cleanup any previous obsolete fixups
Expand Down Expand Up @@ -1443,7 +1445,7 @@ else if (sourceDt.isMachineAligned()) {
}

private void updateComposite(long sourceDtID, Composite sourceDt, Composite destDt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

if (sourceDt instanceof Structure) {
updateStructure(sourceDtID, (Structure) sourceDt, (Structure) destDt,
Expand All @@ -1457,7 +1459,7 @@ private void updateComposite(long sourceDtID, Composite sourceDt, Composite dest

private void updateFunctionDef(long sourceFunctionDefDtID,
FunctionDefinition sourceFunctionDefDt, FunctionDefinition destDt,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {

// NOTE: it is possible for the same function def to be updated more than once;
// therefor we must cleanup any previous obsolete fixups
Expand Down Expand Up @@ -1506,7 +1508,7 @@ private void updateFunctionDef(long sourceFunctionDefDtID,
* has not been resolved yet
*/
private DataType getResolvedParam(long id, long paramDatatypeID, int index,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType resolvedDt = getResolvedComponent(paramDatatypeID, resolvedDataTypes);
if (resolvedDt == null) {
if (!myDtAddedList.contains(Long.valueOf(paramDatatypeID))) {
Expand Down Expand Up @@ -2568,7 +2570,7 @@ private int getNumUndefinedBytes(Structure struct, int ordinal) {
private void addToCleanupList(FixUpInfo info) {
long id = info.id;
int index = info.index;
Map<Long, DataType> ht = info.ht;
MyIdentityHashMap<Long, DataType> ht = info.ht;
CleanUpInfo cleanUpInfo = cleanupPlaceHolderList.get(id);
if (cleanUpInfo == null) {
cleanUpInfo = new CleanUpInfo(id);
Expand Down Expand Up @@ -2682,7 +2684,7 @@ private void fixUpUnion(long id, Union union, int firstFixupIndex, int fixupCoun
}

private DataType resolve(long id, DataTypeManager dtm,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
DataType dt = getResolvedComponent(id, resolvedDataTypes);
if (dt == null) {
DataType otherDt = dtm.getDataType(id);
Expand Down Expand Up @@ -2958,9 +2960,9 @@ private void setupDataTypeChanges(DataTypeChangeSet latestChanges,

origDtConflictList = new ArrayList<>(dtConflictList);

myResolvedDts = new HashMap<>();
latestResolvedDts = new HashMap<>();
origResolvedDts = new HashMap<>();
myResolvedDts = new MyIdentityHashMap<>();
latestResolvedDts = new MyIdentityHashMap<>();
origResolvedDts = new MyIdentityHashMap<>();

fixUpList = new ArrayList<>();
fixUpIDSet = new HashSet<>();
Expand Down Expand Up @@ -3235,7 +3237,7 @@ private class FixUpInfo {
long id;
long compID;
int index; // TODO: index as offset could be problematic with shared offset
Map<Long, DataType> ht;
MyIdentityHashMap<Long, DataType> ht;

// bitfield info
int bitOffset = -1;
Expand All @@ -3251,7 +3253,7 @@ private class FixUpInfo {
* @param resolvedDataTypes hashtable used for resolving the data type
*/
FixUpInfo(long id, long compID, int index,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
this.id = id;
this.compID = compID;
this.index = index;
Expand All @@ -3267,7 +3269,7 @@ private class FixUpInfo {
* @param resolvedDataTypes hashtable used for resolving the data type
*/
FixUpInfo(long id, long compID, DataTypeComponent sourceDtc,
Map<Long, DataType> resolvedDataTypes) {
MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
this(id, compID, getComponentFixupIndex(sourceDtc), resolvedDataTypes);
if (sourceDtc.isBitFieldComponent()) {
BitFieldDataType bfDt = (BitFieldDataType) sourceDtc.getDataType();
Expand Down Expand Up @@ -3337,13 +3339,34 @@ DataTypeManager getDataTypeManager() {
return dtms[MY];
}
}

/**
* <code>MyIdentityHashMap</code> extends {@link HashMap} with the only difference being its
* implementation of {@link #hashCode()} and {@link #equals(Object)} which are based purely on
* the map instance identity and not its content.
* <p>
* This unique implementation was created due to the use of this map as a key within another
* {@code Map}.
*/
private static class MyIdentityHashMap<K, V> extends HashMap<K, V> {

@Override
public int hashCode() {
return System.identityHashCode(this);
}

@Override
public boolean equals(Object o) {
return o == this;
}
}

/**
* CleanUpInfo .
*/
private class CleanUpInfo {
long id;
Map<Map<Long, DataType>, int[]> map; // resolvedDataTypesMap, indexArray
Map<MyIdentityHashMap<Long, DataType>, int[]> map; // resolvedDataTypesMap, indexArray

/**
* Construct info needed to clean up place holder data types after base types
Expand All @@ -3360,7 +3383,7 @@ private class CleanUpInfo {
* structure; for other data types, offset is not used (specify -1)
* @param resolvedDataTypes hashtable used for resolving the data type
*/
public void add(int index, Map<Long, DataType> resolvedDataTypes) {
public void add(int index, MyIdentityHashMap<Long, DataType> resolvedDataTypes) {
if (map == null) {
map = new HashMap<>();
}
Expand All @@ -3379,8 +3402,8 @@ private void cleanUp() {
if (map == null) {
return;
}
Set<Map<Long, DataType>> keySet = map.keySet();
Iterator<Map<Long, DataType>> iterator = keySet.iterator();
Set<MyIdentityHashMap<Long, DataType>> keySet = map.keySet();
Iterator<MyIdentityHashMap<Long, DataType>> iterator = keySet.iterator();
while (iterator.hasNext()) {
Map<Long, DataType> ht = iterator.next();
DataType dt = ht.get(id);
Expand Down

0 comments on commit 35d84d5

Please sign in to comment.