From ca1047cd970f3ef09c3aec6dc756fe0a830e7607 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Thu, 1 Oct 2020 10:58:55 -0400 Subject: [PATCH 1/2] fix #2283 - 'persistent' spelling error --- .../formats/gfilesystem/FileSystemService.java | 2 +- .../java/ghidra/util/state/VarnodeOperation.java | 2 +- .../Features/Decompiler/ghidra_scripts/GraphAST.java | 2 +- .../ghidra/program/model/pcode/PcodeFactory.java | 2 +- .../ghidra/program/model/pcode/PcodeSyntaxTree.java | 4 ++-- .../java/ghidra/program/model/pcode/Varnode.java | 6 +++--- .../java/ghidra/program/model/pcode/VarnodeAST.java | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java index b2711c6493..1ada2cecae 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java @@ -56,7 +56,7 @@ import ghidra.util.timer.GTimer; * * Refactor fileInfo -> needs dialog to show properties * Refactor GFile.getInfo() to return Map<> instead of String. - * Persistant filesystem - when reopen tool, filesystems should auto-reopen. + * Persistent filesystem - when reopen tool, filesystems should auto-reopen. * Unify GhidraFileChooser with GFileSystem. * Add "Mounted Filesystems" button to show currently opened GFilesystems? * Dockable filesystem browser in FrontEnd. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java index 0d098c9bc1..df53f942cf 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java @@ -170,7 +170,7 @@ public class VarnodeOperation extends Varnode { } @Override - public boolean isPersistant() { + public boolean isPersistent() { return false; } diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/GraphAST.java b/Ghidra/Features/Decompiler/ghidra_scripts/GraphAST.java index f1d5d06ff9..badf03d654 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/GraphAST.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/GraphAST.java @@ -128,7 +128,7 @@ public class GraphAST extends GhidraScript { else if (vn.isUnique()) { colorattrib = "Black"; } - else if (vn.isPersistant()) { + else if (vn.isPersistent()) { colorattrib = "DarkOrange"; } else if (vn.isAddrTied()) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeFactory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeFactory.java index 11e248eec2..da39b07af5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeFactory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeFactory.java @@ -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); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java index 48cd3429a6..4e1002e758 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java @@ -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 diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/Varnode.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/Varnode.java index 58a175c7a9..4e6f867f4b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/Varnode.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/Varnode.java @@ -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))) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java index 8a837809e4..a3c3241b6a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/VarnodeAST.java @@ -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) { From 0d51f0f03e00397630e17b538543a3472dce0957 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Fri, 26 Feb 2021 08:29:15 -0500 Subject: [PATCH 2/2] GP-731: Certify --- .../Base/src/main/java/ghidra/util/state/VarnodeOperation.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java index df53f942cf..33872f6f17 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/VarnodeOperation.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.