Ghidra is a software reverse engineering (SRE) framework
Revert "GP-6006 Creating a new source type called 'Speculative' which marks symbol names that are less trustworthy than analysis"
ghidra1edea7dfd65cb
diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/Browser_Field_Formatter.htm b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/Browser_Field_Formatter.htmindex da45495a28..1dc739a1da 100644--- a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/Browser_Field_Formatter.htm+++ b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/Browser_Field_Formatter.htm@@ -448,7 +448,7 @@<TD align="left" height="21" width="22%">Function</TD><TD align="left" height="21" width="56%">Indicates the source-type associated with the- function signature (i.e., DEFAULT, ANALYSIS, IMPORTED, USER_DEFINED, SPECULATIVE).</TD>+ function signature (i.e., DEFAULT, ANALYSIS, IMPORTED, USER_DEFINED).</TD></TR><TR>diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.htmlindex 3ec9f0f284..c9475a6a53 100644--- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html+++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html@@ -1286,8 +1286,6 @@<li class="listitem" style="list-style-type: none"><span class="emphasis"><em>DEFAULT</em></span> - for basic or no information</li><li class="listitem" style="list-style-type: none">-<span class="emphasis"><em>SPECULATIVE</em></span> - for information that is less trustworthy</li>-<li class="listitem" style="list-style-type: none"><span class="emphasis"><em>ANALYSIS</em></span> - for information derived by an Analyzer</li><li class="listitem" style="list-style-type: none"><span class="emphasis"><em>IMPORTED</em></span> - for information imported from an external source</li>diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SourceType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SourceType.javaindex 9b92ec5b02..a6f1cce566 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SourceType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SourceType.java@@ -4,9 +4,9 @@* Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.* You may obtain a copy of the License at- *+ ** http://www.apache.org/licenses/LICENSE-2.0- *+ ** Unless required by applicable law or agreed to in writing, software* distributed under the License is distributed on an "AS IS" BASIS,* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.@@ -20,27 +20,23 @@ public enum SourceType {// database by their ordinal./** The object's source indicator for an auto analysis. */- ANALYSIS("Analysis", 3),+ ANALYSIS("Analysis", 2),/** The object's source indicator for a user defined. */- USER_DEFINED("User Defined", 5),+ USER_DEFINED("User Defined", 4),/** The object's source indicator for a default. */DEFAULT("Default", 1),/** The object's source indicator for an imported. */- IMPORTED("Imported", 4),- /** The object's source indicator for something that is somewhat of an educated guess. */- SPECULATIVE("Speculative", 2);+ IMPORTED("Imported", 3);private final String displayString;- private final int priority; // bigger numbers are higher priority+ private final int priority; // bigger numbers are higher priortyprivate SourceType(String displayString, int priority) {this.displayString = displayString;this.priority = priority;}- /**- * {@return a user-friendly string}- */+ /** Returns a user-friendly string */public String getDisplayString() {return displayString;}