mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1814_ghidra1_DataUtilities'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-03-24 08:16:16 -04:00
parent 9594431f09 14b78c1307
commit b2c79f8c7e
29 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java
View File

@@ -128,6 +128,22 @@ public final class DataUtilities {
return false;
}
/**
* Create data where existing data may already exist. Pointer datatype stacking will not
* be performed.
* @param program the program
* @param addr data address (offcut data address only allowed if clearMode == ClearDataMode.CLEAR_ALL_CONFLICT_DATA)
* @param newType new data-type being applied
* @param length data length (used only for Dynamic newDataType which has canSpecifyLength()==true)
* @param clearMode see CreateDataMode
* @return new data created
* @throws CodeUnitInsertionException if data creation failed
*/
public static Data createData(Program program, Address addr, DataType newType, int length,
ClearDataMode clearMode) throws CodeUnitInsertionException {
return createData(program, addr, newType, length, false, clearMode);
}
/**
* Create data where existing data may already exist.
* @param program the program

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View File

@@ -672,7 +672,7 @@ public class HighFunctionDBUtil {
}
try {
return DataUtilities.createData(program, addr, dt, -1, false,
return DataUtilities.createData(program, addr, dt, -1,
DataUtilities.ClearDataMode.CHECK_FOR_SPACE);
}
catch (CodeUnitInsertionException e) {