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

GP-1633 added new DataUtilities.createData method without stackPointers

Browse source 
param
This commit is contained in:
ghidra1 2023-03-23 16:17:58 -04:00
parent acb07dd535
commit 14b78c1307
29 changed files with 80 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/ghidra_scripts/FixElfExternalOffsetDataRelocationScript.java
View file

@ -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 {

2
Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateStringCmd.java
View file

@ -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();

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/PefDebugAnalyzer.java
View file

@ -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);

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTable.java
View file

@ -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) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/MakeStringsTask.java
View file

@ -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()));
}

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java
View file

@ -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);

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

@ -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) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationHandler.java
View file

@ -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) {

12
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java
View file

@ -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();

20
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java
View file

@ -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);

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java
View file

@ -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) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Module.java
View file

@ -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) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_SymbolTable.java
View file

@ -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) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objectiveC/ObjectiveC1_Utilities.java
View file

@ -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);
}

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
View file

@ -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;

26
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
View file

@ -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;
}

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java
View file

@ -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);
}
}

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java
View file

@ -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());

6
Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java
View file

@ -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;
}

4
Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestAbstractControlBlock.java
View file

@ -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));
}

2
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/AbstractLocationReferencesTest.java
View file

@ -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;
}

4
Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/data/SettingsTest.java
View file

@ -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();

2
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java
View file

@ -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) {

2
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/AbstractCreateDataBackgroundCmd.java
View file

@ -238,7 +238,7 @@ public abstract class AbstractCreateDataBackgroundCmd<T extends AbstractCreateDa
monitor.checkCanceled();
// Create data at the address using the datatype.
DataUtilities.createData(program, address, dt, dt.getLength(), false, getClearDataMode());
DataUtilities.createData(program, address, dt, dt.getLength(), getClearDataMode());
return true;
}

2
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/CreateTypeDescriptorBackgroundCmd.java
View file

@ -112,7 +112,7 @@ public class CreateTypeDescriptorBackgroundCmd
// Create 'name' char[0] data at the address immediately following structure
Program program = model.getProgram();
Data nameData = DataUtilities.createData(program, arrayAddr, charArray,
charArray.getLength(), false, getClearDataMode());
charArray.getLength(), getClearDataMode());
nameData.setComment(CodeUnit.EOL_COMMENT, "TypeDescriptor.name");

4
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/rtti/CreateVfTableBackgroundCmd.java
View file

@ -112,7 +112,7 @@ public class CreateVfTableBackgroundCmd extends AbstractCreateDataBackgroundCmd<
return false;
}
Data data = DataUtilities.createData(program, terminatorAddress,
PointerDataType.dataType, -1, false, getClearDataMode());
PointerDataType.dataType, -1, getClearDataMode());
TypeDescriptorModel rtti0Model = model.getRtti0Model();
if (rtti0Model != null) {
monitor.checkCanceled();
@ -142,7 +142,7 @@ public class CreateVfTableBackgroundCmd extends AbstractCreateDataBackgroundCmd<
DataType metaPointer = new PointerDataType(program.getDataTypeManager());
try {
DataUtilities.createData(program, metaAddress, metaPointer, metaPointer.getLength(),
false, getClearDataMode());
getClearDataMode());
return true;
}
catch (CodeUnitInsertionException e) {

2
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PublicSymbolApplier.java
View file

@ -81,7 +81,7 @@ public class PublicSymbolApplier extends MsSymbolApplier {
Program program = applicator.getProgram();
if (GuidUtil.isGuidLabel(program, symbolAddress, name)) {
try {
DataUtilities.createData(program, symbolAddress, new GuidDataType(), -1, false,
DataUtilities.createData(program, symbolAddress, new GuidDataType(), -1,
ClearDataMode.CLEAR_ALL_UNDEFINED_CONFLICT_DATA);
}
catch (CodeUnitInsertionException e) {

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) {