From ddbeebb887cff61b087a48738650832bc62c9e83 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 21 Jul 2015 20:08:49 -0400 Subject: Common: Ported over boilerplate x86 JIT code from Dolphin/PPSSPP. --- src/common/common_funcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/common_funcs.h') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 83b47f61e..6fd2b06b2 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -35,7 +35,7 @@ #ifndef _MSC_VER -#if defined(__x86_64__) || defined(_M_X64) +#if defined(__x86_64__) || defined(_M_X86_64) #define Crash() __asm__ __volatile__("int $3") #elif defined(_M_ARM) #define Crash() __asm__ __volatile__("trap") -- cgit v1.2.3 From bd7e691f78d916ed6ae5396b2d646d9b3a053dd7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 12 Aug 2015 00:00:44 -0400 Subject: x64: Refactor to remove fake interfaces and general cleanups. --- src/common/common_funcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/common_funcs.h') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 6fd2b06b2..948070e62 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -35,7 +35,7 @@ #ifndef _MSC_VER -#if defined(__x86_64__) || defined(_M_X86_64) +#if defined(__x86_64__) || defined(ARCHITECTURE_X64) #define Crash() __asm__ __volatile__("int $3") #elif defined(_M_ARM) #define Crash() __asm__ __volatile__("trap") -- cgit v1.2.3 From b39c053785abc4a94ce380885a846c5d8be89675 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 14 Aug 2015 22:29:08 -0400 Subject: Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64. --- src/common/common_funcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/common_funcs.h') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 948070e62..88e452a16 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -35,7 +35,7 @@ #ifndef _MSC_VER -#if defined(__x86_64__) || defined(ARCHITECTURE_X64) +#ifdef ARCHITECTURE_x86_64 #define Crash() __asm__ __volatile__("int $3") #elif defined(_M_ARM) #define Crash() __asm__ __volatile__("trap") -- cgit v1.2.3