diff options
| author | Cameron Cawley <ccawley2011@gmail.com> | 2018-05-13 12:34:45 +0200 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-07-29 15:51:31 +0200 |
| commit | 1670c4421f6f2c3a08c21d81eef749ec956af65c (patch) | |
| tree | 99fa96a5abb1dfb6cb2751faedf7aaecd8fc9280 | |
| parent | Merge pull request #847 from lioncash/ncm (diff) | |
| download | yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar.gz yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar.bz2 yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar.lz yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar.xz yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.tar.zst yuzu-1670c4421f6f2c3a08c21d81eef749ec956af65c.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 4 | ||||
| -rw-r--r-- | src/common/swap.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 93f1c0044..8b0d34da6 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.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 diff --git a/src/common/swap.h b/src/common/swap.h index fc7af4280..32af0b6ac 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -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)); |