Browse Source
Merge pull request #865 from FearlessTobi/port-3732
Port #3732 from Citra: "common: Fix compilation on ARM"
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
4 deletions
-
src/common/common_funcs.h
-
src/common/swap.h
|
|
|
@ -6,7 +6,7 @@ |
|
|
|
|
|
|
|
#include <string> |
|
|
|
|
|
|
|
#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) |
|
|
|
#if !defined(ARCHITECTURE_x86_64) |
|
|
|
#include <cstdlib> // for exit |
|
|
|
#endif |
|
|
|
#include "common/common_types.h" |
|
|
|
@ -32,8 +32,6 @@ |
|
|
|
|
|
|
|
#ifdef ARCHITECTURE_x86_64 |
|
|
|
#define Crash() __asm__ __volatile__("int $3") |
|
|
|
#elif defined(ARCHITECTURE_ARM) |
|
|
|
#define Crash() __asm__ __volatile__("trap") |
|
|
|
#else |
|
|
|
#define Crash() exit(1) |
|
|
|
#endif |
|
|
|
|
|
|
|
@ -69,7 +69,7 @@ inline u32 swap32(u32 _data) { |
|
|
|
inline u64 swap64(u64 _data) { |
|
|
|
return _byteswap_uint64(_data); |
|
|
|
} |
|
|
|
#elif ARCHITECTURE_ARM |
|
|
|
#elif defined(ARCHITECTURE_ARM) && (__ARM_ARCH >= 6) |
|
|
|
inline u16 swap16(u16 _data) { |
|
|
|
u32 data = _data; |
|
|
|
__asm__("rev16 %0, %1\n" : "=l"(data) : "l"(data)); |
|
|
|
|
