Annotations & fix DumpCurrentFunctionRecursive script

GhidraScripts/DumpCurrentFunctionN.java

@@ -1,6 +1,7 @@
 // Decompile selected function recursively (until a given number of new functions is reached)
 // @category _Reman3
 // @menupath Reman3.Dump N Functions
+// @importpackage org.sqlite
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -50,7 +51,6 @@ public class DumpCurrentFunctionN extends GhidraScript {
     try (FunctionDatabase functionDatabase = new FunctionDatabase(this)) {
 
       GlobalDumper globalDumper = new GlobalDumper(this, functionDatabase);
-      globalDumper.loadGlobalManifest();
 
       FunctionDumper functionDumper = new FunctionDumper(this, functionDatabase, globalDumper);
 

GhidraScripts/DumpCurrentFunctionRecursive.java

@@ -1,6 +1,7 @@
 // Decompile selected function recursively
 // @category _Reman3
 // @menupath Reman3.Dump Current Function (recursive)
+// @importpackage org.sqlite
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,13 +33,24 @@ public class DumpCurrentFunctionRecursive extends GhidraScript {
       List<Function> functionsToDump = new ArrayList<>();
       List<Function> functionsToDumpNew = new ArrayList<>();
       for (Function func : tracer.out) {
-        if (FunctionDumper.isDumpedFix(func))
+        List<FunctionDatabase.FunctionEntry> entries = functionDatabase.findEntriesByAddress(func.getEntryPoint());
+        boolean shouldDump = true;
+        boolean isNew = true;
+        for (FunctionDatabase.FunctionEntry entry : entries) {
+          if (entry.type == FunctionDatabase.Type.Fix) {
+            shouldDump = false;
+          }
+          if (entry.type == FunctionDatabase.Type.Fix || entry.type == FunctionDatabase.Type.Auto) {
+            isNew = false;
+          }
+        }
+        if (!shouldDump)
           continue;
 
         println("Dump: " + func.getName());
         functionsToDump.add(func);
 
-        if (!FunctionDumper.isDumpedAuto(func))
+        if (isNew)
           functionsToDumpNew.add(func);
       }
 

GhidraScripts/DumpGlobals.java

@@ -1,6 +1,7 @@
 // Script to refresh all custom globals & types from Ghidra
 // @category _Reman3
 // @menupath Reman3.Redump Globals and Types
+// @importpackage org.sqlite
 
 import ghidra.app.script.GhidraScript;
 import re3lib.GlobalDumper;

GhidraScripts/DumpTypes.java

@@ -1,6 +1,7 @@
 // Script to dump all custom types from Ghidra
 // @category _Reman3
 // @menupath Reman3.Dump Types
+// @importpackage org.sqlite
 
 import ghidra.app.script.GhidraScript;
 import ghidra.program.model.data.DataType;

GhidraScripts/FindRelocations.java

@@ -1,6 +1,7 @@
 // Script to find hardcoded addresses in the binary that need to be relocated
 // @category _Reman3
 // @menupath Reman3.Find and dump Relocations
+// @importpackage org.sqlite
 
 import ghidra.app.script.GhidraScript;
 import ghidra.program.model.listing.*;

GhidraScripts/RedumpStubFunctions.java

@@ -1,6 +1,7 @@
 // Script to regenerate all dumped stub functions
 // @category _Reman3
 // @menupath Reman3.Redump Stub Functions
+// @importpackage org.sqlite
 
 import java.util.List;
 

GhidraScripts/SanitizeGlobalSymbols.java

@@ -1,6 +1,7 @@
 // Script to sanitize global symbols in Ghidra
 // @category _Reman3
 // @menupath Reman3.Sanitize Global Symbols
+// @importpackage org.sqlite
 
 import ghidra.app.script.GhidraScript;
 import re3lib.GlobalDumper;

GhidraScripts/re3lib/RemanConfig.java

@@ -66,7 +66,7 @@ public class RemanConfig {
 
     this.script = script;
 
-    rootDir = new File(script.getSourceFile().getAbsolutePath()).getParentFile().getParentFile().getParentFile().toString();
+    rootDir = new File(script.getSourceFile().getAbsolutePath()).getParentFile().getParentFile().toString();
     outputDir = new File(rootDir, RECOMPILE_PREFIX).toString();
     script.println("Output path: " + outputDir);