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/GT-3514-dragonmacher-find-uses-exception'

Browse source
This commit is contained in:
ghidorahrex 2020-02-04 13:11:30 -05:00
commit c236edea6e
4 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableOffset.java
View file

@ -120,16 +120,22 @@ public class VariableOffset {
}
/**
* Get list of markup objects
* @return list of markup objects
* Returns the data type access portion of this variable offset as a string
* @return the text
*/
public List<Object> getObjects() {
public String getDataTypeDisplayText() {
List<Object> objects = getObjects(false);
LabelString labelString = (LabelString) objects.get(0);
return labelString.toString();
}
private List<Object> getObjects(boolean showScalarAdjustment) {
DataType dt = variable.getDataType();
StringBuffer name = new StringBuffer(variable.getName());
long scalarAdjustment = 0;
if (includeScalarAdjustment && (replacedElement instanceof Scalar)) {
if (showScalarAdjustment && (replacedElement instanceof Scalar)) {
Scalar s = (Scalar) replacedElement;
scalarAdjustment = variable.isStackVariable() ? s.getSignedValue() : s.getValue();
scalarAdjustment -= offset;
@ -214,6 +220,14 @@ public class VariableOffset {
return list;
}
/**
* Get list of markup objects
* @return list of markup objects
*/
public List<Object> getObjects() {
return getObjects(includeScalarAdjustment);
}
public Variable getVariable() {
return variable;
}