6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2025-02-27 19:29:08 +00:00
Code Issues Projects Releases Wiki Activity

Show assembler options in header comment

Browse Source
This commit is contained in:
Andy McFadden 2018-11-03 14:02:52 -07:00
parent 09d6512dd2
commit 5b1dde290a
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SourceGen/AsmGen/AsmCc65.cs
View File

@ -232,7 +232,7 @@ namespace SourceGen.AsmGen {
// Currently generating code for v2.17. // Currently generating code for v2.17.
OutputLine(SourceFormatter.FullLineCommentDelimiter + OutputLine(SourceFormatter.FullLineCommentDelimiter +
string.Format(Properties.Resources.GENERATED_FOR_VERSION, string.Format(Properties.Resources.GENERATED_FOR_VERSION,
"cc65", V2_17)); "cc65", V2_17, AsmCc65.OPTIONS));
} }
GenCommon.Generate(this, sw, worker); GenCommon.Generate(this, sw, worker);
@ -700,6 +700,8 @@ namespace SourceGen.AsmGen {
/// Cross-assembler execution interface. /// Cross-assembler execution interface.
/// </summary> /// </summary>
public class AsmCc65 : IAssembler { public class AsmCc65 : IAssembler {
public const string OPTIONS = "--target none";
// Paths from generator. // Paths from generator.
private List<string> mPathNames; private List<string> mPathNames;
@ -790,7 +792,7 @@ namespace SourceGen.AsmGen {
// 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,
"--target none \"" + pathName + "\"", mWorkDirectory, null); OPTIONS + " \"" + pathName + "\"", mWorkDirectory, null);
cmd.Execute(); cmd.Execute();
// Can't really do anything with a "cancel" request. // Can't really do anything with a "cancel" request.

4
SourceGen/AsmGen/AsmMerlin32.cs
View File

@ -225,7 +225,7 @@ namespace SourceGen.AsmGen {
// No version-specific stuff yet. We're generating code for v1.0. // No version-specific stuff yet. We're generating code for v1.0.
OutputLine(SourceFormatter.FullLineCommentDelimiter + OutputLine(SourceFormatter.FullLineCommentDelimiter +
string.Format(Properties.Resources.GENERATED_FOR_VERSION, string.Format(Properties.Resources.GENERATED_FOR_VERSION,
"Merlin 32", new CommonUtil.Version(1, 0))); "Merlin 32", new CommonUtil.Version(1, 0), string.Empty));
} }
GenCommon.Generate(this, sw, worker); GenCommon.Generate(this, sw, worker);
@ -768,6 +768,8 @@ namespace SourceGen.AsmGen {
// 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?)
//
// Merlin 32 has no options. The second argument is the macro include file path.
ShellCommand cmd = new ShellCommand(config.ExecutablePath, ". \"" + pathName + "\"", ShellCommand cmd = new ShellCommand(config.ExecutablePath, ". \"" + pathName + "\"",
mWorkDirectory, null); mWorkDirectory, null);
cmd.Execute(); cmd.Execute();

7
SourceGen/AsmGen/AsmTass64.cs
View File

@ -219,7 +219,7 @@ namespace SourceGen.AsmGen {
if (Settings.GetBool(AppSettings.SRCGEN_ADD_IDENT_COMMENT, false)) { if (Settings.GetBool(AppSettings.SRCGEN_ADD_IDENT_COMMENT, false)) {
OutputLine(SourceFormatter.FullLineCommentDelimiter + OutputLine(SourceFormatter.FullLineCommentDelimiter +
string.Format(Properties.Resources.GENERATED_FOR_VERSION, string.Format(Properties.Resources.GENERATED_FOR_VERSION,
"64tass", V1_53)); "64tass", V1_53, AsmTass64.OPTIONS));
} }
GenCommon.Generate(this, sw, worker); GenCommon.Generate(this, sw, worker);
@ -670,6 +670,8 @@ namespace SourceGen.AsmGen {
/// Cross-assembler execution interface. /// Cross-assembler execution interface.
/// </summary> /// </summary>
public class AsmTass64 : IAssembler { public class AsmTass64 : IAssembler {
public const string OPTIONS = "--case-sensitive --nostart --long-address -Wall";
// Paths from generator. // Paths from generator.
private List<string> mPathNames; private List<string> mPathNames;
@ -756,13 +758,12 @@ namespace SourceGen.AsmGen {
worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING); worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
string options = "--case-sensitive --nostart --long-address -Wall";
string outFileName = pathName.Substring(0, pathName.Length - 2); string outFileName = pathName.Substring(0, pathName.Length - 2);
// 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,
options + " \"" + pathName + "\"" + " -o \"" + outFileName + "\"", OPTIONS + " \"" + pathName + "\"" + " -o \"" + outFileName + "\"",
mWorkDirectory, null); mWorkDirectory, null);
cmd.Execute(); cmd.Execute();

2
SourceGen/Properties/Resources.Designer.cs generated
View File

@ -529,7 +529,7 @@ namespace SourceGen.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Target assembler: {0} v{1}. /// Looks up a localized string similar to Target assembler: {0} v{1} [{2}].
/// </summary> /// </summary>
internal static string GENERATED_FOR_VERSION { internal static string GENERATED_FOR_VERSION {
get { get {

2
SourceGen/Properties/Resources.resx
View File

@ -274,7 +274,7 @@
<value>Target assembler: {0} (latest)</value> <value>Target assembler: {0} (latest)</value>
</data> </data>
<data name="GENERATED_FOR_VERSION" xml:space="preserve"> <data name="GENERATED_FOR_VERSION" xml:space="preserve">
<value>Target assembler: {0} v{1}</value> <value>Target assembler: {0} v{1} [{2}]</value>
</data> </data>
<data name="HIDE_COL" xml:space="preserve"> <data name="HIDE_COL" xml:space="preserve">
<value>Hide</value> <value>Hide</value>