Removed SYM support (for now), updated to 9.1.2. Added PsyQ sub version detection.

Author: Vladimir Kononovich

.classpath

@@ -18,7 +18,7 @@
 		<link>
 			<name>Ghidra</name>
 			<type>2</type>
-			<location>D:/ghidra_9.1.1_PUBLIC</location>
+			<location>D:/ghidra_9.1.2_PUBLIC</location>
 		</link>
 	</linkedResources>
 </projectDescription>

.project

@@ -15,16 +15,12 @@
  */
 package psx;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
 import docking.widgets.OptionDialog;
 import ghidra.app.cmd.disassemble.DisassembleCommand;
 import ghidra.app.cmd.function.ApplyFunctionDataTypesCmd;
@@ -67,7 +63,6 @@
 import ghidra.util.exception.NotFoundException;
 import ghidra.util.task.TaskMonitor;
 import psyq.DetectPsyQ;
-import psyq.sym.SymFile;
 
 public class PsxLoader extends AbstractLibrarySupportLoader {
 
@@ -225,26 +220,6 @@ protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> optio
 		}
 
 		monitor.setMessage("Loading PSX binary done.");
-		
-		try {
-			TimeUnit.SECONDS.sleep(1);
-		} catch (InterruptedException e) {
-		}
-		
-		if (OptionDialog.YES_OPTION == OptionDialog.showYesNoDialogWithNoAsDefaultButton(null,
-				"Question", "Do you have .SYM file for this executable?")) {
-			String symPath = showSelectFile("Select file...", program.getExecutablePath());
-			
-			if (symPath == null) {
-				return;
-			}
-			
-			int transId = program.startTransaction("Load and apply SYM file...");
-			SymFile symFile = SymFile.fromBinary(symPath, program, log, monitor);
-			symFile.applyOverlays(program, log, monitor);
-			symFile.apply(program, log, monitor);
-			program.endTransaction(transId, true);
-		}
 	}
 
 	public static DataTypeManagerService getDataTypeManagerService(Program program) {
@@ -261,7 +236,8 @@ private static void addPsyqVerOption(Program program, long searchBase, MessageLo
 			opts.registerOption(PSYQ_VER_OPTION, "", null, "PsyQ version");
 
 			if (!psyqVersion.isEmpty()) {
-				String ver = String.format("%s.%s", psyqVersion.charAt(0), psyqVersion.charAt(1));
+				char subVer = psyqVersion.charAt(2);
+				String ver = String.format("%s.%s%s", psyqVersion.charAt(0), psyqVersion.charAt(1), subVer != '0' ? subVer : "");
 				opts.setString(PSYQ_VER_OPTION, ver);
 			}
 		} catch (MemoryAccessException | AddressOutOfBoundsException ignored) {
@@ -338,20 +314,6 @@ public static String getProgramPsyqVersion(Program program) {
 		return opts.getString(PsxLoader.PSYQ_VER_OPTION, "").replace(".", "");
 	}
 
-	private static String showSelectFile(String title, String baseDir) {
-		JFileChooser jfc = new JFileChooser(new File(baseDir));
-		jfc.setDialogTitle(title);
-
-		jfc.setFileFilter(new FileNameExtensionFilter("Symbols File", "sym"));
-		jfc.setMultiSelectionEnabled(false);
-
-		if (jfc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-			return jfc.getSelectedFile().getAbsolutePath();
-		}
-
-		return null;
-	}
-	
 	private static void setRegisterValue(FlatProgramAPI fpa, String name, long startAddress, long value, MessageLog log) {
 		Program program = fpa.getCurrentProgram();
 

src/main/java/psx/PsxLoader.java

@@ -7,8 +7,8 @@
 import ghidra.util.task.TaskMonitor;
 
 public class DetectPsyQ {
-	private final static byte[] VERSION_BYTES = new byte[] {     0x50,       0x73,       0x07, 0x00, 0x00, 0x00, 0x47,       0x00}; // 0x47 - a version
-	private final static byte[] VERSION_MASK = new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xFF, 0x00, 0x00, 0x00, 0x00, (byte)0xFF};
+	private final static byte[] VERSION_BYTES = new byte[] {      0x50,       0x73,       0x07, 0x00, 0x00, 0x00, 0x47,       0x00}; // 0x47 - a version
+	private final static byte[] VERSION_MASK = new byte[]  {(byte)0xFF, (byte)0xFF, (byte)0xFF, 0x00, 0x00, 0x00, 0x00, (byte)0xF0};
 	private final static long VERSION_OFFSET = 0x06L;
 
 	public static String getPsyqVersion(Memory mem, Address startAddress) throws MemoryAccessException, AddressOutOfBoundsException {
@@ -18,7 +18,7 @@ public static String getPsyqVersion(Memory mem, Address startAddress) throws Mem
 			return "";
 		}
 
-		byte version = mem.getByte(result.add(VERSION_OFFSET));
-		return String.format("%02X", version);
+		short version = mem.getShort(result.add(VERSION_OFFSET), true);
+		return String.format("%03X", version >> 4);
 	}
 }