Merge remote-tracking branch 'origin/Ghidra_12.0'

This commit is contained in:
Ryan Kurtz 2025-09-18 14:13:00 -04:00
commit b4a7848a30
3 changed files with 14 additions and 8 deletions

View file

@ -448,7 +448,7 @@
<TD align="left" height="21" width="22%">Function</TD> <TD align="left" height="21" width="22%">Function</TD>
<TD align="left" height="21" width="56%">Indicates the source-type associated with the <TD align="left" height="21" width="56%">Indicates the source-type associated with the
function signature (i.e., DEFAULT, ANALYSIS, IMPORTED, USER_DEFINED).</TD> function signature (i.e., DEFAULT, ANALYSIS, IMPORTED, USER_DEFINED, SPECULATIVE).</TD>
</TR> </TR>
<TR> <TR>

View file

@ -1286,6 +1286,8 @@
<li class="listitem" style="list-style-type: none"> <li class="listitem" style="list-style-type: none">
<span class="emphasis"><em>DEFAULT</em></span> - for basic or no information</li> <span class="emphasis"><em>DEFAULT</em></span> - for basic or no information</li>
<li class="listitem" style="list-style-type: none"> <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> <span class="emphasis"><em>ANALYSIS</em></span> - for information derived by an Analyzer</li>
<li class="listitem" style="list-style-type: none"> <li class="listitem" style="list-style-type: none">
<span class="emphasis"><em>IMPORTED</em></span> - for information imported from an external source</li> <span class="emphasis"><em>IMPORTED</em></span> - for information imported from an external source</li>

View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -20,23 +20,27 @@ public enum SourceType {
// database by their ordinal. // database by their ordinal.
/** The object's source indicator for an auto analysis. */ /** The object's source indicator for an auto analysis. */
ANALYSIS("Analysis", 2), ANALYSIS("Analysis", 3),
/** The object's source indicator for a user defined. */ /** The object's source indicator for a user defined. */
USER_DEFINED("User Defined", 4), USER_DEFINED("User Defined", 5),
/** The object's source indicator for a default. */ /** The object's source indicator for a default. */
DEFAULT("Default", 1), DEFAULT("Default", 1),
/** The object's source indicator for an imported. */ /** The object's source indicator for an imported. */
IMPORTED("Imported", 3); IMPORTED("Imported", 4),
/** The object's source indicator for something that is somewhat of an educated guess. */
SPECULATIVE("Speculative", 2);
private final String displayString; private final String displayString;
private final int priority; // bigger numbers are higher priorty private final int priority; // bigger numbers are higher priority
private SourceType(String displayString, int priority) { private SourceType(String displayString, int priority) {
this.displayString = displayString; this.displayString = displayString;
this.priority = priority; this.priority = priority;
} }
/** Returns a user-friendly string */ /**
* {@return a user-friendly string}
*/
public String getDisplayString() { public String getDisplayString() {
return displayString; return displayString;
} }