From b9075dd4e1d8d82dcbefc3f7176ab9449a31401f Mon Sep 17 00:00:00 2001 From: ghidorahrex Date: Tue, 15 Aug 2023 16:35:26 +0000 Subject: [PATCH 1/3] GP-3724: Added cbz instruction to arm manual index file --- Ghidra/Processors/ARM/data/manuals/ARM.idx | 1 + 1 file changed, 1 insertion(+) diff --git a/Ghidra/Processors/ARM/data/manuals/ARM.idx b/Ghidra/Processors/ARM/data/manuals/ARM.idx index 851c426c53..f9aa409653 100644 --- a/Ghidra/Processors/ARM/data/manuals/ARM.idx +++ b/Ghidra/Processors/ARM/data/manuals/ARM.idx @@ -20,6 +20,7 @@ blx, 7198 bx, 7200 bxj, 7202 cbnz, 7203 +cbz, 7203 clrex, 7204 clz, 7205 cmn, 7212 From c98d240bacae0f726f3cdb72f1a30a2936e94225 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:42:16 -0400 Subject: [PATCH 2/3] GP-3901 - Version Tracking - Fixed bug that prevented the matches table from using saved filters at startup --- .../vt/gui/provider/matchtable/VTMatchTableProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java index 32e5a4bc98..58fc1ada4c 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java @@ -146,6 +146,8 @@ public class VTMatchTableProvider extends ComponentProviderAdapter updateFilterDisplay(); setTableSelecionState(saveState); + + refilter(); } private void setTableSelecionState(SaveState saveState) { @@ -232,7 +234,7 @@ public class VTMatchTableProvider extends ComponentProviderAdapter if (matchesTable == null) { return; // we've been disposed } - + int filteredCount = matchesTableModel.getRowCount(); int unfilteredCount = matchesTableModel.getUnfilteredRowCount(); From 21ce9fc12d129554f9ff34eb4a43336f54691edf Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:17:36 -0400 Subject: [PATCH 3/3] Test fix for change to delayed action firing --- .../app/plugin/core/disassembler/AutoTableDisassemblerTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java index 4dabed4b14..0d38c09664 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java @@ -595,6 +595,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe JButton button = getActionButton("Make Selection"); assertNotNull(button); pressButton(button); + waitForSwing(); CodeBrowserPlugin cbPlugin = getPlugin(tool, CodeBrowserPlugin.class); ProgramSelection currentSelection = cbPlugin.getCurrentSelection();