Fixed signatures loading and applying.

.antProperties.xml

@@ -1,5 +1,5 @@
 <!-- This file is generated on each "Link Ghidra" command.  Do not modify. -->
 
 <project>
-  <property name="ghidra.install.dir" value="D:\ghidra_9.0.1" />
+  <property name="ghidra.install.dir" value="D:\ghidra_9.0.2" />
 </project>

.gitignore

@@ -2,6 +2,6 @@
 /build/
 /bin/
 /dist/
-.antProperties.xml
-.classpath
-.project
+/\.antProperties.xml
+/\.classpath
+/\.project

.project

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

extension.properties

@@ -1,5 +1,5 @@
 name=@extname@
 description=Loader for PSX executables
 author=DrMefistO
-createdOn=30.03.2019
+createdOn=
 version=@extversion@

src/main/java/pat/PatParser.java

@@ -26,8 +26,8 @@
 import ghidra.util.task.TaskMonitor;
 
 public class PatParser {
-	private static final Pattern modulePat = Pattern.compile("([:\\^][0-9A-F]{4}@?) (\\w+) ");
-	private static final Pattern linePat = Pattern.compile("^((?:[0-9A-F\\.]{2})+) ([0-9A-F]{2}) ([0-9A-F]{4}) ([0-9A-F]{4}) ((?:[:\\^][0-9A-F]{4}@? \\w+ )+)((?:[0-9A-F\\.]{2})+)?$");
+	private static final Pattern modulePat = Pattern.compile("([:\\^][0-9A-F]{4}@?) ([\\.\\w]+) ");
+	private static final Pattern linePat = Pattern.compile("^((?:[0-9A-F\\.]{2})+) ([0-9A-F]{2}) ([0-9A-F]{4}) ([0-9A-F]{4}) ((?:[:\\^][0-9A-F]{4}@? [\\.\\w]+ )+)((?:[0-9A-F\\.]{2})+)?$");
 
 	private List<SignatureData> signatures = null;
 	private final TaskMonitor monitor;
@@ -72,9 +72,7 @@ public void applySignatures(ByteProvider provider, Program program, Address imag
 			MaskedBytes fullBytes = sig.getFullBytes();
 			MaskedBytes tmpl = sig.getTemplateBytes();
 
-			long progress = monitor.getProgress();
-			Address addr = program.getMemory().findBytes(startAddr, endAddr, fullBytes.getBytes(), fullBytes.getMasks(), true, monitor);
-			monitor.setProgress(progress);
+			Address addr = program.getMemory().findBytes(startAddr, endAddr, fullBytes.getBytes(), fullBytes.getMasks(), true, TaskMonitor.DUMMY);
 
 			if (addr == null) {
 				monitor.incrementProgress(sig.getModules().size());
@@ -96,11 +94,11 @@ public void applySignatures(ByteProvider provider, Program program, Address imag
 			for (ModuleData data : modules) {
 				Address _addr = addr.add(data.getOffset());
 
-				if (data.getType().isGlobal() || data.getType().isLocal()) {
+				if (data.getType().isGlobal()) {
 					setFunction(program, fpa, _addr, data.getName(), data.getType().isGlobal(), false, log);
 				}
 				else if (!skipRefs && data.getType().isReference()) {
-					setInstrRefName(program, fpa, ps, _addr, data.getName(), log, monitor);
+					setInstrRefName(program, fpa, ps, _addr, data.getName(), log);
 				}
 
 				if (!(skipRefs && data.getType().isReference())) {
@@ -180,13 +178,13 @@ public long getAllModulesCount() {
 		return modulesCount;
 	}
 
-	public static void setInstrRefName(Program program, FlatProgramAPI fpa, PseudoDisassembler ps, Address address, String name, MessageLog log, TaskMonitor monitor) {
+	public static void setInstrRefName(Program program, FlatProgramAPI fpa, PseudoDisassembler ps, Address address, String name, MessageLog log) {
 		ReferenceManager refsMgr = program.getReferenceManager();
 
 		Reference[] refs = refsMgr.getReferencesFrom(address);
 
 		if (refs.length == 0) {
-			disasmInstruction(program, address, monitor);
+			disasmInstruction(program, address);
 			refs = refsMgr.getReferencesFrom(address);
 
 			if (refs.length == 0) {
@@ -196,6 +194,16 @@ public static void setInstrRefName(Program program, FlatProgramAPI fpa, PseudoDi
 					refs = refsMgr.getFlowReferencesFrom(address.add(4));
 
 					Instruction instr = program.getListing().getInstructionAt(address.add(4));
+
+					if (instr == null) {
+						disasmInstruction(program, address.add(4));
+						instr = program.getListing().getInstructionAt(address.add(4));
+
+						if (instr == null) {
+							return;
+						}
+					}
+
 					FlowType flowType = instr.getFlowType();
 
 					if (refs.length == 0 && !(flowType.isJump() || flowType.isCall() || flowType.isTerminal())) {
@@ -218,21 +226,27 @@ public static void setInstrRefName(Program program, FlatProgramAPI fpa, PseudoDi
 		}
 	}
 
-	private static void disasmInstruction(Program program, Address address, TaskMonitor monitor) {
-		long progress = monitor.getProgress();
-		DisassembleCommand cmd = new DisassembleCommand(address, null, false);
-		cmd.applyTo(program, monitor);
-		monitor.setProgress(progress);
+	private static void disasmInstruction(Program program, Address address) {
+		DisassembleCommand cmd = new DisassembleCommand(address, null, true);
+		cmd.applyTo(program, TaskMonitor.DUMMY);
 	}
 
 	public static void setFunction(Program program, FlatProgramAPI fpa, Address address, String name, boolean isFunction, boolean isEntryPoint, MessageLog log) {
 		try {
+			if (fpa.getInstructionAt(address) == null)
+				disasmInstruction(program, address);
+
 			if (isFunction) {
 				fpa.createFunction(address, name);
 			}
 			if (isEntryPoint) {
 				fpa.addEntryPoint(address);
 			}
+
+			if (isFunction && program.getSymbolTable().hasSymbol(address)) {
+				return;
+			}
+
 			program.getSymbolTable().createLabel(address, name, SourceType.IMPORTED);
 		} catch (InvalidInputException e) {
 			log.appendException(e);

src/main/java/psx/PsxAnalyzer.java

@@ -21,17 +21,28 @@
 import ghidra.util.task.TaskMonitor;
 import pat.PatParser;
 
-/**
- * TODO: Provide class-level documentation that describes what this analyzer does.
- */
+
 public class PsxAnalyzer extends AbstractAnalyzer {
 
 	private static final String OPTION_NAME = "PSYQ PAT-File Path";
 	private File file = null;
 
+	public static boolean isPsxLoader(Program program) {
+		return program.getExecutableFormat().equalsIgnoreCase(PsxLoader.PSX_LOADER);
+	}
+
 	public PsxAnalyzer() {
 		super("PSYQ Signatures", "PSX signatures applier", AnalyzerType.INSTRUCTION_ANALYZER);
-		setDefaultEnablement(false);
+	}
+
+	@Override
+	public boolean getDefaultEnablement(Program program) {
+		return isPsxLoader(program);
+	}
+
+	@Override
+	public boolean canAnalyze(Program program) {
+		return isPsxLoader(program);
 	}
 
 	@Override

src/main/java/psx/PsxLoader.java

@@ -65,6 +65,8 @@ public class PsxLoader extends AbstractLibrarySupportLoader {
 			0x00, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00
 	};
 
+	public static final String PSX_LOADER = "PSX Executables Loader";
+
 	private static final byte MAIN_SIGN_MASK[] = new byte[] {
 			0x00, 0x00, 0x00, (byte)0xFF,
 			(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
@@ -75,7 +77,7 @@ public class PsxLoader extends AbstractLibrarySupportLoader {
 
 	@Override
 	public String getName() {
-		return "PSX Executables Loader";
+		return PSX_LOADER;
 	}
 
 	@Override
@@ -131,10 +133,10 @@ protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> optio
 	}
 
 	private void findAndAppyMain(Program program, FlatProgramAPI fpa, MessageLog log, TaskMonitor monitor) {
-		Address mainAddr = program.getMemory().findBytes(fpa.toAddr(psxExe.getInitPc()), MAIN_SIGN, MAIN_SIGN_MASK, true, monitor);
+		Address mainAddr = program.getMemory().findBytes(fpa.toAddr(psxExe.getInitPc()), MAIN_SIGN, MAIN_SIGN_MASK, true, TaskMonitor.DUMMY);
 
 		if (mainAddr != null) {
-			PatParser.setInstrRefName(program, fpa, new PseudoDisassembler(program), mainAddr, "main", log, monitor);
+			PatParser.setInstrRefName(program, fpa, new PseudoDisassembler(program), mainAddr, "main", log);
 		}
 	}