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

GP-0 corrected typedef default label deferral when auto-naming is in

Browse source 
use.
This commit is contained in:
ghidra1 2022-05-13 16:33:38 -04:00
parent 3deb67aac4
commit 3d0e5bc882
2 changed files with 54 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/TypedefDB.java
View file

@ -421,6 +421,33 @@ class TypedefDB extends DataTypeDB implements TypeDef {
return getName();
}
@Override
public String getDefaultLabelPrefix(MemBuffer buf, Settings settings, int len,
DataTypeDisplayOptions options) {
if (isAutoNamed()) {
return getDataType().getDefaultLabelPrefix(buf, settings, len, options);
}
return super.getDefaultLabelPrefix(buf, settings, len, options);
}
@Override
public String getDefaultAbbreviatedLabelPrefix() {
if (isAutoNamed()) {
return getDataType().getDefaultAbbreviatedLabelPrefix();
}
return super.getDefaultAbbreviatedLabelPrefix();
}
@Override
public String getDefaultOffcutLabelPrefix(MemBuffer buf, Settings settings, int len,
DataTypeDisplayOptions options, int offcutLength) {
if (isAutoNamed()) {
return getDataType().getDefaultOffcutLabelPrefix(buf, settings, len, options,
offcutLength);
}
return super.getDefaultOffcutLabelPrefix(buf, settings, len, options, offcutLength);
}
@Override
public long getLastChangeTime() {
return record.getLongValue(TypedefDBAdapter.TYPEDEF_LAST_CHANGE_TIME_COL);

27
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TypedefDataType.java
View file

@ -128,6 +128,33 @@ public class TypedefDataType extends GenericDataType implements TypeDef {
return getName();
}
@Override
public String getDefaultLabelPrefix(MemBuffer buf, Settings settings, int len,
DataTypeDisplayOptions options) {
if (isAutoNamed()) {
return getDataType().getDefaultLabelPrefix(buf, settings, len, options);
}
return super.getDefaultLabelPrefix(buf, settings, len, options);
}
@Override
public String getDefaultAbbreviatedLabelPrefix() {
if (isAutoNamed()) {
return getDataType().getDefaultAbbreviatedLabelPrefix();
}
return super.getDefaultAbbreviatedLabelPrefix();
}
@Override
public String getDefaultOffcutLabelPrefix(MemBuffer buf, Settings settings, int len,
DataTypeDisplayOptions options, int offcutLength) {
if (isAutoNamed()) {
return getDataType().getDefaultOffcutLabelPrefix(buf, settings, len, options,
offcutLength);
}
return super.getDefaultOffcutLabelPrefix(buf, settings, len, options, offcutLength);
}
@Override
public boolean hasLanguageDependantLength() {
return dataType.hasLanguageDependantLength();