Add label dump

This commit is contained in:
jeffman 2018-12-17 20:06:02 -05:00
parent 42bf108c76
commit 69292b100f
2 changed files with 36 additions and 1 deletions

1
.gitignore vendored
View File

@ -14,6 +14,7 @@ armtest/
saves/ saves/
working/*.asm working/*.asm
working/*.bin working/*.bin
working/m12-labels.txt
armips.exe armips.exe
*.sym *.sym
m2-compiled.asm m2-compiled.asm

View File

@ -443,7 +443,7 @@ namespace ScriptTool
{ {
labelAsmFile.WriteLine(String.Format(".org 0x{0:X} :: .incbin \"m12-main-strings.bin\"", baseAddress | 0x8000000)); labelAsmFile.WriteLine(String.Format(".org 0x{0:X} :: .incbin \"m12-main-strings.bin\"", baseAddress | 0x8000000));
labelAsmFile.WriteLine(); labelAsmFile.WriteLine();
foreach (var file in labelFiles) foreach (var file in labelFiles)
{ {
var mainStringRefs = JsonConvert.DeserializeObject<MainStringRef[]>(File.ReadAllText( var mainStringRefs = JsonConvert.DeserializeObject<MainStringRef[]>(File.ReadAllText(
@ -458,6 +458,15 @@ namespace ScriptTool
} }
IncludeFile.WriteLine(".include \"m12-main-strings.asm\""); IncludeFile.WriteLine(".include \"m12-main-strings.asm\"");
// Dump labels
using (var labelFile = File.CreateText(Path.Combine(options.WorkingDirectory, "m12-labels.txt")))
{
foreach (var kv in m12Compiler.AddressMap.OrderBy(kv => kv.Key, new LabelComparer()))
{
labelFile.WriteLine(String.Format("{0,-30}: 0x{1:X8}", kv.Key, kv.Value | 0x8000000));
}
}
} }
static void CompileM12Misc() static void CompileM12Misc()
@ -680,4 +689,29 @@ namespace ScriptTool
IncludeFile.WriteLine(".include \"" + name + ".asm\""); IncludeFile.WriteLine(".include \"" + name + ".asm\"");
} }
} }
class LabelComparer : IComparer<string>
{
public int Compare(string x, string y)
{
if (x == null)
return (y == null) ? 0 : -1;
if (y == null)
return 1;
if (x.Length == 0 || y.Length == 0)
return x.CompareTo(y);
if (x[0] == 'L' && y[0] == 'L')
{
if (int.TryParse(x.Substring(1), out int xInt) && int.TryParse(y.Substring(1), out int yInt))
{
return xInt.CompareTo(yInt);
}
}
return x.CompareTo(y);
}
}
} }