From 6483f8d45c19b942c7893d6203c1c19775934d62 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 24 Oct 2014 16:21:54 -0500 Subject: [PATCH] Removes ARMv7 specific byteswap routines from CommonFuncs.h GCC has optimized this using the exact same code since 4.7 or 4.8. Android building falls back to the __linux__ route. No need to keep these around anymore since we aren't building on an old GCC version. --- Source/Core/Common/CommonFuncs.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index cf197ef660..5fad73a5b1 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -190,10 +190,6 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} -#elif _M_ARM_32 -inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} -inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} -inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);} #elif __linux__ inline u16 swap16(u16 _data) {return bswap_16(_data);} inline u32 swap32(u32 _data) {return bswap_32(_data);}