Implement memory access for C# List.

awulkiew · Apr 25, 2019 · cf63145 · cf63145
1 parent 43dc8f3
commit cf63145
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/Visual_Studio_2015/GraphicalDebugging/ExpressionLoader.cs b/Visual_Studio_2015/GraphicalDebugging/ExpressionLoader.cs
@@ -2540,11 +2540,7 @@ public override bool MatchType(string type, string id)
 
             public override string ElementType(string type)
             {
-                string name = "";
-                int begin = type.LastIndexOf('[');
-                if (begin > 0)
-                    name = type.Substring(0, begin);
-                return name;
+                return ElemTypeFromType(type);
             }
 
             public override int LoadSize(Debugger debugger, string name)
@@ -2574,9 +2570,19 @@ public override bool ForEachMemoryBlock(Debugger debugger, string name, MemoryRe
                                                ElementPtrName(name),
                                                elementConverter, memoryBlockPredicate);
             }
+
+            // type -> name[]
+            static public string ElemTypeFromType(string type)
+            {
+                string name = "";
+                int begin = type.LastIndexOf('[');
+                if (begin > 0 && begin + 1 < type.Length && type[begin + 1] == ']')
+                    name = type.Substring(0, begin);
+                return name;
+            }
         }
 
-        class CSList : RandomAccessContainer
+        class CSList : ContiguousContainer
         {
             public override string Id() { return "System.Collections.Generic.List"; }
 
@@ -2593,12 +2599,19 @@ public override int LoadSize(Debugger debugger, string name)
 
             public override string ElementPtrName(string name)
             {
-                return "";
+                return "(&" + name + "._items[0])";
             }
 
             public override bool ForEachMemoryBlock(Debugger debugger, string name, MemoryReader.Converter<double> elementConverter, MemoryBlockPredicate memoryBlockPredicate)
             {
-                return false;
+                Expression expr = debugger.GetExpression(name + "._items");
+                if (!expr.IsValidValue || CSArray.ElemTypeFromType(expr.Type).Length <= 0)
+                    return false;
+
+                return this.ForEachMemoryBlock(debugger,
+                                               name,
+                                               ElementPtrName(name),
+                                               elementConverter, memoryBlockPredicate);
             }
         }