1
0
mirror of https://github.com/fadden/6502bench.git synced 2024-07-12 23:28:56 +00:00

Show "assembling" when assembling

Merlin 32 is slow enough with a 64K data file that you have
enough time to read the text.
This commit is contained in:
Andy McFadden 2018-10-30 16:41:56 -07:00
parent 50e8be186a
commit 7aa3e4dbcd
6 changed files with 19 additions and 1 deletions

View File

@ -711,7 +711,7 @@ namespace Asm65 {
{ OpDef.AddressMode.StackRTI, "" }, { OpDef.AddressMode.StackRTI, "" },
{ OpDef.AddressMode.StackRTL, "" }, { OpDef.AddressMode.StackRTL, "" },
{ OpDef.AddressMode.StackRTS, "" }, { OpDef.AddressMode.StackRTS, "" },
{ OpDef.AddressMode.StackRel, "" }, { OpDef.AddressMode.StackRel, "Stack Relative" },
{ OpDef.AddressMode.StackRelIndIndexY, "Stack Relative Indirect Index Y" }, { OpDef.AddressMode.StackRelIndIndexY, "Stack Relative Indirect Index Y" },
{ OpDef.AddressMode.WDM, "" } { OpDef.AddressMode.WDM, "" }
}; };

View File

@ -782,6 +782,8 @@ namespace SourceGen.AsmGen {
return null; return null;
} }
worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
// Wrap pathname in quotes in case it has spaces. // Wrap pathname in quotes in case it has spaces.
// (Do we need to shell-escape quotes in the pathName?) // (Do we need to shell-escape quotes in the pathName?)
ShellCommand cmd = new ShellCommand(config.ExecutablePath, ShellCommand cmd = new ShellCommand(config.ExecutablePath,

View File

@ -741,6 +741,8 @@ namespace SourceGen.AsmGen {
return null; return null;
} }
worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
// Wrap pathname in quotes in case it has spaces. // Wrap pathname in quotes in case it has spaces.
// (Do we need to shell-escape quotes in the pathName?) // (Do we need to shell-escape quotes in the pathName?)
ShellCommand cmd = new ShellCommand(config.ExecutablePath, ". \"" + pathName + "\"", ShellCommand cmd = new ShellCommand(config.ExecutablePath, ". \"" + pathName + "\"",

View File

@ -754,6 +754,8 @@ namespace SourceGen.AsmGen {
return null; return null;
} }
worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
string options = "--case-sensitive --nostart --long-address -Wall"; string options = "--case-sensitive --nostart --long-address -Wall";
string outFileName = pathName.Substring(0, pathName.Length - 2); string outFileName = pathName.Substring(0, pathName.Length - 2);

View File

@ -753,6 +753,15 @@ namespace SourceGen.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Executing assembler....
/// </summary>
internal static string PROGRESS_ASSEMBLING {
get {
return ResourceManager.GetString("PROGRESS_ASSEMBLING", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Generating {0}.... /// Looks up a localized string similar to Generating {0}....
/// </summary> /// </summary>

View File

@ -348,6 +348,9 @@
<data name="PLUGIN_DIR_FAIL_CAPTION" xml:space="preserve"> <data name="PLUGIN_DIR_FAIL_CAPTION" xml:space="preserve">
<value>Failed Preparing Plugin Directory</value> <value>Failed Preparing Plugin Directory</value>
</data> </data>
<data name="PROGRESS_ASSEMBLING" xml:space="preserve">
<value>Executing assembler...</value>
</data>
<data name="PROGRESS_GENERATING_FMT" xml:space="preserve"> <data name="PROGRESS_GENERATING_FMT" xml:space="preserve">
<value>Generating {0}...</value> <value>Generating {0}...</value>
</data> </data>