Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 06:55:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GT-3071: Fixing register highlight issue (fixes #810).

Browse Source
This commit is contained in:
Ryan Kurtz
2019-08-08 09:47:10 -04:00
parent 70b5c0478c
commit a585a0eb94
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/ListingHighlightProvider.java
+9 -2
View File
@@ -215,12 +215,19 @@ public class ListingHighlightProvider
List<String> registerNames = gatherRegisterNames(new ArrayList<String>(), register); List<String> registerNames = gatherRegisterNames(new ArrayList<String>(), register);
StringBuilder buffy = new StringBuilder();
for (String s : highlightStrings) { for (String s : highlightStrings) {
if (s != null) { if (s != null) {
buffy.append("\\Q").append(s).append("\\E|"); registerNames.add(s);
} }
} }
// Prioritize exact register matches by ensuring that the longest register name gets
// matched first
Collections.sort(registerNames, (a, b) -> {
return Integer.valueOf(b.length()).compareTo(Integer.valueOf(a.length()));
});
StringBuilder buffy = new StringBuilder();
for (String name : registerNames) { for (String name : registerNames) {
buffy.append("\\Q").append(name).append("\\E|"); buffy.append("\\Q").append(name).append("\\E|");
} }