Ghidra is a software reverse engineering (SRE) framework
GP-5673: Fix hang at launch caused by repeated filtering of registers table.
Dan4e63ea720139
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.javaindex f9fb1f73cd..87d54e8eae 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.java@@ -1262,22 +1262,26 @@ public class DebuggerRegistersProvider extends ComponentProviderAdapterprotected void displaySelectedRegisters(Set<Register> selected) {List<Register> regs = current.getPlatform().getLanguage().getRegisters();+ List<RegisterRow> toDelete = new ArrayList<>();for (Iterator<Entry<Register, RegisterRow>> it = regMap.entrySet().iterator(); it.hasNext();) {Map.Entry<Register, RegisterRow> ent = it.next();if (!selected.contains(ent.getKey())) {- regsTableModel.delete(ent.getValue());+ toDelete.add(ent.getValue());it.remove();}}+ regsTableModel.deleteWith(toDelete::contains);+ List<RegisterRow> toAdd = new ArrayList<>();for (Register reg : selected) {regMap.computeIfAbsent(reg, r -> {RegisterRow row = new RegisterRow(this, regs.indexOf(reg), reg);- regsTableModel.add(row);+ toAdd.add(row);return row;});}+ regsTableModel.addAll(toAdd);}protected CompletableFuture<Void> loadRegistersAndValues() {