From bfac1c73f09379ddb67b852aa7464a94d647b384 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 30 Oct 2015 12:30:22 +1300
Subject: [PATCH 1/5] Bitfield: Add .natvis for easier debugging in Visual
 Studio

---
 Source/Core/Common/BitField.natvis        | 11 +++++++++++
 Source/Core/Common/Common.vcxproj         |  5 ++++-
 Source/Core/Common/Common.vcxproj.filters |  7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Source/Core/Common/BitField.natvis

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
new file mode 100644
index 0000000000..5d09eeef0a
--- /dev/null
+++ b/Source/Core/Common/BitField.natvis
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="BitField&lt;*,*,*&gt;">
+    <DisplayString Condition="$T2 == 1">{(storage &amp; (1 &lt;&lt; $T1)) != 0}</DisplayString>
+    <DisplayString>{(storage &gt;&gt; $T1) &amp; ((1 &lt;&lt; $T2) - 1)}</DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
+</AutoVisualizer>
\ No newline at end of file
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 85a9a47eb7..f92679a1b6 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -187,7 +187,10 @@
       <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="BitField.natvis" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index af926981f3..e708d237dd 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -189,6 +189,8 @@
     <ClInclude Include="GL\GLInterfaceBase.h">
       <Filter>GL\GLInterface</Filter>
     </ClInclude>
+    <ClInclude Include="Assert.h" />
+    <ClInclude Include="NonCopyable.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BreakPoints.cpp" />
@@ -253,4 +255,7 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Natvis Include="BitField.natvis" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 9125ab8304a98fc42ded9024834cec6b86e845f3 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 30 Oct 2015 14:04:40 +1300
Subject: [PATCH 2/5] BitField: Clean .natvis up slightly by using CDATA.

---
 Source/Core/Common/BitField.natvis | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
index 5d09eeef0a..963a82b667 100644
--- a/Source/Core/Common/BitField.natvis
+++ b/Source/Core/Common/BitField.natvis
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
   <Type Name="BitField&lt;*,*,*&gt;">
-    <DisplayString Condition="$T2 == 1">{(storage &amp; (1 &lt;&lt; $T1)) != 0}</DisplayString>
-    <DisplayString>{(storage &gt;&gt; $T1) &amp; ((1 &lt;&lt; $T2) - 1)}</DisplayString>
+    <DisplayString Condition="$T2 == 1"><![CDATA[{(storage & (1 << $T1)) != 0}]]></DisplayString>
+    <DisplayString><![CDATA[{(storage >> $T1) & ((1 << $T2) - 1)}]]></DisplayString>
     <Expand>
       <Item Name="Offset">$T1</Item>
       <Item Name="Size">$T2</Item>

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 3/5] 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

From 2ccd5a59281a79f93564ac3fe32fc91cca5a1329 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Sun, 1 Nov 2015 18:01:51 +1300
Subject: [PATCH 4/5] Bitfield: Add BSD license to match BitField.h

Also, fix typo.
---
 Source/Core/Common/BitField.natvis | 37 ++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
index af1e41141b..44c0e8eab1 100644
--- a/Source/Core/Common/BitField.natvis
+++ b/Source/Core/Common/BitField.natvis
@@ -1,5 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2015 Scott Mansell
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of the owner nor the names of its contributors may
+        be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <!--
+    This is a re-implementation of the abstract bitfield class' algrothm (in BitField.h)
+    for visual studio to use for pretty-printing during debugging.
+  -->
   <Type Name="BitField&lt;*,*,*&gt;">
     <DisplayString Condition="$T2 == 1"><![CDATA[{(storage & (1 << $T1)) != 0}]]></DisplayString>
     <DisplayString><![CDATA[{(storage >> $T1) & ((1 << $T2) - 1)}]]></DisplayString>
@@ -14,7 +47,7 @@
   <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. -->
+         bits to the smallest (most negative) number. -->
     <DisplayString Condition="(storage &amp; (1 &lt;&lt; ($T1 + $T2))) != 0">
       <![CDATA[{(-1 * (1 << ($T2-1))) + ((storage >> $T1) & ((1 << ($T2-1)) - 1))}]]>
     </DisplayString>

From 0245b1219bbe8e3aa90a7fea5675441795ae86fe Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Mon, 2 Nov 2015 17:12:09 +1300
Subject: [PATCH 5/5] Correct capitalization of 'Visual Studio'

---
 Source/Core/Common/BitField.natvis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
index 44c0e8eab1..42141a3189 100644
--- a/Source/Core/Common/BitField.natvis
+++ b/Source/Core/Common/BitField.natvis
@@ -31,7 +31,7 @@
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
   <!--
     This is a re-implementation of the abstract bitfield class' algrothm (in BitField.h)
-    for visual studio to use for pretty-printing during debugging.
+    for Visual Studio to use for pretty-printing during debugging.
   -->
   <Type Name="BitField&lt;*,*,*&gt;">
     <DisplayString Condition="$T2 == 1"><![CDATA[{(storage & (1 << $T1)) != 0}]]></DisplayString>