From ffa0f2fb44ac8dcf46c06bcceef00caa4a51af5d Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 26 Oct 2013 17:57:40 -0700
Subject: [PATCH] Fix some arm emitter warnings on win64.

We link it in for debugging purposes.
---
 Common/ArmEmitter.cpp | 12 ++++++------
 Common/ArmEmitter.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp
index 840862c864..15d4572d23 100644
--- a/Common/ArmEmitter.cpp
+++ b/Common/ArmEmitter.cpp
@@ -267,7 +267,7 @@ void ARMXEmitter::QuickCallFunction(ARMReg reg, void *func) {
 	if (BLInRange(func)) {
 		BL(func);
 	} else {
-		MOVI2R(reg, (uintptr_t)(func));
+		MOVI2R(reg, (u32)(uintptr_t)(func));
 		BL(reg);
 	}
 }
@@ -392,7 +392,7 @@ FixupBranch ARMXEmitter::B_CC(CCFlags Cond)
 }
 void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr)
 {
-	s32 distance = (intptr_t)fnptr - ((intptr_t)(code) + 8);
+	ptrdiff_t distance = (intptr_t)fnptr - ((intptr_t)(code) + 8);
 	_assert_msg_(JIT, distance > -33554432
                      && distance <=  33554432,
                      "B_CC out of range (%p calls %p)", code, fnptr);
@@ -411,7 +411,7 @@ FixupBranch ARMXEmitter::BL_CC(CCFlags Cond)
 }
 void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
 {
-	s32 distance =  ((intptr_t)(code) - 8)  - (intptr_t)branch.ptr;
+	ptrdiff_t distance =  ((intptr_t)(code) - 8)  - (intptr_t)branch.ptr;
 	_assert_msg_(JIT, distance > -33554432
                      && distance <=  33554432,
                      "SetJumpTarget out of range (%p calls %p)", code,
@@ -425,7 +425,7 @@ void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
 }
 void ARMXEmitter::B (const void *fnptr)
 {
-	s32 distance = (intptr_t)fnptr - (intptr_t(code) + 8);
+	ptrdiff_t distance = (intptr_t)fnptr - (intptr_t(code) + 8);
 	_assert_msg_(JIT, distance > -33554432
                      && distance <=  33554432,
                      "B out of range (%p calls %p)", code, fnptr);
@@ -439,7 +439,7 @@ void ARMXEmitter::B(ARMReg src)
 }
 
 bool ARMXEmitter::BLInRange(const void *fnptr) {
-	s32 distance = (intptr_t)fnptr - (intptr_t(code) + 8);
+	ptrdiff_t distance = (intptr_t)fnptr - (intptr_t(code) + 8);
 	if (distance <= -33554432 || distance > 33554432)
 		return false;
 	else
@@ -448,7 +448,7 @@ bool ARMXEmitter::BLInRange(const void *fnptr) {
 
 void ARMXEmitter::BL(const void *fnptr)
 {
-	s32 distance = (intptr_t)fnptr - (intptr_t(code) + 8);
+	ptrdiff_t distance = (intptr_t)fnptr - (intptr_t(code) + 8);
 	_assert_msg_(JIT, distance > -33554432
                      && distance <=  33554432,
                      "BL out of range (%p calls %p)", code, fnptr);
diff --git a/Common/ArmEmitter.h b/Common/ArmEmitter.h
index 695d49b1fa..7dc3b32c51 100644
--- a/Common/ArmEmitter.h
+++ b/Common/ArmEmitter.h
@@ -325,7 +325,7 @@ Operand2 AssumeMakeOperand2(u32 imm);
 
 inline Operand2 R(ARMReg Reg)	{ return Operand2(Reg, TYPE_REG); }
 inline Operand2 IMM(u32 Imm)	{ return Operand2(Imm, TYPE_IMM); }
-inline Operand2 Mem(void *ptr)	{ return Operand2((uintptr_t)ptr, TYPE_IMM); }
+inline Operand2 Mem(void *ptr)	{ return Operand2((u32)(uintptr_t)ptr, TYPE_IMM); }
 //usage: struct {int e;} s; STRUCT_OFFSET(s,e)
 #define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str)))
 
@@ -339,7 +339,7 @@ struct FixupBranch
 
 struct LiteralPool
 {
-	s32 loc;
+	intptr_t loc;
 	u8* ldr_address;
 	u32 val;
 };