Debugger: GBA - Import missing ELF symbol objects, improve demangling…

… logic
SourMesen · Sep 24, 2024 · 2d63259 · 2d63259
1 parent caf0835
commit 2d63259
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/UI/Debugger/Integration/ElfImporter.cs b/UI/Debugger/Integration/ElfImporter.cs
@@ -57,7 +57,6 @@ private void PrivateImport(string path, bool showResult, CpuType cpuType)
 								continue;
 							}
 
-
 							//Demangle and replace any invalid characters with underscores
 							name = LabelManager.InvalidLabelRegex.Replace(Demangle(name), "_");
 
@@ -106,11 +105,11 @@ private static string Demangle(string name)
 			List<string> parts = new();
 			int i = 0;
 
-			while(i < name.Length && (name[i] < '0' || name[i] > '9')) {
-				i++;
-			}
-
 			while(true) {
+				while(i < name.Length && (name[i] < '0' || name[i] > '9')) {
+					i++;
+				}
+
 				bool hasLen = false;
 				int start = i;
 				while(i < name.Length && name[i] >= '0' && name[i] <= '9') {
@@ -121,7 +120,7 @@ private static string Demangle(string name)
 				if(hasLen) {
 					int val = int.Parse(name.AsSpan(start, i - start));
 
-					if(start + val <= name.Length) {
+					if(i + val <= name.Length) {
 						string part = name.Substring(i, val);
 						if(!string.IsNullOrWhiteSpace(part) && part != "_GLOBAL__N_1") {
 							parts.Add(part);
@@ -188,10 +187,6 @@ protected override bool TryGetSymbolInfo(SymbolEntry<uint> symbol, int romSize,
 	{
 		symbolInfo = null;
 
-		if(symbol.Type == SymbolType.Object) {
-			return false;
-		}
-
 		uint value = symbol.Value & ~(uint)0x01;
 		AddressInfo relAddr = new AddressInfo() { Address = (int)value, Type = MemoryType.GbaMemory };
 		AddressInfo absAddr = DebugApi.GetAbsoluteAddress(relAddr);