From cf62f13cdc8a7f21c78f03b097bff6edf09fdead Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 6 Jul 2020 11:58:14 -0700
Subject: ShortList<T> and core.natvis improvements. (#1430)

* ShortList<T> and core.natvis improvements.

* Fix gcc build.

* add `getBuffer()`  accessor to `GetArrayViewResult`
---
 source/core/core.natvis | 51 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

(limited to 'source/core/core.natvis')

diff --git a/source/core/core.natvis b/source/core/core.natvis
index 2b1e3ff7e..1087b4e6a 100644
--- a/source/core/core.natvis
+++ b/source/core/core.natvis
@@ -18,7 +18,7 @@
   </Expand>
 </Type>
 
-<Type Name="Slang::List&lt;*&gt;">
+<Type Name="Slang::List&lt;*,*&gt;">
     <DisplayString>{{ size={m_count} }}</DisplayString>
     <Expand>
         <Item Name="[size]">m_count</Item>
@@ -30,6 +30,18 @@
     </Expand>
 </Type>
 
+<Type Name="Slang::ShortList&lt;*,*,*&gt;">
+    <DisplayString>{{ size={m_count} }}</DisplayString>
+    <Expand>
+        <Item Name="[size]">m_count</Item>
+        <Item Name="[capacity]">m_capacity</Item>
+        <IndexListItems>
+            <Size>m_count</Size>
+            <ValueNode Condition="$i&lt;$T2">m_shortBuffer + $i</ValueNode>
+            <ValueNode Condition="$i&gt;=$T2">m_buffer + $i - $T2</ValueNode>
+        </IndexListItems>
+    </Expand>
+</Type>
 
 <Type Name="Slang::Array&lt;*,*&gt;">
   <DisplayString>{{ size={m_count} }}</DisplayString>
@@ -47,10 +59,33 @@
     <Expand>
         <Item Name="[size]">_count</Item>
         <Item Name="[capacity]">bucketSizeMinusOne + 1</Item>
-        <ArrayItems>
-           <Size>bucketSizeMinusOne + 1</Size>
-           <ValuePointer>hashMap</ValuePointer>
-        </ArrayItems>
+        <CustomListItems MaxItemsPerView="5000" ExcludeView="Test">
+            <Variable Name="iBucket" InitialValue="0" />
+            <Variable Name="pBucket" InitialValue="hashMap" />
+            <Variable Name="isDeleted" InitialValue="0" />
+            <Variable Name="isEmpty" InitialValue="0" />
+            <Size>_count</Size>
+            <Exec>pBucket = hashMap</Exec>
+            <Loop>
+                <If Condition="iBucket &gt;= bucketSizeMinusOne + 1">
+                    <Break/>
+                </If>
+                <Exec>
+                    isDeleted = marks.m_buffer.m_count &gt; (iBucket*2+1)/32
+                      ? ((marks.m_buffer.m_buffer[(iBucket*2+1)/32]&amp;(1&lt;&lt;(iBucket*2+1)%32)) != 0)
+                      : 0
+                 </Exec>
+                <Exec>
+                    isEmpty = marks.m_buffer.m_count &gt; (iBucket*2)/32
+                    ? ((marks.m_buffer.m_buffer[(iBucket*2)/32]&amp;(1&lt;&lt;(iBucket*2)%32)) == 0)
+                    : 1
+                </Exec>
+                <If Condition="isDeleted+isEmpty==0">
+                    <Item>*(hashMap + iBucket)</Item>
+                </If>
+                <Exec>iBucket++</Exec>
+            </Loop>
+        </CustomListItems>
     </Expand>
 </Type>
 
@@ -103,4 +138,10 @@
     <StringView>(m_sizeThenContents + 1),s</StringView>
 </Type>
 
+<Type Name="Slang::UnownedStringSlice">
+    <DisplayString>{m_begin,[m_end-m_begin]s}</DisplayString>
+    <StringView>m_begin,[m_end-m_begin]s</StringView>
+
+</Type>
+
 </AutoVisualizer>
-- 
cgit v1.2.3