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

GP-1572 - Set Equates - continuation of pull request to allow users to

Browse source 
apply equates from enums where multiple names are mapped to a single
value.

Closes #3618
This commit is contained in:
dragonmacher 2021-12-10 17:29:20 -05:00
parent 1da1c9fef3
commit 6746fdf60a
13 changed files with 1172 additions and 1004 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDB.java
View file

@ -169,7 +169,7 @@ class EnumDB extends DataTypeDB implements Enum {
checkIsValid();
initializeIfNeeded();
List<String> list = valueMap.get(value);
if (list == null) {
if (list == null || list.isEmpty()) {
return new String[0];
}
return list.toArray(new String[0]);

47
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/EquateDB.java
View file

@ -66,9 +66,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return true;
}
/**
* @see ghidra.program.model.symbol.Equate#addReference(ghidra.program.model.address.Address, int)
*/
@Override
public void addReference(Address refAddr, int opIndex) {
checkDeleted();
@ -95,9 +92,6 @@ public class EquateDB extends DatabaseObject implements Equate {
}
}
/**
* @see ghidra.program.model.symbol.Equate#addReference(long, ghidra.program.model.address.Address)
*/
@Override
public void addReference(long dynamicHash, Address refAddr) {
checkDeleted();
@ -145,9 +139,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return opIndex;
}
/**
* @see ghidra.program.model.symbol.Equate#getName()
*/
@Override
public String getName() {
checkIsValid();
@ -178,9 +169,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return null;
}
/**
* @see ghidra.program.model.symbol.Equate#getReferenceCount()
*/
@Override
public int getReferenceCount() {
checkIsValid();
@ -193,9 +181,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return 0;
}
/**
* @see ghidra.program.model.symbol.Equate#getReferences()
*/
@Override
public EquateReference[] getReferences() {
checkIsValid();
@ -208,9 +193,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return new EquateReference[0];
}
/**
* @see ghidra.program.model.symbol.Equate#getReferences(Address)
*/
@Override
public List<EquateReference> getReferences(Address refAddr) {
Lock lock = equateMgr.getLock();
@ -229,27 +211,18 @@ public class EquateDB extends DatabaseObject implements Equate {
return new ArrayList<>();
}
/**
* @see ghidra.program.model.symbol.Equate#getValue()
*/
@Override
public long getValue() {
checkIsValid();
return record.getLongValue(EquateDBAdapter.VALUE_COL);
}
/**
* @see ghidra.program.model.symbol.Equate#getDisplayValue()
*/
@Override
public String getDisplayValue() {
long val = getValue();
return ((val < 0) ? "-" : "") + "0x" + Long.toHexString(Math.abs(val));
}
/**
* @see ghidra.program.model.symbol.Equate#removeReference(ghidra.program.model.address.Address, int)
*/
@Override
public void removeReference(Address refAddr, int opIndex) {
checkDeleted();
@ -261,9 +234,6 @@ public class EquateDB extends DatabaseObject implements Equate {
}
}
/**
* @see ghidra.program.model.symbol.Equate#removeReference(long, ghidra.program.model.address.Address)
*/
@Override
public void removeReference(long dynamicHash, Address refAddr) {
checkDeleted();
@ -275,9 +245,6 @@ public class EquateDB extends DatabaseObject implements Equate {
}
}
/**
* @see ghidra.program.model.symbol.Equate#renameEquate(java.lang.String)
*/
@Override
public void renameEquate(String newName) throws DuplicateNameException, InvalidInputException {
Lock lock = equateMgr.getLock();
@ -294,6 +261,7 @@ public class EquateDB extends DatabaseObject implements Equate {
throw new DuplicateNameException("Equate named " + newName + " already exists");
}
catch (NotFoundException e) {
// this is expected, since an existing name will be an unwanted duplicate
}
catch (IOException e) {
equateMgr.dbError(e);
@ -333,10 +301,6 @@ public class EquateDB extends DatabaseObject implements Equate {
return getName().startsWith(EquateManager.DATATYPE_TAG);
}
/**
*
* @see java.lang.Object#equals(Object)
*/
@Override
public boolean equals(Object obj) {
@ -350,26 +314,19 @@ public class EquateDB extends DatabaseObject implements Equate {
if (getClass() != obj.getClass()) {
return false;
}
Equate eq = (Equate) obj;
Equate eq = (Equate) obj;
if (getValue() != eq.getValue()) {
return false;
}
return getName().equals(eq.getName());
}
/**
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
return getName().hashCode();
}
/**
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return getDisplayName();

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Enum.java
View file

@ -37,6 +37,13 @@ public interface Enum extends DataType {
*/
public String getName(long value);
/**
* Returns all names that map to the given value.
* @param value value for the enum entries.
* @return all names; null if there is not name for the given value.
*/
public String[] getNames(long value);
/**
* Get the comment for the given name.
* @param name name of the entry.

9
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java
View file

@ -96,6 +96,15 @@ public class EnumDataType extends GenericDataType implements Enum {
return list.get(0);
}
@Override
public String[] getNames(long value) {
List<String> list = valueMap.get(value);
if (list == null || list.isEmpty()) {
return null;
}
return list.toArray(new String[0]);
}
@Override
public String getComment(String valueName) {
String comment = commentMap.get(valueName);