Partial ARM provisions.

CosmosOS · Jun 6, 2019 · b83f52a · b83f52a
1 parent 8542b7f
commit b83f52a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,7 @@
             "args": [
                 "..\\..\\..\\playground\\",
                 //"-Plugin:Cosmos.XSC",
-                "-Gen2", "-WaitOnError"
+                "-Gen2", "-WaitOnError", "-CPU:x86"
             ],
             "cwd": "${workspaceFolder}\\source\\XSharp\\XSC",
             "stopAtEntry": false,
@@ -29,8 +29,7 @@
             "args": [
                 "..\\..\\..\\playground\\",
                 //"-Plugin:Cosmos.XSC",
-                "-Gen2",
+                "-Gen2", "-WaitOnError", "-CPU:x86"
-                "-WaitOnError"
             ],
             "cwd": "${workspaceFolder}\\source\\XSharp\\XSC",
             "stopAtEntry": false,

diff --git a/ToDo 2019.txt b/ToDo 2019.txt
@@ -13,6 +13,8 @@
   -Eliminate G1
 
 * .xsproj
+  -Use .json if allowed
+  -replication of xsc args - then args can override if specified wtih .xsproj to xsc
   -Build files
   -F5 build and run
 

diff --git a/source/Tools/CliProcessor.cs b/source/Tools/CliProcessor.cs
@@ -14,10 +14,11 @@ public class Switch {
             public string Name { get; set; }
             public string Value { get; set; }
 
-            public string Check(string aDefault, string[] aAllowedValues, bool aCaseSensitive = false) {
+            public string Check(string aDefault, string[] aAllowedValues, bool aRequired = false, bool aCaseSensitive = false) {
                 if (aAllowedValues.Contains(Value, aCaseSensitive ? null : StringComparer.OrdinalIgnoreCase)) {
                     return Value;
                 }
+                if (aRequired) throw new Exception($"{Name} requires a value.");
                 return aDefault;
             }
         }

diff --git a/source/XSharp/XSC/Program.cs b/source/XSharp/XSC/Program.cs
@@ -10,6 +10,7 @@ internal class Program {
 
     private static bool _Append = false;
     private static string _OutputPath = null;
+    private static string _CPU = null;
 
     private static AsmGenerator _Gen = new AsmGenerator();
     // List of source files
@@ -31,16 +32,20 @@ internal class Program {
     private static void Run() {
       try {
         var xUserComments = _Args["UserComments", "UC"];
-        if (xUserComments != null) _Gen.EmitUserComments = xUserComments.Check("ON", new string[] { "ON", "OFF" }) == "ON";
+        if (xUserComments != null) _Gen.EmitUserComments = xUserComments.Check("ON", new string[] { "ON", "OFF" }).ToUpper() == "ON";
         //
         var xSourceCode = _Args["SourceCode", "SC"];
-        if (xSourceCode != null) _Gen.EmitSourceCode = xSourceCode.Check("ON", new string[] { "ON", "OFF" }) == "ON";
+        if (xSourceCode != null) _Gen.EmitSourceCode = xSourceCode.Check("ON", new string[] { "ON", "OFF" }).ToUpper() == "ON";
         //
         var xOutput = _Args["Out", "O"];
         if (xOutput != null) _OutputPath = xOutput.Value;
         //
         _Append = _Args["Append", "A"] != null;
         if (_Append && xOutput == null) throw new Exception("Use of -Append requires use of -Out.");
+        //
+        var xCPU = _Args["CPU"];
+        if (xCPU == null) throw new Exception("-CPU is a required parameter.");
+        _CPU = xCPU.Check("", new string[] { "X86", "ARM" }, true).ToUpper();
 
         // Plugins
         var xPlugins = _Args.GetSwitches("PlugIn");
@@ -91,6 +96,7 @@ internal class Program {
 
     #region Gen1
     private static void RunGen1() {
+      if (_CPU != "X86") throw new Exception("Gen1 only supports X86");
       try {
         // Generate output
         foreach (var xFile in _XsFiles) {
@@ -126,6 +132,7 @@ internal class Program {
     #endregion
 
     private static void RunGen2() {
+      if (_CPU != "X86") throw new Exception("ARM is in progress and not supported yet.");
       foreach (var xFile in _XsFiles) {
         using(var xIn = File.OpenText(xFile)) {
           if (!_Append) _OutputPath = Path.ChangeExtension(xFile, ".asm");