From f9e2d6994a14c5d28bc6f6fda97d1f8faf5e8b45 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Sat, 25 Jul 2026 19:37:31 +0200
Subject: [PATCH] Update ImportMarkersAsBookmarks Ghidra script after
 faults.csv format change (mnemonic)

---
 scripts/ghidra/ImportMarkersAsBookmarks.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/ghidra/ImportMarkersAsBookmarks.java b/scripts/ghidra/ImportMarkersAsBookmarks.java
index c3f0c15..268985a 100644
--- a/scripts/ghidra/ImportMarkersAsBookmarks.java
+++ b/scripts/ghidra/ImportMarkersAsBookmarks.java
@@ -33,8 +33,8 @@ public class ImportMarkersAsBookmarks extends GhidraScript {
     int skipped = 0;
     int lineNo = 0;
 
-    // CSV columns: (benchmark, resulttype, faults, fault_address)
-    // Example:     (ip       , OK_MARKER , 4311  , 0x10001B     )
+    // CSV columns: (benchmark, resulttype, faults, fault_address, mnemonic)
+    // Example:     (ip       , OK_MARKER , 4311  , 0x10001B     , mov)
     try (BufferedReader br = new BufferedReader(new FileReader(input))) {
       String line;
       while ((line = br.readLine()) != null) {
@@ -47,7 +47,7 @@ public class ImportMarkersAsBookmarks extends GhidraScript {
 
         // Make sure to always use "," delimiter and never quotations
         String[] parts = line.split(",");
-        if (parts.length != 4) {
+        if (parts.length != 5) {
           skipped++;
           printerr("Line " + lineNo + ": malformed");
           continue;
@@ -57,11 +57,13 @@ public class ImportMarkersAsBookmarks extends GhidraScript {
         String typeText = parts[1].trim();
         String countText = parts[2].trim();
         String addrText = parts[3].trim();
+        String mnemonicText = parts[4].trim();
 
         if (benchText.isEmpty()
             || typeText.isEmpty()
             || countText.isEmpty()
-            || addrText.isEmpty()) {
+            || addrText.isEmpty()
+            || mnemonicText.isEmpty()) {
           skipped++;
           printerr("Line " + lineNo + ": malformed");
           continue;