Merge branch 'master' of https://github.com/TheFocusMan/Cosmos

Author: TheFocusMan

Tests/Kernels/Cosmos.Compiler.Tests.TypeSystem/Kernel.cs

@@ -89,6 +89,10 @@ private void TestVTablesImpl()
             Assert.AreEqual(((CosmosRuntimeType)typeof(object)).mTypeId, types[0], "GetGCFieldTypes returns object at offset 0");
             Assert.AreEqual(((CosmosRuntimeType)typeof(TestStruct)).mTypeId, types[1], "GetGCFieldTypes returns TestStruct at offset 1");
             Assert.AreEqual(((CosmosRuntimeType)typeof(object)).mTypeId, types[2], "GetGCFieldTypes returns object at offset 2");
+
+            // check that classes have the correct name
+            Assert.AreEqual("Int32", ((CosmosRuntimeType)typeof(int)).Name, "Name of Int32 is correctly stored");
+            Assert.AreEqual("Object", ((CosmosRuntimeType)typeof(object)).Name, "Name of Object is correctly stored");
         }
 
         private unsafe void TestGarbageCollectorMethods()
@@ -139,6 +143,7 @@ private unsafe void TestGarbageCollector()
             Assert.AreEqual(0, collected, "Storing elements in static class keeps them referenced");
         }
 
+        #region Test Methods
         public void TestMethod1()
         {
             object a = new object();
@@ -208,6 +213,8 @@ void TestMethod6()
             Console.WriteLine("Test: " + 3 + " vs " + 5);
         }
 
+        #endregion
+
         protected override void Run()
         {
             try
@@ -262,6 +269,7 @@ protected override void Run()
                 TestGarbageCollectorMethods();
                 TestGarbageCollector();
                 RealMethodsTest();
+                TestReflection();
 
                 TestController.Completed();
             }
@@ -276,5 +284,20 @@ protected override void Run()
                 TestController.Failed();
             }
         }
+
+        private static void TestReflection()
+        {
+            Assert.AreEqual("Int32", typeof(int).Name, "Plug for Name of Int32 works");
+            Assert.AreEqual("Object", typeof(object).Name, "Plug for Name of Object works");
+            string intAQN = typeof(int).AssemblyQualifiedName;
+            Assert.IsTrue(intAQN.StartsWith("System.Int32, System.Private.CoreLib"), $"Plug for AssemblyQualifiedName of Int32 works ({intAQN})");
+            string objectAQN = typeof(object).AssemblyQualifiedName;
+            Assert.IsTrue(objectAQN.StartsWith("System.Object, System.Private.CoreLib"), $"Plug for AssemblyQualifiedName of Object works ({objectAQN})");
+
+            Assert.AreEqual("Int32", Type.GetType("Int32").Name, "GetType works on Int32");
+            Assert.AreEqual("Int32", Type.GetType(typeof(int).AssemblyQualifiedName).Name, "GetType works on Int32 using assembly qualified name");
+            Assert.AreEqual("Int32", Type.GetType("System.Int32, System.Private.CoreLib").Name, "GetType works on Int32 with shortened assembly qualified name");
+            Assert.AreEqual("Int32", Type.GetType("System.Int32").Name, "GetType works on Int32 with shortened assembly qualified name");
+        }
     }
 }

source/Cosmos.Build.Tasks/IL2CPU.cs

@@ -56,6 +56,8 @@ public class IL2CPU : ToolTask
 
         public bool RemoveBootDebugOutput { get; set; }
 
+        public bool AllowComments { get; set; }
+
         public string VBEResolution { get; set; }
 
         #endregion
@@ -68,6 +70,7 @@ public class IL2CPU : ToolTask
         public IL2CPU()
         {
             CompileVBEMultiboot = false;
+            AllowComments = false;
             VBEResolution = "800x600x32";
         }
 
@@ -99,7 +102,8 @@ protected override string GenerateResponseFileCommands()
                 ["IgnoreDebugStubAttribute"] = IgnoreDebugStubAttribute.ToString(),
                 ["CompileVBEMultiboot"] = CompileVBEMultiboot.ToString(),
                 ["VBEResolution"] = VBEResolution.ToString(),
-                ["RemoveBootDebugOutput"] = RemoveBootDebugOutput.ToString()
+                ["RemoveBootDebugOutput"] = RemoveBootDebugOutput.ToString(),
+                ["AllowComments"] = AllowComments.ToString()
             }.ToList();
 
             foreach (var reference in References)

source/Cosmos.Build.Tasks/build/Cosmos.Build.targets

@@ -72,6 +72,8 @@
 
         <RemoveBootDebugOutput Condition="'$(RemoveBootDebugOutput)' == ''">ELF</RemoveBootDebugOutput>
 
+        <AllowComments Condition="'$(AllowComments)' == ''">False</AllowComments>
+
         <OptimizationLevel Condition="'$(OptimizationLevel)' == ''">1</OptimizationLevel>
     </PropertyGroup>
 
@@ -205,7 +207,8 @@
                 ToolPath="$(Il2cpuToolPath)"
                 ToolExe="$(Il2cpuToolExe)"
                 CompileVBEMultiboot="$(CompileVBEMultiboot)"
-				VBEResolution="$(VBEResolution)"/>
+				AllowComments="$(AllowComments)"
+                VBEResolution="$(VBEResolution)"/>
 
     </Target>
 

source/Cosmos.Core/VTablesImpl.cs

@@ -94,8 +94,8 @@ public static bool IsInstance(uint aObjectType, uint aDesiredObjectType, bool aI
 
         public static void SetTypeInfo(int aType, uint aBaseType, uint aSize, uint aInterfaceCount, uint[] aInterfaceIndexes,
           uint aMethodCount, uint[] aMethodIndexes, uint[] aMethodAddresses,
-          uint aInterfaceMethodCount, uint[] aInterfaceMethodIndexes, uint[] aTargetMethodIndexes, uint aGCFieldCount, uint[] aGCFieldOffsets, uint[] aGCFieldTypes,
-          bool aIsValueType, bool aIsStruct)
+          uint aInterfaceMethodCount, uint[] aInterfaceMethodIndexes, uint[] aTargetMethodIndexes, uint aGCFieldCount,
+          uint[] aGCFieldOffsets, uint[] aGCFieldTypes, bool aIsValueType, bool aIsStruct, string aName, string aAssemblyQualifiedName)
         {
             var vTable = new VTable();
             vTable.BaseTypeIdentifier = aBaseType;
@@ -110,6 +110,8 @@ public static void SetTypeInfo(int aType, uint aBaseType, uint aSize, uint aInte
             vTable.TargetMethodIndexes = aTargetMethodIndexes;
             vTable.IsValueType = aIsValueType;
             vTable.IsStruct = aIsStruct;
+            vTable.Name = aName;
+            vTable.AssemblyQualifiedName = aAssemblyQualifiedName;
             mTypes[aType] = vTable;
             var gcTable = new GCTable();
             gcTable.GCFieldCount = aGCFieldCount;
@@ -341,10 +343,68 @@ public static bool IsStruct(uint aType)
         {
             return mTypes[aType].IsStruct;
         }
+
+        /// <summary>
+        /// Gets the Name of the type
+        /// </summary>
+        /// <param name="aType"></param>
+        /// <returns></returns>
+        public static string GetName(uint aType)
+        {
+            return mTypes[aType].Name;
+        }
+
+        /// <summary>
+        /// Gets the Assembly Qualified Name for the type
+        /// </summary>
+        /// <param name="aType"></param>
+        /// <returns></returns>
+        public static string GetAssemblyQualifiedName(uint aType)
+        {
+            return mTypes[aType].AssemblyQualifiedName;
+        }
+
+        /// <summary>
+        /// Get type id of type matching the name
+        /// The name can either be name of the class or the assembly qualified name
+        /// Only inlcuding the first or first two parts of the assembly qualified name also works
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>Returns -1 if no type can be found</returns>
+        public static int GetType(string name)
+        {
+            for (int i = 0; i < mTypes.Length; i++)
+            {
+                var currType = mTypes[i];
+                if (currType.Name == name || currType.AssemblyQualifiedName == name)
+                {
+                    return i;
+                }
+                else
+                {
+                    bool difference = false;
+                    for (int k = 0; k < name.Length; k++)
+                    {
+                        if (name[k] != currType.AssemblyQualifiedName[k])
+                        {
+                            difference = true;
+                            break;
+                        }
+                    }
+                    if (!difference)
+                    {
+                        return i;
+                    }
+                }
+            }
+            return -1;
+        }
     }
 
     public struct VTable
     {
+        public string Name;
+        public string AssemblyQualifiedName;
         public uint BaseTypeIdentifier;
         public uint Size;
 

source/Cosmos.Core_Plugs/System/TypeImpl.cs

@@ -71,5 +71,16 @@ public static Type get_BaseType(CosmosRuntimeType aThis)
         {
             return aThis.BaseType;
         }
+
+        [PlugMethod(Signature = "System_Type__System_Type_get_Type_System_String", IsOptional = false)]
+        public static CosmosRuntimeType GetType(string aName)
+        {
+            int typeId = VTablesImpl.GetType(aName);
+            if(typeId == -1)
+            {
+                return null;
+            }
+            return new CosmosRuntimeType((uint)typeId);
+        }
     }
 }

source/Cosmos.Debug.Hosts/VMware.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading;
 using Microsoft.Win32;
 
 //using Vestris.VMWareLib;

source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml

@@ -68,6 +68,12 @@
                   Category="Compile">
     </BoolProperty>
 
+    <BoolProperty Name="AllowComments"
+                  DisplayName="Allow X# Comments"
+                  Description="Include comments in the final assembly. Enabling this will increase compile times."
+                  Category="Compile">
+    </BoolProperty>
+
     <EnumProperty Name="OptimizationLevel"
 		  DisplayName="Optimization Level"
                   Description="Choose the optimization level that you want to use."