yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_9.2'

Browse source
This commit is contained in:
ghidra1 2020-10-02 14:57:09 -04:00
commit 2b08598dba
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptTableModel.java
View file

@ -255,15 +255,17 @@ class GhidraScriptTableModel extends GDynamicColumnTableModel<ResourceFile, Obje
label.setText(null); label.setText(null);
label.setToolTipText(null); label.setToolTipText(null);
if (info.hasErrors()) {
label.setToolTipText("Status: " + info.getErrorMessage());
}
ImageIcon icon = (ImageIcon) data.getValue(); ImageIcon icon = (ImageIcon) data.getValue();
label.setIcon(null); label.setIcon(null);
if (icon != null) { if (icon != null) {
label.setToolTipText("Status: Script has toolbar icon");
label.setIcon(icon); label.setIcon(icon);
if (info.hasErrors()) {
label.setToolTipText("Status: " + info.getErrorMessage());
}
else {
label.setToolTipText("Status: Script has toolbar icon");
}
} }
else { else {
label.setToolTipText("Status: No script toolbar icon has been set"); label.setToolTipText("Status: No script toolbar icon has been set");

2
Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java
View file

@ -518,7 +518,7 @@ public class ScriptInfo {
*/ */
public String getErrorMessage() { public String getErrorMessage() {
if (isCompileErrors()) { if (isCompileErrors()) {
return "Script contains compiler errors"; return "Error compiling script (see console)";
} }
if (isDuplicate()) { if (isDuplicate()) {

2
Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskDialog.java
View file

@ -36,7 +36,7 @@ import ghidra.util.timer.GTimer;
* Swing Thread. * Swing Thread.
* *
* <p>Implementation note: * <p>Implementation note:
* if this class is constructed with a {@code hasProgrees} value of {@code false}, * if this class is constructed with a {@code hasProgress} value of {@code false},
* then an activity component will be shown, not a progress monitor. Any calls to update * then an activity component will be shown, not a progress monitor. Any calls to update
* progress will not affect the display. However, the display can be converted to use progress * progress will not affect the display. However, the display can be converted to use progress
* by first calling {@link #setIndeterminate(boolean)} with a {@code false} value and then calling * by first calling {@link #setIndeterminate(boolean)} with a {@code false} value and then calling

16
Ghidra/Processors/SuperH/data/languages/superh.cspec
View file

@ -29,6 +29,19 @@
<default_proto> <default_proto>
<prototype name="__stdcall" extrapop="0" stackshift="0"> <prototype name="__stdcall" extrapop="0" stackshift="0">
<input> <input>
<pentry minsize="4" maxsize="4" metatype="float">
<register name="fr4"/>
</pentry>
<pentry minsize="4" maxsize="4" metatype="float">
<register name="fr5"/>
</pentry>
<pentry minsize="4" maxsize="4" metatype="float">
<register name="fr6"/>
</pentry>
<pentry minsize="4" maxsize="4" metatype="float">
<register name="fr7"/>
</pentry>
<pentry minsize="1" maxsize="4" extension="inttype"> <pentry minsize="1" maxsize="4" extension="inttype">
<register name="r4"/> <register name="r4"/>
</pentry> </pentry>
@ -46,6 +59,9 @@
</pentry> </pentry>
</input> </input>
<output killedbycall="true"> <output killedbycall="true">
<pentry minsize="4" maxsize="4" metatype="float">
<register name="fr0"/>
</pentry>
<pentry minsize="1" maxsize="4" extension="inttype"> <pentry minsize="1" maxsize="4" extension="inttype">
<register name="r0"/> <register name="r0"/>
</pentry> </pentry>

2
Ghidra/Processors/SuperH/data/languages/superh.sinc
View file

@ -2228,7 +2228,7 @@ define pcodeop Sleep_Standby;
# FSUB FRm, FRn 1111nnnnmmmm0001 FRn - FRm → FRn # FSUB FRm, FRn 1111nnnnmmmm0001 FRn - FRm → FRn
:fsub ffrm_04_07, ffrn_08_11 is fop_12_15=0b1111 & ffrn_08_11 & ffrm_04_07 & fop_00_03=0b0001 :fsub ffrm_04_07, ffrn_08_11 is fop_12_15=0b1111 & ffrn_08_11 & ffrm_04_07 & fop_00_03=0b0001
{ {
ffrn_08_11 = ffrn_08_11 - ffrm_04_07; ffrn_08_11 = ffrn_08_11 f- ffrm_04_07;
} }
# TODO: FSUB DRm, DRn 1111nnn0mmm00001 DRn - DRm → DRn # TODO: FSUB DRm, DRn 1111nnn0mmm00001 DRn - DRm → DRn