From 72661e7c16ef3f638db6be0c85e93a84377ba177 Mon Sep 17 00:00:00 2001
From: Akash <ssj2akash@gmail.com>
Date: Wed, 29 Jun 2016 23:00:15 +0530
Subject: [PATCH] PCSX2-Core: Clean up some warnings on MSVC

x86emitter : Convert variable type from u8 to bool.
recVTLB: Cast "sign" to bool to prevent a warning.
R5900OpcodeImpl: Cast all the values in array to u64 instead of s64.
---
 common/src/x86emitter/x86emitter.cpp |  8 ++++----
 pcsx2/R5900OpcodeImpl.cpp            | 16 ++++++++--------
 pcsx2/x86/ix86-32/recVTLB.cpp        |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/src/x86emitter/x86emitter.cpp b/common/src/x86emitter/x86emitter.cpp
index b19694f997..fc14e30707 100644
--- a/common/src/x86emitter/x86emitter.cpp
+++ b/common/src/x86emitter/x86emitter.cpp
@@ -426,10 +426,10 @@ void EmitRex( const xRegisterBase& reg1, const void* src )
 
 void EmitRex( const xRegisterBase& reg1, const xIndirectVoid& sib )
 {
-	u8 w = reg1.IsWide();
-	u8 r = reg1.IsExtended();
-	u8 x = sib.Index.IsExtended();
-	u8 b = sib.Base.IsExtended();
+	bool w = reg1.IsWide();
+	bool r = reg1.IsExtended();
+	bool x = sib.Index.IsExtended();
+	bool b = sib.Base.IsExtended();
 	EmitRex(w, r, x, b);
 }
 
diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp
index 8e0fb36fdd..7a465746ef 100644
--- a/pcsx2/R5900OpcodeImpl.cpp
+++ b/pcsx2/R5900OpcodeImpl.cpp
@@ -666,12 +666,12 @@ void LD()
 }
 
 static const u64 LDL_MASK[8] =
-{	0x00ffffffffffffffLL, 0x0000ffffffffffffLL, 0x000000ffffffffffLL, 0x00000000ffffffffLL,
-	0x0000000000ffffffLL, 0x000000000000ffffLL, 0x00000000000000ffLL, 0x0000000000000000LL
+{	0x00ffffffffffffffULL, 0x0000ffffffffffffULL, 0x000000ffffffffffULL, 0x00000000ffffffffULL,
+	0x0000000000ffffffULL, 0x000000000000ffffULL, 0x00000000000000ffULL, 0x0000000000000000ULL
 };
 static const u64 LDR_MASK[8] =
-{	0x0000000000000000LL, 0xff00000000000000LL, 0xffff000000000000LL, 0xffffff0000000000LL,
-	0xffffffff00000000LL, 0xffffffffff000000LL, 0xffffffffffff0000LL, 0xffffffffffffff00LL
+{	0x0000000000000000ULL, 0xff00000000000000ULL, 0xffff000000000000ULL, 0xffffff0000000000ULL,
+	0xffffffff00000000ULL, 0xffffffffff000000ULL, 0xffffffffffff0000ULL, 0xffffffffffffff00ULL
 };
 
 static const u8 LDR_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 };
@@ -797,12 +797,12 @@ void SD()
 }
 
 static const u64 SDL_MASK[8] =
-{	0xffffffffffffff00LL, 0xffffffffffff0000LL, 0xffffffffff000000LL, 0xffffffff00000000LL,
-	0xffffff0000000000LL, 0xffff000000000000LL, 0xff00000000000000LL, 0x0000000000000000LL
+{	0xffffffffffffff00ULL, 0xffffffffffff0000ULL, 0xffffffffff000000ULL, 0xffffffff00000000ULL,
+	0xffffff0000000000ULL, 0xffff000000000000ULL, 0xff00000000000000ULL, 0x0000000000000000ULL
 };
 static const u64 SDR_MASK[8] =
-{	0x0000000000000000LL, 0x00000000000000ffLL, 0x000000000000ffffLL, 0x0000000000ffffffLL,
-	0x00000000ffffffffLL, 0x000000ffffffffffLL, 0x0000ffffffffffffLL, 0x00ffffffffffffffLL
+{	0x0000000000000000ULL, 0x00000000000000ffULL, 0x000000000000ffffULL, 0x0000000000ffffffULL,
+	0x00000000ffffffffULL, 0x000000ffffffffffULL, 0x0000ffffffffffffULL, 0x00ffffffffffffffULL
 };
 
 static const u8 SDL_SHIFT[8] = { 56, 48, 40, 32, 24, 16, 8, 0 };
diff --git a/pcsx2/x86/ix86-32/recVTLB.cpp b/pcsx2/x86/ix86-32/recVTLB.cpp
index 0d6b218b2c..b99f095cb1 100644
--- a/pcsx2/x86/ix86-32/recVTLB.cpp
+++ b/pcsx2/x86/ix86-32/recVTLB.cpp
@@ -327,7 +327,7 @@ void vtlb_dynarec_init()
 			{
 				xSetPtr( GetIndirectDispatcherPtr( mode, bits, !!sign ) );
 
-				DynGen_IndirectTlbDispatcher( mode, bits, sign );
+				DynGen_IndirectTlbDispatcher( mode, bits, !!sign );
 			}
 		}
 	}