From ec046d276b2963481e9df836e450a6fce1214b33 Mon Sep 17 00:00:00 2001
From: squall-leonhart <squall-leonhart@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Fri, 10 Sep 2010 11:31:31 +0000
Subject: [PATCH] enable SSE optimisations in VCProj, intrinsics update nasm
 and revert shuffles changes to gb_apu_state.cpp.

i prefer warnings during compilation rather then a lack of function in the emulator, we can look at correcting the warnings in a less broken manner later.
---
 project/vs2010_mfc/VBA2010.suo     | Bin 14848 -> 14848 bytes
 project/vs2010_mfc/VBA2010.vcxproj |   8 +++++---
 src/apu/Gb_Apu_State.cpp           |   3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/project/vs2010_mfc/VBA2010.suo b/project/vs2010_mfc/VBA2010.suo
index c4728b61dbbb824c34af4accbded9878ab7f50c3..3be55ac430f25e2fa82f1204be218af7d10fa133 100644
GIT binary patch
delta 116
zcmZoDX(-u{!@{;<%J$Y90h5bZF7h%;GcYj70P%kyn0%2%WfCvT<_gx+g1n3@Kv78~
mnaL&M{=AGJbxcU2o4<&k7oB{V#c=Z%-78ES!YEP(Je&Y}=`be%

delta 116
zcmZoDX(-u{!@_pq@@?I@?vsmHF7h(`2Lc%e1~5JOB8$o-UY5-jtfvKe8CZa#l1MU>
lOT_&rA7(M!{6+k{C@-ThP>Kmjdh-|ED@+{HC?W<toB%)UFbn_y

diff --git a/project/vs2010_mfc/VBA2010.vcxproj b/project/vs2010_mfc/VBA2010.vcxproj
index 44b79c32..86900c6e 100644
--- a/project/vs2010_mfc/VBA2010.vcxproj
+++ b/project/vs2010_mfc/VBA2010.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -146,7 +146,7 @@
 /D_SECURE_SCL=0
 /Zc:forScope-
 /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -154,7 +154,7 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -162,6 +162,8 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/apu/Gb_Apu_State.cpp b/src/apu/Gb_Apu_State.cpp
index 2533bd49..6a523460 100644
--- a/src/apu/Gb_Apu_State.cpp
+++ b/src/apu/Gb_Apu_State.cpp
@@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
 #include "blargg_source.h"
 
 #if GB_APU_CUSTOM_STATE
-	#define REFLECT( x, y ) (save ?       (io->y) = (x) :         (x) = !!(io->y)        )
+	#define REFLECT( x, y ) (save ?       (io->y) = (x) :         (x) = (io->y)          )
 #else
 	#define REFLECT( x, y ) (save ? set_val( io->y, x ) : (void) ((x) = get_val( io->y )))
 
@@ -116,3 +116,4 @@ blargg_err_t Gb_Apu::load_state( gb_apu_state_t const& in )
 
 	return 0;
 }
+