Upgrade for 10.3

Your Name · Your Name · commit 5a42d40226da · 2023-05-17T15:24:35.000+01:00
diff --git a/.github/workflows/build_on_tag_push.yml b/.github/workflows/build_on_tag_push.yml
@@ -1,9 +1,9 @@
 name: Ghidra Extension Publish
 
 env:
-  ghidra-url: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_10.2.1_build/ghidra_10.2.1_PUBLIC_20221110.zip
-  ghidra-zip-filename: ghidra_10.2.1_PUBLIC_20221110.zip
-  ghidra-directory: ghidra_10.2.1_PUBLIC
+  ghidra-url: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_10.3_build/ghidra_10.3_PUBLIC_20230510.zip
+  ghidra-zip-filename: ghidra_10.3_PUBLIC_20230510.zip
+  ghidra-directory: ghidra_10.3_PUBLIC
 
 on:
   push:
@@ -16,6 +16,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'gradle'
 
     - name: Get the version
       id: get_version
@@ -33,14 +38,11 @@ jobs:
     - name: Build
       shell: bash
       run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
         unzip -qq ${{ steps.download-ghidra.outputs.file-path }} -d /opt
         rm -v ${{ env.ghidra-zip-filename }}
         cd lightkeeper
         java --version
-        gradle -Dorg.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64 -PGHIDRA_INSTALL_DIR=/opt/${{ env.ghidra-directory }}
+        gradle -PGHIDRA_INSTALL_DIR=/opt/${{ env.ghidra-directory }}
         mv -v dist/*.zip ${{ github.workspace }}/lightkeeper-${{ steps.get_version.outputs.VERSION }}.zip
 
     - name: Create Release
diff --git a/lightkeeper/.classpath b/lightkeeper/.classpath
diff --git a/lightkeeper/.project b/lightkeeper/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>LightKeeper</name>
+	<name>lightkeeper</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -18,7 +18,7 @@
 		<link>
 			<name>Ghidra</name>
 			<type>2</type>
-			<location>/opt/ghidra_10.2.1_PUBLIC</location>
+			<location>/opt/ghidra_10.3_PUBLIC</location>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/lightkeeper/src/main/java/lightkeeper/controller/Controller.java b/lightkeeper/src/main/java/lightkeeper/controller/Controller.java
@@ -72,7 +72,7 @@ public void colour(TaskMonitor monitor) throws CancelledException {
 		try {
 			colorService.clearAllBackgroundColors();
 			for (AddressRange range : instructionModel.getModelData()) {
-				monitor.checkCanceled();
+				monitor.checkCancelled();
 				var min = range.getMinAddress();
 				var max = range.getMaxAddress();
 				colorService.setBackgroundColor(min, max, Color.GREEN);
@@ -120,7 +120,7 @@ public void addException(Exception exc) {
 	}
 
 	public void importCoverage(TaskMonitor monitor, List<File> files) throws CancelledException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		try {
 			for (File file : files) {
 				monitor.setMessage(String.format("Importing: %s", file.getAbsolutePath()));
@@ -145,7 +145,7 @@ public void importCoverage(TaskMonitor monitor, List<File> files) throws Cancell
 	}
 
 	public void clearCoverage(TaskMonitor monitor) throws CancelledException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Clearing");
 		addMessage("Clearing");
 		monitor.setProgress(0);
@@ -156,7 +156,7 @@ public void clearCoverage(TaskMonitor monitor) throws CancelledException {
 
 	public void refreshCoverage(TaskMonitor monitor) throws CancelledException {
 		try {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			monitor.setMessage("Refreshing");
 			addMessage("Refreshing");
 			monitor.setProgress(0);
diff --git a/lightkeeper/src/main/java/lightkeeper/controller/DisassemblyController.java b/lightkeeper/src/main/java/lightkeeper/controller/DisassemblyController.java
@@ -3,6 +3,7 @@
 import java.awt.Color;
 import java.math.BigInteger;
 
+import docking.widgets.fieldpanel.LayoutModel;
 import docking.widgets.fieldpanel.listener.IndexMapper;
 import docking.widgets.fieldpanel.listener.LayoutModelListener;
 import ghidra.app.decompiler.ClangLine;
@@ -37,7 +38,7 @@ public void modelChanged(TaskMonitor monitor) throws CancelledException {
 			DecompilerActionContext context = (DecompilerActionContext) dprov.getActionContext(null);
 			if (context != null) {
 				DecompilerPanel dpanel = context.getDecompilerPanel();
-				var controller = dpanel.getLayoutModel();
+				LayoutModel controller = dpanel.getFieldPanel().getLayoutModel();
 				controller.addLayoutModelListener(new LayoutModelListener() {
 
 					@Override
@@ -65,13 +66,13 @@ public void updateCoverage(TaskMonitor monitor, DecompilerPanel dpanel) throws C
 
 		for (ClangLine line : dpanel.getLines()) {
 			for (ClangToken token : line.getAllTokens()) {
-				monitor.checkCanceled();
+				monitor.checkCancelled();
 				var address = DecompilerUtils.getClosestAddress(program, token);
 				if (address == null) {
 					continue;
 				}
 				for (AddressRange range : model.getModelData()) {
-					monitor.checkCanceled();
+					monitor.checkCancelled();
 					if (!range.contains(address)) {
 						continue;
 					}
diff --git a/lightkeeper/src/main/java/lightkeeper/io/BinaryLineReader.java b/lightkeeper/src/main/java/lightkeeper/io/BinaryLineReader.java
@@ -6,11 +6,11 @@
 
 public class BinaryLineReader extends BinaryReader {
 
-	protected CountedByteProvider provider;
+	protected CountedByteProvider countedProvider;
 
 	public BinaryLineReader(CountedByteProvider provider) {
 		super(provider, true);
-		this.provider = provider;
+		this.countedProvider = provider;
 	}
 
 	public String readLine() throws IOException {
@@ -22,7 +22,7 @@ public String readLine() throws IOException {
 			}
 
 			if (!isPrintable(c)) {
-				throw new IOException(String.format("Invalid character at position: %d", provider.getPosition()));
+				throw new IOException(String.format("Invalid character at position: %d", countedProvider.getPosition()));
 			}
 
 			buffer.append(c);
diff --git a/lightkeeper/src/main/java/lightkeeper/io/block/BlockReader.java b/lightkeeper/src/main/java/lightkeeper/io/block/BlockReader.java
@@ -40,14 +40,14 @@ public void addException(Exception exc) {
 	}
 
 	public BlockEntry read() throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		var start = reader.readNextUnsignedInt();
 		var size = reader.readNextUnsignedShort();
 		var module = reader.readNextUnsignedShort();
 
 		var block = new BlockEntry(start, size, module);
 		addMessage(String.format("Read Block: %s", block));
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		return block;
 	}
 }
diff --git a/lightkeeper/src/main/java/lightkeeper/io/file/DynamoRioFile.java b/lightkeeper/src/main/java/lightkeeper/io/file/DynamoRioFile.java
@@ -74,18 +74,18 @@ public void addException(Exception exc) {
 	}
 
 	private void readHeader(TaskMonitor monitor) throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Reading header");
 		var headerLine = reader.readLine();
 		addMessage(headerLine);
 		if (!headerLine.equals(HEADER)) {
 			throw new IOException(String.format("Invalid header: '%s' expected '%s'", headerLine, HEADER));
 		}
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 	}
 
 	private void readFlavour(TaskMonitor monitor) throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Reading flavour");
 		var flavourLine = reader.readLine();
 		addMessage(flavourLine);
@@ -95,11 +95,11 @@ private void readFlavour(TaskMonitor monitor) throws CancelledException, IOExcep
 		}
 		flavour = flavourMatcher.group("flavour");
 		addMessage(String.format("Detected flavour: %s", flavour));
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 	}
 
 	private void readTable(TaskMonitor monitor) throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Reading table");
 		var tableLine = reader.readLine();
 		addMessage(tableLine);
@@ -120,22 +120,22 @@ private void readTable(TaskMonitor monitor) throws CancelledException, IOExcepti
 		var count = tableMatcher.group("count");
 		tableCount = Integer.parseInt(count);
 		addMessage(String.format("Detected table count: %d", tableCount));
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 	}
 
 	private void readModules(TaskMonitor monitor) throws CancelledException, IOException {
 		var moduleReader = new ModuleReader(monitor, reader, tableVersion);
 		moduleReader.addListener(this);
 		for (var i = 0; i < tableCount; i++) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			monitor.setMessage(String.format("Reading module: %d", i));
 			var module = moduleReader.read();
 			modules.add(module);
 		}
 	}
 
 	private void readBbHeader(TaskMonitor monitor) throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Reading BB header");
 		var bbHeaderLine = reader.readLine();
 		addMessage(bbHeaderLine);
@@ -147,7 +147,7 @@ private void readBbHeader(TaskMonitor monitor) throws CancelledException, IOExce
 		var blockString = bbHeaderMatcher.group("blocks");
 		blockCount = Integer.parseInt(blockString);
 		addMessage(String.format("Detected: %d blocks", blockCount));
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 	}
 
 	private void readBlocks(TaskMonitor monitor) throws CancelledException, IOException {
@@ -157,7 +157,7 @@ private void readBlocks(TaskMonitor monitor) throws CancelledException, IOExcept
 		var moduleLimits = getModuleLimits();
 
 		for (var i = 0; i < blockCount; i++) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			monitor.setMessage(String.format("Reading block: %d", i));
 			var block = blockReader.read();
 			long moduleLimit = moduleLimits.get(block.getModule());
@@ -167,7 +167,7 @@ private void readBlocks(TaskMonitor monitor) throws CancelledException, IOExcept
 			blocks.add(block);
 		}
 
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 
 		if (provider.getLength() != provider.getPosition()) {
 			throw new IOException(String.format("File has: %d unexpected trailing bytes at position: %d",
diff --git a/lightkeeper/src/main/java/lightkeeper/io/module/ModuleReader.java b/lightkeeper/src/main/java/lightkeeper/io/module/ModuleReader.java
@@ -97,14 +97,14 @@ protected void addMessage(String message) {
 	}
 
 	private void readColumnHeader() throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		monitor.setMessage("Reading Column Header");
 		columnHeader = reader.readLine();
 		addMessage(columnHeader);
 	}
 
 	public ModuleEntry read() throws CancelledException, IOException {
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		var moduleLine = reader.readLine();
 		addMessage(moduleLine);
 
@@ -150,7 +150,7 @@ public ModuleEntry read() throws CancelledException, IOException {
 
 		var module = new ModuleEntry(id, containingId, start, end, entry, checksum, timeStamp, pathString);
 		addMessage(String.format("Read Module: %s", module));
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		return module;
 	}
 
diff --git a/lightkeeper/src/main/java/lightkeeper/model/coverage/CoverageModel.java b/lightkeeper/src/main/java/lightkeeper/model/coverage/CoverageModel.java
@@ -120,9 +120,9 @@ public void update(TaskMonitor monitor) throws CancelledException, IOException {
 
 				Set<Integer> ids = this.getSelectedModuleIds(selectedModules);
 
-				var baseAddress = api.getCurrentProgram().getAddressMap().getImageBase();
+				var baseAddress = api.getCurrentProgram().getImageBase();
 				for (BlockEntry block : file.getBlocks()) {
-					monitor.checkCanceled();
+					monitor.checkCancelled();
 					if (!ids.contains(block.getModule())) {
 						continue;
 					}
diff --git a/lightkeeper/src/main/java/lightkeeper/model/instruction/CoverageInstructionModel.java b/lightkeeper/src/main/java/lightkeeper/model/instruction/CoverageInstructionModel.java
@@ -39,7 +39,7 @@ public void update(TaskMonitor monitor) throws CancelledException {
 		var listing = api.getCurrentProgram().getListing();
 
 		for (AddressRange range : modelRanges) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			var iterator = listing.getInstructions(range.getMinAddress(), true);
 			while (iterator.hasNext()) {
 				var instruction = iterator.next();
diff --git a/lightkeeper/src/main/java/lightkeeper/model/table/CoverageTableModel.java b/lightkeeper/src/main/java/lightkeeper/model/table/CoverageTableModel.java
@@ -39,13 +39,13 @@ public void update(TaskMonitor monitor) throws CancelledException {
 			return;
 		}
 
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 
 		processRanges(monitor);
 
 		monitor.setMessage("Processing complete");
 		addMessage("Processing complete");
-		monitor.checkCanceled();
+		monitor.checkCancelled();
 		notifyUpdate(monitor);
 	}
 
@@ -55,7 +55,7 @@ public void processRanges(TaskMonitor monitor) throws CancelledException {
 		Set<AddressRange> unassigned = new HashSet<>();
 		var api = plugin.getApi();
 		for (var i = 0; i < modelRanges.size(); i++) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			monitor.setMessage(String.format("Processing block %d / %d", i, modelRanges.size()));
 			var range = modelRanges.get(i);
 
@@ -85,7 +85,7 @@ public void processFunctions(TaskMonitor monitor, HashMap<Function, Set<AddressR
 		var i = 0;
 		while (functionIterator.hasNext()) {
 			i++;
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			var function = functionIterator.next();
 			monitor.setMessage(
 					String.format("Processing function (%s) %d / %d", function.getName(), i, functions.size()));
@@ -113,7 +113,7 @@ public CoverageFraction processCodeBlocks(TaskMonitor monitor, Function function
 		var codeBlocks = 0;
 		var hitCodeBlocks = 0;
 		while (codeBlockIterator.hasNext()) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			codeBlocks++;
 
 			monitor.setMessage(String.format("Processing function blocks (%s) %d", function.getName(), codeBlocks));
@@ -123,7 +123,7 @@ public CoverageFraction processCodeBlocks(TaskMonitor monitor, Function function
 
 			var rangeIterator = ranges.iterator();
 			while (rangeIterator.hasNext()) {
-				monitor.checkCanceled();
+				monitor.checkCancelled();
 
 				var range = rangeIterator.next();
 				if (range.getMinAddress().compareTo(cb.getMinAddress()) < 0) {
@@ -150,7 +150,7 @@ public CoverageFraction processInstructions(TaskMonitor monitor, Function functi
 		var instructions = 0;
 		var hitInstructions = 0;
 		while (instructionIterator.hasNext()) {
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			instructions++;
 			monitor.setMessage(
 					String.format("Processing function instructions (%s) %d", function.getName(), instructions));
@@ -159,7 +159,7 @@ public CoverageFraction processInstructions(TaskMonitor monitor, Function functi
 			var instruction = instructionIterator.next();
 			var rangeIterator = ranges.iterator();
 			while (rangeIterator.hasNext()) {
-				monitor.checkCanceled();
+				monitor.checkCancelled();
 				var range = rangeIterator.next();
 
 				if (instruction.getMinAddress().compareTo(range.getMinAddress()) < 0) {
@@ -182,7 +182,7 @@ public void processUnassigned(TaskMonitor monitor, Set<AddressRange> unassigned)
 		var i = 0;
 		while (iterator.hasNext()) {
 			i++;
-			monitor.checkCanceled();
+			monitor.checkCancelled();
 			monitor.setMessage(String.format("Processing unassigned block %d / %d", i, unassigned.size()));
 			addMessage(String.format("Processing unassigned block %d / %d", i, unassigned.size()));
 			var range = iterator.next();

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`
`7`	`7`	`public class BinaryLineReader extends BinaryReader {`
`8`	`8`
`9`		`- protected CountedByteProvider provider;`
	`9`	`+ protected CountedByteProvider countedProvider;`
`10`	`10`
`11`	`11`	`public BinaryLineReader(CountedByteProvider provider) {`
`12`	`12`	`super(provider, true);`
`13`		`- this.provider = provider;`
	`13`	`+ this.countedProvider = provider;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public String readLine() throws IOException {`
`@@ -22,7 +22,7 @@ public String readLine() throws IOException {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`if (!isPrintable(c)) {`
`25`		`- throw new IOException(String.format("Invalid character at position: %d", provider.getPosition()));`
	`25`	`+ throw new IOException(String.format("Invalid character at position: %d", countedProvider.getPosition()));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`buffer.append(c);`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ public void addException(Exception exc) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public BlockEntry read() throws CancelledException, IOException {`
`43`		`- monitor.checkCanceled();`
	`43`	`+ monitor.checkCancelled();`
`44`	`44`	`var start = reader.readNextUnsignedInt();`
`45`	`45`	`var size = reader.readNextUnsignedShort();`
`46`	`46`	`var module = reader.readNextUnsignedShort();`
`47`	`47`
`48`	`48`	`var block = new BlockEntry(start, size, module);`
`49`	`49`	`addMessage(String.format("Read Block: %s", block));`
`50`		`- monitor.checkCanceled();`
	`50`	`+ monitor.checkCancelled();`
`51`	`51`	`return block;`
`52`	`52`	`}`
`53`	`53`	`}`