Merge pull request #34 from timschumi/ghidra-12

Add support for Ghidra 12.0 (and drop the others)

Author: al3xtjames

.github/workflows/main.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
 
     - name: Install Ghidra
       uses: antoniovazquezblanco/setup-ghidra@4ecf6e0dc501f8efc1d74d93645c6d5c1df7f441 # v1.2.1
@@ -55,19 +55,7 @@ jobs:
     strategy:
       matrix:
         ghidra:
-          - "11.0.3"
-          - "11.0.2"
-          - "11.0.1"
-          - "11.0"
-          - "10.4"
-          - "10.3.3"
-          - "10.3.2"
-          - "10.3.1"
-          - "10.3"
-          - "10.2.3"
-          - "10.2.2"
-          - "10.2.1"
-          - "10.2"
+          - "12.0"
 
     needs: build-natives
     runs-on: ubuntu-latest
@@ -82,7 +70,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
 
     - name: Install Ghidra
       uses: antoniovazquezblanco/setup-ghidra@4ecf6e0dc501f8efc1d74d93645c6d5c1df7f441 # v1.2.1

README.md

@@ -30,7 +30,7 @@ This was accepted as a [coreboot project for GSoC 2019][2].
  - Locates and defines global copies of UEFI table pointers (gBS/gRT/gST/etc)
 
 ## Building & Installation
-JDK 11 (or newer) and Ghidra 10.1 (or newer) are required.
+JDK 21 (or newer) and Ghidra 12.0 (or newer) are required.
 
 Ghidra's standard Gradle build system is used. Set the `GHIDRA_INSTALL_DIR`
 environment variable before building, or set it as a Gradle property (useful

src/main/java/firmware/option_rom/LegacyOptionROMLoader.java

@@ -21,6 +21,7 @@
 import ghidra.app.util.bin.ByteProvider;
 import ghidra.app.util.importer.MessageLog;
 import ghidra.app.util.opinion.AbstractLibrarySupportLoader;
+import ghidra.app.util.opinion.Loader.ImporterSettings;
 import ghidra.app.util.opinion.LoadSpec;
 import ghidra.program.flatapi.FlatProgramAPI;
 import ghidra.program.model.address.Address;
@@ -52,14 +53,13 @@ public Collection<LoadSpec> findSupportedLoadSpecs(ByteProvider provider) {
 	}
 
 	@Override
-	protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> options,
-			Program program, TaskMonitor monitor, MessageLog log) throws IOException {
-		BinaryReader reader = new BinaryReader(provider, true);
+	protected void load(Program program, ImporterSettings settings) throws IOException {
+		BinaryReader reader = new BinaryReader(settings.provider(), true);
 		LegacyOptionROMHeader header = new LegacyOptionROMHeader(reader);
 
 		// Create a segment for the entire option ROM.
-		FlatProgramAPI api = new FlatProgramAPI(program, monitor);
-		InputStream romStream = provider.getInputStream(0);
+		FlatProgramAPI api = new FlatProgramAPI(program, settings.monitor());
+		InputStream romStream = settings.provider().getInputStream(0);
 		try {
 			api.createMemoryBlock("Option ROM", api.toAddr(0), romStream, romStream.available(),
 					false);

src/main/java/firmware/uefi_te/TELoader.java

@@ -78,14 +78,12 @@ public Collection<LoadSpec> findSupportedLoadSpecs(ByteProvider provider) {
 	}
 
 	@Override
-	protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> options,
-						Program program, TaskMonitor monitor,
-						MessageLog log) throws IOException {
-		BinaryReader reader = new BinaryReader(provider, true);
+	protected void load(Program program, ImporterSettings settings) throws IOException {
+		BinaryReader reader = new BinaryReader(settings.provider(), true);
 		TerseExecutableHeader teHeader = new TerseExecutableHeader(reader);
 		EFIImageSectionHeader[] sectionHeaders = teHeader.getSections();
-		FlatProgramAPI api = new FlatProgramAPI(program, monitor);
-		InputStream inputStream = provider.getInputStream(0);
+		FlatProgramAPI api = new FlatProgramAPI(program, settings.monitor());
+		InputStream inputStream = settings.provider().getInputStream(0);
 
 		try {
 			// Create a segment for the TE header and section headers.
@@ -112,7 +110,7 @@ protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> optio
 					continue;
 				}
 
-				inputStream = provider.getInputStream(sectionHeader.getVirtualAddress() -
+				inputStream = settings.provider().getInputStream(sectionHeader.getVirtualAddress() -
 						teHeader.getHeaderOffset());
 				long startAddress = teHeader.getImageBase() + sectionHeader.getVirtualAddress();
 				try {