Fixed virtual methods scanning.

Added back some system plugs.
terminal-cs · Feb 3, 2017 · 50214ab · 50214ab
1 parent 8bcc922
commit 50214ab
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/Cosmos.sln b/Cosmos.sln
@@ -467,7 +467,6 @@ Global
 		{78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Release|Any CPU.ActiveCfg = Debug|x86
 		{78AC2B12-8185-4033-80F0-DA5BF874BE5E}.Release|Any CPU.Build.0 = Debug|x86
 		{0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8889473-5866-4913-86AC-8072A1A2558C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/source/Cosmos.IL2CPU/ILScanner.cs b/source/Cosmos.IL2CPU/ILScanner.cs
@@ -481,7 +481,11 @@ protected void ScanMethod(MethodBase aMethod, bool aIsPlug, string sourceItem)
                             var xType = (Type) mItemsList[i];
                             if (xType.GetTypeInfo().IsSubclassOf(xVirtMethod.DeclaringType) || (xVirtMethod.DeclaringType.GetTypeInfo().IsInterface && xVirtMethod.DeclaringType.GetTypeInfo().IsAssignableFrom(xType)))
                             {
-                                var xNewMethod = xType.GetTypeInfo().GetMethod(aMethod.Name, xParamTypes, null);
+                                //var xNewMethod = xType.GetTypeInfo().GetMethod(aMethod.Name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null, xParamTypes, null);
+                                var xNewMethod = xType.GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+                                                                    .Where(method => method.Name == aMethod.Name
+                                                                           && method.GetParameters().Select(param => param.ParameterType).SequenceEqual(xParamTypes))
+                                                                    .SingleOrDefault();
                                 if (xNewMethod != null)
                                 {
                                     // We need to check IsVirtual, a non virtual could

diff --git a/source/Cosmos.System.Plugs/System/ByteImpl.cs b/source/Cosmos.System.Plugs/System/ByteImpl.cs
@@ -1,5 +1,4 @@
-using System;
-using Cosmos.Common;
+using Cosmos.Common;
 using Cosmos.IL2CPU.Plugs;
 
 namespace Cosmos.System.Plugs.System

diff --git a/source/Unused/Old System Plugs/DoubleImpl.cs → .../Cosmos.System.Plugs/System/DoubleImpl.cs b/source/Unused/Old System Plugs/DoubleImpl.cs → .../Cosmos.System.Plugs/System/DoubleImpl.cs
diff --git a/source/Unused/Old System Plugs/MathImpl.cs → ...ce/Cosmos.System.Plugs/System/MathImpl.cs b/source/Unused/Old System Plugs/MathImpl.cs → ...ce/Cosmos.System.Plugs/System/MathImpl.cs
diff --git a/source/Unused/Old System Plugs/SByteImpl.cs → ...e/Cosmos.System.Plugs/System/SByteImpl.cs b/source/Unused/Old System Plugs/SByteImpl.cs → ...e/Cosmos.System.Plugs/System/SByteImpl.cs
@@ -1,4 +1,5 @@
-using Cosmos.IL2CPU.Plugs;
+using Cosmos.Common;
+using Cosmos.IL2CPU.Plugs;
 
 namespace Cosmos.System.Plugs.System
 {
@@ -7,7 +8,7 @@ public static class SByteImpl
     {
         public static string ToString(ref sbyte aThis)
         {
-            return ((int)(aThis)).ToString();
+            return StringHelper.GetNumberString(aThis);
         }
     }
 }
diff --git a/source/Unused/Old System Plugs/SingleImpl.cs → .../Cosmos.System.Plugs/System/SingleImpl.cs b/source/Unused/Old System Plugs/SingleImpl.cs → .../Cosmos.System.Plugs/System/SingleImpl.cs
diff --git a/.../Unused/Old System Plugs/ValueTypeImpl.cs → ...smos.System.Plugs/System/ValueTypeImpl.cs b/.../Unused/Old System Plugs/ValueTypeImpl.cs → ...smos.System.Plugs/System/ValueTypeImpl.cs
@@ -24,11 +24,9 @@ public static int GetHashCodeOfPtr(IntPtr ptr)
             throw new NotImplementedException("ValueType.GetHashCodeOfPtr()");
         }
 
-        public static string ToString(ValueType aThis)
-        {
-            return "<ValueType.ToString not yet implemented!>";
-        }
-
+        //public static string ToString(ValueType aThis)
+        //{
+        //    return "<ValueType.ToString not yet implemented!>";
+        //}
     }
-
 }