yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-381_dev747368_fix_dwarfconflicthandler_struct_bitfields--SQUASHED' into Ghidra_9.2

Browse source
This commit is contained in:
ghidra1 2020-11-10 13:47:02 -05:00
commit bc6a008add
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeConflictHandler.java
View file

@ -15,10 +15,11 @@
*/ */
package ghidra.app.util.bin.format.dwarf4.next; package ghidra.app.util.bin.format.dwarf4.next;
import static ghidra.program.model.data.DataTypeConflictHandler.ConflictResult.*;
import java.util.*; import java.util.*;
import ghidra.program.model.data.*; import ghidra.program.model.data.*;
import static ghidra.program.model.data.DataTypeConflictHandler.ConflictResult.*;
/** /**
* This {@link DataTypeConflictHandler conflict handler} attempts to match * This {@link DataTypeConflictHandler conflict handler} attempts to match
@ -185,22 +186,24 @@ class DWARFDataTypeConflictHandler extends DataTypeConflictHandler {
} }
private DataTypeComponent getBitfieldByOffsets(Structure full, DataTypeComponent partDTC) { private DataTypeComponent getBitfieldByOffsets(Structure full, DataTypeComponent partDTC) {
DataTypeComponent fullDTC = full.getComponentAt(partDTC.getOffset());
if (fullDTC == null || fullDTC.getOffset() != partDTC.getOffset()) {
return null;
}
BitFieldDataType partBF = (BitFieldDataType) partDTC.getDataType(); BitFieldDataType partBF = (BitFieldDataType) partDTC.getDataType();
DataTypeComponent fullDTC = full.getComponentAt(partDTC.getOffset());
if (fullDTC == null) {
return null;
}
int fullNumComp = full.getNumComponents(); int fullNumComp = full.getNumComponents();
for(int fullOrdinal = fullDTC.getOrdinal(); fullOrdinal < fullNumComp; fullOrdinal++) { for(int fullOrdinal = fullDTC.getOrdinal(); fullOrdinal < fullNumComp; fullOrdinal++) {
fullDTC = full.getComponent(fullOrdinal); fullDTC = full.getComponent(fullOrdinal);
if (fullDTC.getOffset() != partDTC.getOffset() if (!(fullDTC.getDataType() instanceof BitFieldDataType) ||
|| !(fullDTC.getDataType() instanceof BitFieldDataType)) { fullDTC.getOffset() > partDTC.getOffset()) {
return null; break;
} }
BitFieldDataType fullBF = (BitFieldDataType) fullDTC.getDataType(); BitFieldDataType fullBF = (BitFieldDataType) fullDTC.getDataType();
if ( fullBF.getBitOffset() == partBF.getBitOffset() ) { if (fullDTC.getOffset() == partDTC.getOffset() &&
fullBF.getBitOffset() == partBF.getBitOffset() &&
fullBF.getBitSize() == partBF.getBitSize()) {
return fullDTC; return fullDTC;
} }
} }
@ -339,7 +342,7 @@ class DWARFDataTypeConflictHandler extends DataTypeConflictHandler {
private long getDTPairKey(DataType dataType1, DataType dataType2) { private long getDTPairKey(DataType dataType1, DataType dataType2) {
return ((long) System.identityHashCode(dataType1) << 32) return ((long) System.identityHashCode(dataType1) << 32)
+ ((long) System.identityHashCode(dataType2) & 0xffffffffL); + (System.identityHashCode(dataType2) & 0xffffffffL);
} }
private boolean addVisited(DataType dataType1, DataType dataType2, Set<Long> visitedDataTypes) { private boolean addVisited(DataType dataType1, DataType dataType2, Set<Long> visitedDataTypes) {