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

Merge remote-tracking branch 'origin/GP-731_ryanmkurtz_PR-2324_njfox_refactor_fix-variable-name'

Browse source
This commit is contained in:
ghidra1 2021-02-26 18:26:43 -05:00
commit f94fb42da8
7 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeFactory.java
View file

@ -61,7 +61,7 @@ public interface PcodeFactory {
public HighSymbol getSymbol(long symbolId);
public Varnode setInput(Varnode vn,boolean val);
public void setAddrTied(Varnode vn,boolean val);
public void setPersistant(Varnode vn,boolean val);
public void setPersistent(Varnode vn, boolean val);
public void setUnaffected(Varnode vn,boolean val);
public void setMergeGroup(Varnode vn,short val);
public void setDataType(Varnode vn,DataType type);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java
View file

@ -392,9 +392,9 @@ public class PcodeSyntaxTree implements PcodeFactory {
}
@Override
public void setPersistant(Varnode vn, boolean val) {
public void setPersistent(Varnode vn, boolean val) {
VarnodeAST vnast = (VarnodeAST) vn;
vnast.setPersistant(val);
vnast.setPersistent(val);
}
@Override

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/Varnode.java
View file

@ -255,9 +255,9 @@ public class Varnode {
}
/**
* @return is persistant
* @return is persistent
*/
public boolean isPersistant() {
public boolean isPersistent() {
return false; // Not a valid query with a free varnode
}
@ -476,7 +476,7 @@ public class Varnode {
}
attrstring = el.getAttribute("persists");
if ((attrstring != null) && (SpecXmlUtils.decodeBoolean(attrstring))) {
factory.setPersistant(vn, true);
factory.setPersistent(vn, true);
}
attrstring = el.getAttribute("addrtied");
if ((attrstring != null) && (SpecXmlUtils.decodeBoolean(attrstring))) {

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java
View file

@ -37,7 +37,7 @@ public class VarnodeAST extends Varnode {
private boolean bInput;
private boolean bAddrTied;
private boolean bPersistant;
private boolean bPersistent;
private boolean bUnaffected;
private boolean bFree;
private int uniqId; // Unique Id for distinguishing otherwise identical varnodes
@ -50,7 +50,7 @@ public class VarnodeAST extends Varnode {
super(a, sz);
bInput = false;
bAddrTied = false;
bPersistant = false;
bPersistent = false;
bUnaffected = false;
bFree = true;
uniqId = id;
@ -70,8 +70,8 @@ public class VarnodeAST extends Varnode {
}
@Override
public boolean isPersistant() {
return bPersistant;
public boolean isPersistent() {
return bPersistent;
}
@Override
@ -132,8 +132,8 @@ public class VarnodeAST extends Varnode {
def = null;
}
public void setPersistant(boolean val) {
bPersistant = val;
public void setPersistent(boolean val) {
bPersistent = val;
}
public void setUnaffected(boolean val) {