Merge pull request #61 from NWPlayer123/master

Add Ghidra 10.2 Support
Cuyler36 · Nov 4, 2022 · af629bd · af629bd
2 parents f8c20a7 + 63356c5
commit af629bd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.1.4
+version=1.1.5
diff --git a/src/main/java/gamecubeloader/GameCubeLoader.java b/src/main/java/gamecubeloader/GameCubeLoader.java
@@ -158,7 +158,7 @@ public Collection<LoadSpec> findSupportedLoadSpecs(ByteProvider provider) throws
 	}
 
 	@Override
-	protected List<Program> loadProgram(ByteProvider provider, String programName,
+	protected List<LoadedProgram> loadProgram(ByteProvider provider, String programName,
 			DomainFolder programFolder, LoadSpec loadSpec, List<Option> options, MessageLog log,
 			Object consumer, TaskMonitor monitor)
 			throws IOException, CancelledException {
@@ -181,9 +181,9 @@ protected List<Program> loadProgram(ByteProvider provider, String programName,
 			}
 		}
 
-		List<Program> results = new ArrayList<Program>();
+		List<LoadedProgram> results = new ArrayList<>();
 		if (program != null) {
-			results.add(program);
+			results.add(new LoadedProgram(program, programFolder));
 		}
 
 		return results;

diff --git a/src/main/java/gamecubeloader/analyzer/GCAnalyzer.java b/src/main/java/gamecubeloader/analyzer/GCAnalyzer.java
@@ -16,7 +16,6 @@
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.address.AddressSpace;
 import ghidra.program.model.data.DataType;
-import ghidra.program.model.data.DataTypeConflictException;
 import ghidra.program.model.data.DoubleDataType;
 import ghidra.program.model.data.FloatDataType;
 import ghidra.program.model.data.Undefined1DataType;
@@ -280,9 +279,6 @@ protected void updateDataTypeFromInstruction(Program program, String mnemonic, b
             catch (CodeUnitInsertionException e) {
                 // ignore
             }
-            catch (DataTypeConflictException e) {
-                // ignore
-            }
         }
     }
 

diff --git a/src/main/java/gamecubeloader/common/CodeWarriorDemangler.java b/src/main/java/gamecubeloader/common/CodeWarriorDemangler.java
@@ -12,7 +12,7 @@
 import ghidra.app.util.demangler.Demangler;
 import ghidra.app.util.demangler.DemanglerOptions;
 import ghidra.program.model.listing.Program;
-import ghidra.program.model.util.TypeMismatchException;
+import ghidra.util.map.TypeMismatchException;
 
 public final class CodeWarriorDemangler implements Demangler {
     public final String CODEWARRIOR_DEMANGLE_PROP = "DemangleCW"; /* When defined, forces CodeWarrior demangling on all symbols. */

diff --git a/src/main/java/gamecubeloader/plugins/SymbolMapExporterPlugin.java b/src/main/java/gamecubeloader/plugins/SymbolMapExporterPlugin.java
@@ -64,7 +64,7 @@ public class SymbolMapExporterPlugin extends ProgramPlugin implements ChangeList
     private DockingAction chooseAction;
 
     public SymbolMapExporterPlugin(PluginTool tool) {
-        super(tool, true, true);
+        super(tool);
     }
 
     @Override