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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-04-09 06:28:40 -04:00
commit b8996c89be
4 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -26,7 +26,8 @@ import ghidra.framework.data.OpenMode;
import ghidra.framework.model.DomainFile;
import ghidra.framework.model.DomainFolder;
import ghidra.framework.options.Options;
import ghidra.program.model.data.*;
import ghidra.program.model.data.PointerDataType;
import ghidra.program.model.data.StandAloneDataTypeManager;
import ghidra.program.model.listing.DataTypeArchive;
import ghidra.program.model.listing.Program;
import ghidra.program.util.ProgramChangeRecord;
@ -255,26 +256,17 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB implements DataType
return pointerSize > 0 && pointerSize <= PointerDataType.MAX_POINTER_SIZE_BYTES;
}
/**
* @see ghidra.program.model.listing.Program#getDataTypeManager()
*/
@Override
public DataTypeManager getDataTypeManager() {
public ProjectDataTypeManager getDataTypeManager() {
return dataTypeManager;
}
/**
* @see ghidra.program.model.listing.Program#getCreationDate()
*/
@Override
public Date getCreationDate() {
Options pl = getOptions(ARCHIVE_INFO);
return pl.getDate(DATE_CREATED, new Date(0));
}
/**
* @see ghidra.program.model.listing.Program#getDefaultPointerSize()
*/
@Override
public int getDefaultPointerSize() {
// Not sure what size this should be so use 4 for now.
@ -283,9 +275,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB implements DataType
return pl.getInt(DEFAULT_POINTER_SIZE, 4);
}
/**
* @see ghidra.program.model.listing.Program#getChanges()
*/
@Override
public DataTypeArchiveDBChangeSet getChanges() {
return (DataTypeArchiveDBChangeSet) changeSet;
@ -581,11 +570,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB implements DataType
super.updateMetadata();
}
@Override
public void updateID() {
dataTypeManager.updateID();
}
@Override
protected void domainObjectRestored() {
super.domainObjectRestored();

21
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataTypeArchive.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -18,6 +18,7 @@ package ghidra.program.model.listing;
import java.util.Date;
import ghidra.program.model.data.DataTypeManagerDomainObject;
import ghidra.program.model.data.StandAloneDataTypeManager;
/**
* This interface represents the main entry point into an object which
@ -37,22 +38,18 @@ public interface DataTypeArchive extends DataTypeManagerDomainObject {
public static final Date JANUARY_1_1970 = new Date(0);
/**
* Determine if this archive has exclusive-write access which may be neccessary for some
* operations.
* @return true if archive has exclusive-write access
* {@return the associated standalone data type manager.}
*/
public boolean hasExclusiveAccess();
@Override
public StandAloneDataTypeManager getDataTypeManager();
/**
* Gets the default pointer size as it may be stored within the data type archive.
* @return default pointer size.
* {@return the default pointer size as it may be stored within the data type archive.}
*/
public int getDefaultPointerSize();
/**
* Returns the creation date of this data type archive.
* existed, then Jan 1, 1970 is returned.
* @return the creation date of this data type archive
* {@return the creation date of this data type archive or Jan 1, 1970 if unknown.}
*/
public Date getCreationDate();
@ -68,6 +65,4 @@ public interface DataTypeArchive extends DataTypeManagerDomainObject {
*/
public void invalidate();
public void updateID();
}