diff --git a/Ghidra/Features/Base/ghidra_scripts/FixElfExternalOffsetDataRelocationScript.java b/Ghidra/Features/Base/ghidra_scripts/FixElfExternalOffsetDataRelocationScript.java index 88d68edb88..8fcf7e5c49 100644 --- a/Ghidra/Features/Base/ghidra_scripts/FixElfExternalOffsetDataRelocationScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/FixElfExternalOffsetDataRelocationScript.java @@ -155,7 +155,7 @@ public class FixElfExternalOffsetDataRelocationScript extends GhidraScript { if (isDefaultTypeApplied) { // Replace undefined/default data with offset-pointer - DataUtilities.createData(currentProgram, address, offsetPtrDt, -1, false, + DataUtilities.createData(currentProgram, address, offsetPtrDt, -1, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); } else { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateStringCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateStringCmd.java index f7d2f864ff..3dd6899db4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateStringCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateStringCmd.java @@ -84,7 +84,7 @@ public class CreateStringCmd implements Command { Program program = (Program) obj; try { - DataUtilities.createData(program, addr, stringDataType, length, false, clearMode); + DataUtilities.createData(program, addr, stringDataType, length, clearMode); } catch (CodeUnitInsertionException e) { msg = e.getMessage(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/PefDebugAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/PefDebugAnalyzer.java index 546bc39bd9..7514e7b9b3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/PefDebugAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/PefDebugAnalyzer.java @@ -81,7 +81,7 @@ public class PefDebugAnalyzer extends AbstractAnalyzer { return; } DataType debugDataType = debug.toDataType(); - DataUtilities.createData(program, address, debugDataType, debugDataType.getLength(), false, + DataUtilities.createData(program, address, debugDataType, debugDataType.getLength(), ClearDataMode.CLEAR_ALL_CONFLICT_DATA); Address functionAddress = address.subtract(debug.getDistance()); Function function = listing.getFunctionAt(functionAddress); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java index 9c18cc9ae6..844cf125f8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java @@ -271,7 +271,7 @@ public class AddressTable { // TODO: add in the skip Length for (int j = 0; j < len; j++) { try { // make the data an address pointer - DataUtilities.createData(program, newAddress, adt, adt.getLength(), false, + DataUtilities.createData(program, newAddress, adt, adt.getLength(), DataUtilities.ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); } catch (CodeUnitInsertionException exc) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/MakeStringsTask.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/MakeStringsTask.java index 2cc1dad837..497dd11ee6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/MakeStringsTask.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/MakeStringsTask.java @@ -143,7 +143,7 @@ public class MakeStringsTask extends ProgramTask { Data stringData = null; try { // TODO: Clearing all conflicts might be overly aggressive - stringData = DataUtilities.createData(program, address, dataTypeToCreate, length, false, + stringData = DataUtilities.createData(program, address, dataTypeToCreate, length, DataUtilities.ClearDataMode.CLEAR_ALL_CONFLICT_DATA); events.add(new StringAddedEvent(dataTypeToCreate, address, stringData.getLength())); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java index 1104ac81f5..6d9522dc74 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java @@ -447,7 +447,7 @@ public class StringsAnalyzer extends AbstractAnalyzer { // Using the CreateDataCmd (which doesn't allow you to pass in a length) // creates a string at the starting address up to the length of the next // "00". - DataUtilities.createData(program, start, foundString.getDataType(), length, false, + DataUtilities.createData(program, start, foundString.getDataType(), length, DataUtilities.ClearDataMode.CLEAR_ALL_CONFLICT_DATA); Msg.trace(this, "Created string '" + candidate.getOriginalString() + "' at " + start); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java index bf64d89ae1..62a054a6c1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java @@ -18,11 +18,10 @@ package ghidra.app.util.bin.format.dwarf4.next; import static ghidra.app.util.bin.format.dwarf4.encoding.DWARFAttribute.*; import static ghidra.app.util.bin.format.dwarf4.encoding.DWARFTag.*; +import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import java.io.IOException; - import ghidra.app.cmd.comments.AppendCommentCmd; import ghidra.app.cmd.label.SetLabelPrimaryCmd; import ghidra.app.util.bin.format.dwarf4.*; @@ -977,7 +976,7 @@ public class DWARFFunctionImporter { "\n"); return null; } - Data result = DataUtilities.createData(currentProgram, address, dataType, -1, false, + Data result = DataUtilities.createData(currentProgram, address, dataType, -1, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); variablesProcesesed.add(address); if (eolComment != null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationHandler.java index a0c3fbbb37..6367a8c447 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationHandler.java @@ -95,7 +95,7 @@ abstract public class ElfRelocationHandler implements ExtensionPoint { PointerTypedef dt = new PointerTypedef(null, null, -1, program.getDataTypeManager(), componentOffset); try { - DataUtilities.createData(program, addr, dt, -1, false, + DataUtilities.createData(program, addr, dt, -1, ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); } catch (CodeUnitInsertionException e) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java index b18bb14784..64f93f37be 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java @@ -245,7 +245,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { Address addr = accelerateInfoAddr.add(imagesExtrasOffset); for (DyldCacheImageInfoExtra imageInfoExtra : imageInfoExtraList) { Data d = DataUtilities.createData(program, addr, imageInfoExtra.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); monitor.incrementProgress(1); @@ -265,7 +265,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { Address addr = accelerateInfoAddr.add(initializersOffset); for (DyldCacheAcceleratorInitializer initializer : acceleratorInitializerList) { Data d = DataUtilities.createData(program, addr, initializer.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); Address funcAddr = program.getImageBase().add(initializer.getFunctionsOffset()); try { program.getFunctionManager().createFunction(null, funcAddr, @@ -292,7 +292,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { Address addr = accelerateInfoAddr.add(dofSectionsOffset); for (DyldCacheAcceleratorDof dof : acceleratorDofList) { - Data d = DataUtilities.createData(program, addr, dof.toDataType(), -1, false, + Data d = DataUtilities.createData(program, addr, dof.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); @@ -312,7 +312,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { Address addr = accelerateInfoAddr.add(reExportListOffset); DataType dt = new ArrayDataType(WORD, reExportCount, WORD.getLength()); - DataUtilities.createData(program, addr, dt, -1, false, + DataUtilities.createData(program, addr, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); program.getListing().setComment(addr, CodeUnit.EOL_COMMENT, "re-exports"); monitor.incrementProgress(1); @@ -330,7 +330,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { Address addr = accelerateInfoAddr.add(depListOffset); DataType dt = new ArrayDataType(WORD, depListCount, WORD.getLength()); - DataUtilities.createData(program, addr, dt, -1, false, + DataUtilities.createData(program, addr, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); program.getListing().setComment(addr, CodeUnit.EOL_COMMENT, "dependencies"); monitor.incrementProgress(1); @@ -348,7 +348,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { Address addr = accelerateInfoAddr.add(rangeTableOffset); for (DyldCacheRangeEntry rangeEntry : rangeEntryList) { - Data d = DataUtilities.createData(program, addr, rangeEntry.toDataType(), -1, false, + Data d = DataUtilities.createData(program, addr, rangeEntry.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java index 71d4939094..8e08c0f8c9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java @@ -891,7 +891,7 @@ public class DyldCacheHeader implements StructConverter { monitor.initialize(1); try { DataUtilities.createData(program, space.getAddress(getBaseAddress()), toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); monitor.incrementProgress(1); } catch (CodeUnitInsertionException | DuplicateNameException | IOException e) { @@ -908,7 +908,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(mappingOffset, program, space); for (DyldCacheMappingInfo mappingInfo : mappingInfoList) { Data d = DataUtilities.createData(program, addr, mappingInfo.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); monitor.incrementProgress(1); @@ -928,7 +928,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(mappingWithSlideOffset, program, space); for (DyldCacheMappingAndSlideInfo mappingInfo : cacheMappingAndSlideInfoList) { Data d = DataUtilities.createData(program, addr, mappingInfo.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); monitor.incrementProgress(1); @@ -948,7 +948,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(imagesOffset != 0 ? imagesOffset : imagesOffsetOld, program, space); for (DyldCacheImageInfo imageInfo : imageInfoList) { - Data d = DataUtilities.createData(program, addr, imageInfo.toDataType(), -1, false, + Data d = DataUtilities.createData(program, addr, imageInfo.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); program.getListing().setComment(addr, CodeUnit.EOL_COMMENT, imageInfo.getPath()); addr = addr.add(d.getLength()); @@ -987,7 +987,7 @@ public class DyldCacheHeader implements StructConverter { if (slideInfoList.size() > 0) { for (DyldCacheSlideInfoCommon info : slideInfoList) { Address addr = fileOffsetToAddr(info.getSlideInfoOffset(), program, space); - DataUtilities.createData(program, addr, info.toDataType(), -1, false, + DataUtilities.createData(program, addr, info.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } } @@ -1006,7 +1006,7 @@ public class DyldCacheHeader implements StructConverter { try { if (localSymbolsInfo != null) { Address addr = fileOffsetToAddr(localSymbolsOffset, program, space); - DataUtilities.createData(program, addr, localSymbolsInfo.toDataType(), -1, false, + DataUtilities.createData(program, addr, localSymbolsInfo.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); localSymbolsInfo.markup(program, addr, monitor, log); } @@ -1026,7 +1026,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(branchPoolsOffset, program, space); for (Long element : branchPoolList) { Data d = DataUtilities.createData(program, addr, Pointer64DataType.dataType, - Pointer64DataType.dataType.getLength(), false, + Pointer64DataType.dataType.getLength(), DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); @@ -1046,7 +1046,7 @@ public class DyldCacheHeader implements StructConverter { try { if (accelerateInfo != null && headerType < 9) { Address addr = space.getAddress(accelerateInfoAddr); - DataUtilities.createData(program, addr, accelerateInfo.toDataType(), -1, false, + DataUtilities.createData(program, addr, accelerateInfo.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); accelerateInfo.markup(program, addr, monitor, log); } @@ -1066,7 +1066,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(imagesTextOffset, program, space); for (DyldCacheImageTextInfo imageTextInfo : imageTextInfoList) { Data d = DataUtilities.createData(program, addr, imageTextInfo.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); program.getListing() .setComment(addr, CodeUnit.EOL_COMMENT, imageTextInfo.getPath()); addr = addr.add(d.getLength()); @@ -1088,7 +1088,7 @@ public class DyldCacheHeader implements StructConverter { Address addr = fileOffsetToAddr(subCacheArrayOffset, program, space); for (DyldSubcacheEntry subcacheEntry : subcacheEntryList) { Data d = DataUtilities.createData(program, addr, subcacheEntry.toDataType(), -1, - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); monitor.checkCanceled(); monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java index 97c9a0cb14..6d02f639a1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java @@ -124,7 +124,7 @@ public class LibObjcOptimization implements StructConverter { public void markup(Program program, AddressSpace space, MessageLog log, TaskMonitor monitor) { Address addr = space.getAddress(getAddr()); try { - DataUtilities.createData(program, addr, toDataType(), -1, false, + DataUtilities.createData(program, addr, toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } catch (CodeUnitInsertionException | DuplicateNameException | IOException e) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Module.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Module.java index 2aaa4a4d3d..d6526a242f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Module.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Module.java @@ -75,7 +75,7 @@ public class ObjectiveC1_Module implements StructConverter { _state.program.getAddressFactory().getDefaultAddressSpace().getAddress(_index); DataType dt = toDataType(); try { - DataUtilities.createData(_state.program, address, dt, -1, false, + DataUtilities.createData(_state.program, address, dt, -1, ClearDataMode.CLEAR_ALL_DEFAULT_CONFLICT_DATA); } catch (Exception e) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_SymbolTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_SymbolTable.java index 755bb3ea0e..aecf7421de 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_SymbolTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_SymbolTable.java @@ -131,7 +131,7 @@ public class ObjectiveC1_SymbolTable implements StructConverter { _state.program.getAddressFactory().getDefaultAddressSpace().getAddress(_index); DataType dt = toDataType(); try { - DataUtilities.createData(_state.program, address, dt, -1, false, + DataUtilities.createData(_state.program, address, dt, -1, ClearDataMode.CLEAR_ALL_DEFAULT_CONFLICT_DATA); } catch (Exception e) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Utilities.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Utilities.java index dd0d43290b..2b2ab540d1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Utilities.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Utilities.java @@ -147,7 +147,7 @@ public final class ObjectiveC1_Utilities { // need to clear, as pointers could have been created on import // from following pointer chains - DataUtilities.createData(program, address, dt, -1, false, + DataUtilities.createData(program, address, dt, -1, ClearDataMode.CLEAR_ALL_DEFAULT_CONFLICT_DATA); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java index c3b3ab65de..0c430a66a7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java @@ -2309,7 +2309,7 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper { try { Data d = listing.getDataAt(address); if (d == null || !dt.isEquivalent(d.getDataType())) { - d = DataUtilities.createData(program, address, dt, -1, false, + d = DataUtilities.createData(program, address, dt, -1, ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); } return d; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java index 631ae3b623..0c2b1f4611 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java @@ -836,7 +836,7 @@ public class MachoProgramBuilder { } try { - DataUtilities.createData(program, headerAddr, header.toDataType(), -1, false, + DataUtilities.createData(program, headerAddr, header.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); for (LoadCommand loadCommand : header.getLoadCommands()) { @@ -846,7 +846,7 @@ public class MachoProgramBuilder { Address loadCommandAddr = headerAddr.add(loadCommand.getStartIndex() - header.getStartIndexInProvider()); DataType loadCommandDataType = loadCommand.toDataType(); - DataUtilities.createData(program, loadCommandAddr, loadCommandDataType, -1, false, + DataUtilities.createData(program, loadCommandAddr, loadCommandDataType, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); if (loadCommand instanceof SegmentCommand) { @@ -858,7 +858,7 @@ public class MachoProgramBuilder { for (Section section : segmentCommand.getSections()) { DataType sectionDataType = section.toDataType(); Address sectionAddr = loadCommandAddr.add(sectionOffset); - DataUtilities.createData(program, sectionAddr, sectionDataType, -1, false, + DataUtilities.createData(program, sectionAddr, sectionDataType, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); listing.setComment(sectionAddr, CodeUnit.EOL_COMMENT, section.getSegmentName() + "." + section.getSectionName()); @@ -870,7 +870,7 @@ public class MachoProgramBuilder { LoadCommandString name = dynamicLinkerCommand.getLoadCommandString(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof DynamicLibraryCommand) { DynamicLibraryCommand dynamicLibraryCommand = @@ -878,52 +878,52 @@ public class MachoProgramBuilder { LoadCommandString name = dynamicLibraryCommand.getDynamicLibrary().getName(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof RunPathCommand) { RunPathCommand runPathCommand = (RunPathCommand) loadCommand; LoadCommandString path = runPathCommand.getPath(); DataUtilities.createData(program, loadCommandAddr.add(path.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - path.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof SubFrameworkCommand) { SubFrameworkCommand subFrameworkCommand = (SubFrameworkCommand) loadCommand; LoadCommandString name = subFrameworkCommand.getUmbrellaFrameworkName(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof SubClientCommand) { SubClientCommand subClientCommand = (SubClientCommand) loadCommand; LoadCommandString name = subClientCommand.getClientName(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof SubLibraryCommand) { SubLibraryCommand subLibraryCommand = (SubLibraryCommand) loadCommand; LoadCommandString name = subLibraryCommand.getSubLibraryName(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof SubUmbrellaCommand) { SubUmbrellaCommand subUmbrellaCommand = (SubUmbrellaCommand) loadCommand; LoadCommandString name = subUmbrellaCommand.getSubUmbrellaFrameworkName(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof FileSetEntryCommand) { FileSetEntryCommand fileSetEntryCommand = (FileSetEntryCommand) loadCommand; LoadCommandString name = fileSetEntryCommand.getFileSetEntryId(); DataUtilities.createData(program, loadCommandAddr.add(name.getOffset()), StructConverter.STRING, loadCommand.getCommandSize() - name.getOffset(), - false, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } else if (loadCommand instanceof LinkerOptionCommand) { LinkerOptionCommand linkerOptionCommand = (LinkerOptionCommand) loadCommand; @@ -936,7 +936,7 @@ public class MachoProgramBuilder { len = (int) (NumericUtilities.getUnsignedAlignedValue( addr.add(len).getOffset(), 4) - addr.getOffset()); } - DataUtilities.createData(program, addr, StructConverter.STRING, len, false, + DataUtilities.createData(program, addr, StructConverter.STRING, len, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); offset += len; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java index b7e0585f74..e7d52e4f7e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java @@ -146,7 +146,7 @@ public class MzLoader extends AbstractLibrarySupportLoader { Address addr = headerBlock.getStart(); // Header - DataUtilities.createData(program, addr, mz.getHeader().toDataType(), -1, false, + DataUtilities.createData(program, addr, mz.getHeader().toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); // Relocation Table @@ -157,7 +157,7 @@ public class MzLoader extends AbstractLibrarySupportLoader { addr = addr.add(header.e_lfarlc()); for (int i = 0; i < relocations.size(); i++) { monitor.checkCanceled(); - DataUtilities.createData(program, addr.add(i * len), relocationType, -1, false, + DataUtilities.createData(program, addr.add(i * len), relocationType, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java index 1ea4771c35..4fbf813a3a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java @@ -222,19 +222,19 @@ public class PeLoader extends AbstractPeDebugLoader { try { DataType dt = pe.getDOSHeader().toDataType(); Address start = program.getImageBase(); - DataUtilities.createData(program, start, dt, -1, false, + DataUtilities.createData(program, start, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); dt = pe.getRichHeader().toDataType(); if (dt != null) { start = program.getImageBase().add(pe.getRichHeader().getOffset()); - DataUtilities.createData(program, start, dt, -1, false, + DataUtilities.createData(program, start, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } dt = ntHeader.toDataType(); start = program.getImageBase().add(pe.getDOSHeader().e_lfanew()); - DataUtilities.createData(program, start, dt, -1, false, + DataUtilities.createData(program, start, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); FileHeader fh = ntHeader.getFileHeader(); @@ -243,7 +243,7 @@ public class PeLoader extends AbstractPeDebugLoader { start = program.getImageBase().add(index); for (SectionHeader section : sections) { dt = section.toDataType(); - DataUtilities.createData(program, start, dt, -1, false, + DataUtilities.createData(program, start, dt, -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); setComment(CodeUnit.EOL_COMMENT, start, section.getName()); start = start.add(dt.getLength()); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java index 65ff5f153f..3f49b4e331 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java @@ -643,7 +643,7 @@ public class ProgramBuilder { public void applyFixedLengthDataType(String addressString, DataType dt, int length) { tx(() -> { - DataUtilities.createData(program, addr(addressString), dt, length, false, + DataUtilities.createData(program, addr(addressString), dt, length, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); }); } @@ -688,7 +688,7 @@ public class ProgramBuilder { int previousDataLength = 0; for (int i = 0; i < n; i++) { address = address.addNoWrap(previousDataLength); - Data newStringInstance = DataUtilities.createData(program, address, dt, -1, false, + Data newStringInstance = DataUtilities.createData(program, address, dt, -1, ClearDataMode.CLEAR_SINGLE_DATA); previousDataLength = newStringInstance.getLength(); } @@ -830,7 +830,7 @@ public class ProgramBuilder { startTransaction(); try { Data data = DataUtilities.createData(program, addr, dataType, stringBytes.length, - false, ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); + ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA); CharsetSettingsDefinition.CHARSET.setCharset(data, charset.name()); return data; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestAbstractControlBlock.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestAbstractControlBlock.java index db0fcf8b8f..5b6a47b398 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestAbstractControlBlock.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestAbstractControlBlock.java @@ -304,7 +304,7 @@ public abstract class PCodeTestAbstractControlBlock { throws InvalidControlBlockException, CodeUnitInsertionException { if (applyStruct) { - DataUtilities.createData(program, infoStructAddr, infoProgramStruct, -1, false, + DataUtilities.createData(program, infoStructAddr, infoProgramStruct, -1, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); } @@ -339,7 +339,7 @@ public abstract class PCodeTestAbstractControlBlock { if (applyStruct) { DataUtilities.createData(program, functionInfoAddress, functionInfoStruct, -1, - false, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); + ClearDataMode.CLEAR_ALL_CONFLICT_DATA); forceCodePointer(functionInfoAddress.add(funcOffset)); } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/AbstractLocationReferencesTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/AbstractLocationReferencesTest.java index e10896da19..cd37ddbcdd 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/AbstractLocationReferencesTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/AbstractLocationReferencesTest.java @@ -374,7 +374,7 @@ public abstract class AbstractLocationReferencesTest extends AbstractProgramBase int tx = program.startTransaction("Test"); try { Data data = - DataUtilities.createData(program, a, dt, 1, false, ClearDataMode.CHECK_FOR_SPACE); + DataUtilities.createData(program, a, dt, 1, ClearDataMode.CHECK_FOR_SPACE); assertNotNull("Unable to apply data type at address: " + a, data); return data; } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/data/SettingsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/data/SettingsTest.java index ef2cb9de2a..bd3aa5e7b0 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/data/SettingsTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/data/SettingsTest.java @@ -74,7 +74,7 @@ public class SettingsTest extends AbstractGhidraHeadedIntegrationTest { // } for (int i = 0; i < 40; i++) { - DataUtilities.createData(program, addr(i), StringDataType.dataType, 1, false, + DataUtilities.createData(program, addr(i), StringDataType.dataType, 1, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); } } @@ -202,7 +202,7 @@ public class SettingsTest extends AbstractGhidraHeadedIntegrationTest { @Test public void testInstanceSettings() throws Exception { - Data data = DataUtilities.createData(program, addr(10), ByteDataType.dataType, 1, false, + Data data = DataUtilities.createData(program, addr(10), ByteDataType.dataType, 1, ClearDataMode.CLEAR_ALL_CONFLICT_DATA); DataType dt = data.getDataType(); diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java index e8155c74ad..86230c22e8 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java @@ -288,7 +288,7 @@ public class DumpFileLoader extends AbstractProgramWrapperLoader { } continue; } - DataUtilities.createData(program, address, dd.getDataType(), -1, false, + DataUtilities.createData(program, address, dd.getDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); } catch (CodeUnitInsertionException e) { diff --git a/Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/AbstractCreateDataBackgroundCmd.java b/Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/AbstractCreateDataBackgroundCmd.java index d683e13e6e..10b0fd5c83 100644 --- a/Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/AbstractCreateDataBackgroundCmd.java +++ b/Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/AbstractCreateDataBackgroundCmd.java @@ -238,7 +238,7 @@ public abstract class AbstractCreateDataBackgroundCmd