From f0e5232fe054c05ef12ce6e185c9998c5c08cd85 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 30 Oct 2015 14:05:14 +1300
Subject: [PATCH] Bitfield: And then mess things up again by handling signed
 fields.

This is way more messy than it should be.
---
 Source/Core/Common/BitField.natvis | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
index 963a82b667..af1e41141b 100644
--- a/Source/Core/Common/BitField.natvis
+++ b/Source/Core/Common/BitField.natvis
@@ -8,4 +8,53 @@
       <Item Name="Size">$T2</Item>
     </Expand>
   </Type>
+
+
+  <!--Specialised versions for signed types-->
+  <Type Name="BitField&lt;*,*,__int64&gt;">
+    <!-- This is what I have do to get a sign extension in this crappy natvis "language"
+         Basically, we check the top bit, if it's one, we add the remaining
+         bits to the smallest (most negitive) number. -->
+    <DisplayString Condition="(storage &amp; (1 &lt;&lt; ($T1 + $T2))) != 0">
+      <![CDATA[{(-1 * (1 << ($T2-1))) + ((storage >> $T1) & ((1 << ($T2-1)) - 1))}]]>
+    </DisplayString>
+    <DisplayString><![CDATA[{(storage >> $T1) & ((1 << ($T2-1)) - 1)}]]></DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
+
+  <!-- Oh, and I can't do a generic match for all signed types, so these are identical to the __int64 case above 
+       Would be nice if std::numeric_limits<$T3>::is_signed or std::is_signed<$T3>::value worked -->
+  <Type Name="BitField&lt;*,*,__int32&gt;">
+    <DisplayString Condition="(storage &amp; (1 &lt;&lt; ($T1 + $T2))) != 0">
+      <![CDATA[{(-1 * (1 << ($T2-1))) + ((storage >> $T1) & ((1 << ($T2-1)) - 1))}]]>
+    </DisplayString>
+    <DisplayString><![CDATA[{(storage >> $T1) & ((1 << ($T2-1)) - 1)}]]></DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
+  <Type Name="BitField&lt;*,*,__int16&gt;">
+    <DisplayString Condition="(storage &amp; (1 &lt;&lt; ($T1 + $T2))) != 0">
+      <![CDATA[{(-1 * (1 << ($T2-1))) + ((storage >> $T1) & ((1 << ($T2-1)) - 1))}]]>
+    </DisplayString>
+    <DisplayString><![CDATA[{(storage >> $T1) & ((1 << ($T2-1)) - 1)}]]></DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
+  <Type Name="BitField&lt;*,*,__int8&gt;">
+    <DisplayString Condition="(storage &amp; (1 &lt;&lt; ($T1 + $T2))) != 0">
+      <![CDATA[{(-1 * (1 << ($T2-1))) + ((storage >> $T1) & ((1 << ($T2-1)) - 1))}]]>
+    </DisplayString>
+    <DisplayString><![CDATA[{(storage >> $T1) & ((1 << ($T2-1)) - 1)}]]></DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
 </AutoVisualizer>
\ No newline at end of file