Only support Ghidra 11.4 (#75)

Co-authored-by: Florian Magin <[email protected]>

Author: fmagin

.github/workflows/main.yml

@@ -10,8 +10,9 @@ jobs:
       matrix:
         ghidra:
 #          - "latest"
-          - "11.3.1"
-          - "11.2.1"
+          - "11.4"
+#          - "11.3.2"
+#          - "11.2.1"
           # - "11.1.1"
           # - "11.1"
           # - "11.0.3"

src/main/java/lol/fairplay/ghidraapple/analysis/objectivec/blocks/BlockDataTypes.kt

@@ -48,19 +48,22 @@ class BlockLayoutDataType(
                 "invoke${invokeFunctionTypeSuffix?.let { "_$it" } ?: ""}",
             ).apply {
                 returnType = invokeReturnType
-                arguments = arrayOf(
-                    ParameterDefinitionImpl(
-                        "block",
-                        PointerDataType(
-                            // Throwing this all together at once seems to avoid data type conflicts. If this
-                            //  were instead defined outside the `apply` block and then used inside, it seems
-                            //  to cause two data types to be defined for this singular block layout type.
-                            this@BlockLayoutDataType,
-                            dataTypeManager,
-                        ),
-                        null,
-                    ),
-                ) + parameters
+                setArguments(
+                    *
+                        arrayOf(
+                            ParameterDefinitionImpl(
+                                "block",
+                                PointerDataType(
+                                    // Throwing this all together at once seems to avoid data type conflicts. If this
+                                    //  were instead defined outside the `apply` block and then used inside, it seems
+                                    //  to cause two data types to be defined for this singular block layout type.
+                                    this@BlockLayoutDataType,
+                                    dataTypeManager,
+                                ),
+                                null,
+                            ),
+                        ) + parameters,
+                )
             }
         add(PointerDataType(invokeFunctionType, dataTypeManager), "invoke", null)
         add(PointerDataType(BlockDescriptor1DataType(dataTypeManager), dataTypeManager), "descriptor", null)
@@ -84,21 +87,19 @@ class BlockDescriptor2DataType(
         val copyHelperFunctionDataType =
             FunctionDefinitionDataType("copy_helper").apply {
                 returnType = VoidDataType.dataType
-                arguments =
-                    arrayOf(
-                        ParameterDefinitionImpl("dst", PointerDataType(VoidDataType(), dataTypeManager), null),
-                        ParameterDefinitionImpl("src", PointerDataType(VoidDataType(), dataTypeManager), null),
-                    )
+                setArguments(
+                    ParameterDefinitionImpl("dst", PointerDataType(VoidDataType(), dataTypeManager), null),
+                    ParameterDefinitionImpl("src", PointerDataType(VoidDataType(), dataTypeManager), null),
+                )
             }
         add(PointerDataType(copyHelperFunctionDataType), "copy_helper", null)
         val disposeHelperFunctionDataType =
             FunctionDefinitionDataType("dispose_helper").apply {
                 returnType = VoidDataType.dataType
-                arguments =
-                    arrayOf(
-                        ParameterDefinitionImpl("dst", PointerDataType(VoidDataType(), dataTypeManager), null),
-                        ParameterDefinitionImpl("src", PointerDataType(VoidDataType(), dataTypeManager), null),
-                    )
+                setArguments(
+                    ParameterDefinitionImpl("dst", PointerDataType(VoidDataType(), dataTypeManager), null),
+                    ParameterDefinitionImpl("src", PointerDataType(VoidDataType(), dataTypeManager), null),
+                )
             }
         add(PointerDataType(disposeHelperFunctionDataType, dataTypeManager), "dispose_helper", null)
     }
@@ -149,26 +150,24 @@ class BlockByrefKeepFunctionDefinitionDataType(
     init {
         val blockByRefPointerType =
             PointerDataType(BlockByRef3DataType(dataTypeManager), dataTypeManager)
-        arguments =
-            arrayOf(
-                ParameterDefinitionImpl(null, blockByRefPointerType, null),
-                ParameterDefinitionImpl(null, blockByRefPointerType, null),
-            )
+        setArguments(
+            ParameterDefinitionImpl(null, blockByRefPointerType, null),
+            ParameterDefinitionImpl(null, blockByRefPointerType, null),
+        )
     }
 }
 
 class BlockByrefDestroyFunctionDefinitionDataType(
     dataTypeManager: DataTypeManager,
 ) : FunctionDefinitionDataType("BlockByrefDestroyFunction", dataTypeManager) {
     init {
-        arguments =
-            arrayOf(
-                ParameterDefinitionImpl(
-                    null,
-                    PointerDataType(BlockByRef3DataType(dataTypeManager), dataTypeManager),
-                    null,
-                ),
-            )
+        setArguments(
+            ParameterDefinitionImpl(
+                null,
+                PointerDataType(BlockByRef3DataType(dataTypeManager), dataTypeManager),
+                null,
+            ),
+        )
     }
 }
 

src/main/java/lol/fairplay/ghidraapple/analysis/passes/objcclasses/ApplyAllocTypeOverrideCommand.kt

@@ -42,7 +42,7 @@ class ApplyAllocTypeOverrideCommand(
     ): FunctionSignature {
         val fsig = FunctionDefinitionDataType("tmpname")
         fsig.returnType = type
-        fsig.arguments = arrayOf(ParameterDefinitionImpl("cls", type, null))
+        fsig.setArguments(ParameterDefinitionImpl("cls", type, null))
         if (withVarargs) {
             fsig.setVarArgs(true)
         }

src/main/java/lol/fairplay/ghidraapple/loading/UniversalBinaryLoader.kt

@@ -3,6 +3,7 @@ package lol.fairplay.ghidraapple.loading
 import ghidra.app.util.Option
 import ghidra.app.util.bin.ByteProvider
 import ghidra.app.util.importer.MessageLog
+import ghidra.app.util.opinion.LoadSpec
 import ghidra.app.util.opinion.Loaded
 import ghidra.app.util.opinion.MachoLoader
 import ghidra.framework.model.Project
@@ -24,13 +25,14 @@ class UniversalBinaryLoader : MachoLoader() {
     }
 
     override fun postLoadProgramFixups(
-        loadedPrograms: MutableList<Loaded<Program>>?,
-        project: Project?,
-        options: MutableList<Option>?,
-        messageLog: MessageLog?,
-        monitor: TaskMonitor?,
+        loadedPrograms: List<Loaded<Program>>?,
+        project: Project,
+        loadSpec: LoadSpec,
+        options: List<Option>,
+        messageLog: MessageLog,
+        monitor: TaskMonitor,
     ) {
-        super.postLoadProgramFixups(loadedPrograms, project, options, messageLog, monitor)
+        super.postLoadProgramFixups(loadedPrograms, project, loadSpec, options, messageLog, monitor)
         if (loadedPrograms != null) {
             for (loaded in loadedPrograms) {
                 // The actual program is wrapped, so we need to unwrap it.
@@ -60,7 +62,7 @@ class UniversalBinaryLoader : MachoLoader() {
                         .joinToString("/")
                 loaded.projectFolderPath = newFolderPath
                 // Now that the program is up one folder, we can delete the original one.
-                project?.projectData?.getFolder(originalFolderPath)?.delete()
+                project.projectData?.getFolder(originalFolderPath)?.delete()
             }
         }
     }