yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-10-03 11:05:47 -04:00
commit 4443aea353
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java
View file

@ -595,6 +595,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe
JButton button = getActionButton("Make Selection"); JButton button = getActionButton("Make Selection");
assertNotNull(button); assertNotNull(button);
pressButton(button); pressButton(button);
waitForSwing();
CodeBrowserPlugin cbPlugin = getPlugin(tool, CodeBrowserPlugin.class); CodeBrowserPlugin cbPlugin = getPlugin(tool, CodeBrowserPlugin.class);
ProgramSelection currentSelection = cbPlugin.getCurrentSelection(); ProgramSelection currentSelection = cbPlugin.getCurrentSelection();

2
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java
View file

@ -146,6 +146,8 @@ public class VTMatchTableProvider extends ComponentProviderAdapter
updateFilterDisplay(); updateFilterDisplay();
setTableSelecionState(saveState); setTableSelecionState(saveState);
refilter();
} }
private void setTableSelecionState(SaveState saveState) { private void setTableSelecionState(SaveState saveState) {

1
Ghidra/Processors/ARM/data/manuals/ARM.idx
View file

@ -20,6 +20,7 @@ blx, 7198
bx, 7200 bx, 7200
bxj, 7202 bxj, 7202
cbnz, 7203 cbnz, 7203
cbz, 7203
clrex, 7204 clrex, 7204
clz, 7205 clz, 7205
cmn, 7212 cmn, 7212