数组

Author: lightszero

CLRSharp/CLRSharp/CLRSharp_Env.cs

@@ -11,7 +11,7 @@ public string version
         {
             get
             {
-                return "0.39.5Beta";
+                return "0.39.6Beta";
             }
         }
         public ICLRSharp_Logger logger

CLRSharp/CLRSharp/Execute/Context.cs

@@ -370,7 +370,7 @@ object GetToken(object token)
             if (token is Mono.Cecil.FieldDefinition || token is Mono.Cecil.FieldReference)
             {
                 var def = token as Mono.Cecil.FieldDefinition;
-                if (def != null && def.Name[0] == '$') return null;
+                if (def != null && def.Name[0] == '$') return def.InitialValue;
                 //都是用来初始化数组的方法，忽略
 
                 return GetField(token);

CLRSharp/CLRSharp/Execute/StackFrame.cs

@@ -213,6 +213,110 @@ public object Return()
 
             return ret;
         }
+        void FillArray(object array,byte[] bytes)
+        {
+            if (array is byte[])
+            {
+                byte[] arr = array as byte[];
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    arr[i] = bytes[i];
+                }
+            }
+            else if (array is sbyte[])
+            {
+                sbyte[] arr = array as sbyte[];
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    arr[i] = (sbyte)bytes[i];
+                }
+            }
+            else if (array is Int16[])
+            {
+                int step = 2;
+                Int16[] arr = array as Int16[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToInt16(bytes, i * step);
+                }
+            }
+            else if (array is UInt16[])
+            {
+                int step = 2;
+                UInt16[] arr = array as UInt16[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToUInt16(bytes, i * step);
+                }
+            }
+            else if (array is char[])
+            {
+                int step = 2;
+                char[] arr = array as char[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = (char)BitConverter.ToUInt16(bytes, i * step);
+                }
+            }
+            else if(array is int[])
+            {
+                int step = 4;
+                int[] arr = array as int[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToInt32(bytes, i * step);
+                }
+            } 
+            else if (array is uint[])
+            {
+                int step = 4;
+                uint[] arr = array as uint[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToUInt32(bytes, i * step);
+                }
+            }
+            else if (array is Int64[])
+            {
+                int step = 8;
+                Int64[] arr = array as Int64[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToInt64(bytes, i * step);
+                }
+            }
+            else if (array is UInt64[])
+            {
+                int step = 8;
+                UInt64[] arr = array as UInt64[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToUInt64(bytes, i * step);
+                }
+            }
+            else if (array is float[])
+            {
+                int step = 4;
+                float[] arr = array as float[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToSingle(bytes, i * step);
+                }
+            }
+            else if (array is double[])
+            {
+                int step = 8;
+                double[] arr = array as double[];
+                for (int i = 0; i < bytes.Length / step; i++)
+                {
+                    arr[i] = BitConverter.ToDouble(bytes, i * step);
+                }
+            }
+            else
+            {
+                throw new NotImplementedException("array=" + array.GetType());
+            }
+        }
         //流程控制
         public void Call(ThreadContext context, IMethod _clrmethod, bool bVisual)
         {
@@ -287,6 +391,7 @@ public void Call(ThreadContext context, IMethod _clrmethod, bool bVisual)
             }
             if (_clrmethod.DeclaringType.FullName.Contains("System.Runtime.CompilerServices.RuntimeHelpers") && _clrmethod.Name.Contains("InitializeArray"))
             {
+                FillArray(_pp[0], _pp[1] as byte[]);
                 _codepos++;
                 return;
             }

UnitTestDll/LightTestor/ExpTest_70.cs

@@ -10,6 +10,9 @@ public class ExpTest_70
         //只要有一个静态函数包含UnitTest名称的，就作为单元测试
         public static void UnitTest_7001()
         {
+            int[] ints3 = new int[] { 1, 2, 3 };
+            int v = ints3[0];// = 44;
+            Logger.Log("=" + v);
             //7001 array
             List<List<int>> list = new List<List<int>>();
             list.Add(new List<int>());
@@ -25,9 +28,7 @@ public static void UnitTest_7001()
             ints2[1] = 44;
             Logger.Log("=" + ints2[1]);
 
-            int[] ints3 = new int[] { 55, 55, 55 };
-            ints3[1] = 44;
-            Logger.Log("=" + ints3[1]);
+
         }
         public static void UnitTest_7002()
         {

readme.txt

@@ -5,6 +5,8 @@
 	用途，Unity3D热更（包括IOS平台）等
 	Beta阶段，有一定动手能力的小伙伴，已经可以将它用于实战
 	更新日志：
+2015-01-30 V0.39.6Beta
+	修正了数值数组初始化的问题
 2015-01-30 V0.39.5Beta
 	修正了脚本定义struct
 	修正了使用 Type作为参数的函数调用问题