Debugger: Added support for WLA-DX symbol files for SMS

+ Added support for WLA-DX's "nocash" symbol output format
SourMesen · Jan 12, 2024 · e3076c6 · e3076c6
1 parent 5c2a115
commit e3076c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/UI/Debugger/Integration/WlaDxImporter.cs b/UI/Debugger/Integration/WlaDxImporter.cs
@@ -108,9 +108,12 @@ public void Import(string path, bool showResult)
 		int errorCount = 0;
 		bool isAsar = false;
 
+		//When [labels] tag isn't found, the symbols were output using the "nocash" symbol format (-s vs -S command line option)
+		bool labelsOnly = !lines.Contains("[labels]");
+
 		for(int i = 0; i < lines.Length; i++) {
 			string str = lines[i].Trim();
-			if(str == "[labels]") {
+			if(labelsOnly || str == "[labels]") {
 				for(; i < lines.Length; i++) {
 					if(lines[i].Length > 0) {
 						Match m = _labelRegex.Match(lines[i]);
@@ -303,3 +306,15 @@ protected override AddressInfo GetLabelAddress(int bank, int addr)
 		return new AddressInfo() { Address = bank * 0x2000 + (addr & 0x1FFF), Type = MemoryType.PcePrgRom };
 	}
 }
+
+public class SmsWlaDxImporter : WlaDxImporter
+{
+	protected override AddressInfo GetLabelAddress(int bank, int addr)
+	{
+		if(addr >= 0xC000) {
+			return new AddressInfo() { Address = addr - 0xC000, Type = MemoryType.SmsWorkRam };
+		} else {
+			return new AddressInfo() { Address = bank * 0x4000 + (addr & 0x3FFF), Type = MemoryType.SmsPrgRom };
+		}
+	}
+}
diff --git a/UI/Debugger/Utilities/DebugWorkspaceManager.cs b/UI/Debugger/Utilities/DebugWorkspaceManager.cs
@@ -96,7 +96,7 @@ public static void LoadSymFile(string path, bool showResult)
 		{
 			if(File.Exists(path) && Path.GetExtension(path).ToLower() == "." + FileDialogHelper.SymFileExt) {
 				string symContent = File.ReadAllText(path);
-				if(symContent.Contains("[labels]")) {
+				if(symContent.Contains("[labels]") || symContent.Contains("this file was created with wlalink")) {
 					//Assume WLA-DX symbol files
 					WlaDxImporter? importer = null;
 					switch(_romInfo.ConsoleType) {
@@ -110,6 +110,7 @@ public static void LoadSymFile(string path, bool showResult)
 
 						case ConsoleType.Gameboy: importer = new GbWlaDxImporter(); break;
 						case ConsoleType.PcEngine: importer = new PceWlaDxImporter(); break;
+						case ConsoleType.Sms: importer = new SmsWlaDxImporter(); break;
 					}
 
 					if(importer != null) {