MIPS: mips32r2: added optimization for BSwap32

gcc < 4.8.3 doesn't translate bswap optimally.
use optimized version always

(cherry picked from commit 98c54107df)

Change-Id: I979ea26ad6dc0166d3d2f39c4148eb8adfb7ddec
This commit is contained in:
Djordje Pesut 2014-08-11 18:11:40 +02:00 committed by James Zern
parent 76d2192206
commit 55b10de73f
2 changed files with 14 additions and 1 deletions

View File

@ -62,6 +62,9 @@ extern "C" {
#if defined(__mips__) && !defined(__mips64) && (__mips_isa_rev < 6) #if defined(__mips__) && !defined(__mips64) && (__mips_isa_rev < 6)
#define WEBP_USE_MIPS32 #define WEBP_USE_MIPS32
#if (__mips_isa_rev >= 2)
#define WEBP_USE_MIPS32_R2
#endif
#endif #endif
typedef enum { typedef enum {

View File

@ -16,6 +16,7 @@
#include "../webp/config.h" #include "../webp/config.h"
#endif #endif
#include "../dsp/dsp.h"
#include "../webp/types.h" #include "../webp/types.h"
// some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__) // some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__)
@ -69,7 +70,16 @@ static WEBP_INLINE uint16_t BSwap16(uint16_t x) {
} }
static WEBP_INLINE uint32_t BSwap32(uint32_t x) { static WEBP_INLINE uint32_t BSwap32(uint32_t x) {
#if defined(HAVE_BUILTIN_BSWAP32) #if defined(WEBP_USE_MIPS32_R2)
uint32_t ret;
__asm__ volatile (
"wsbh %[ret], %[x] \n\t"
"rotr %[ret], %[ret], 16 \n\t"
: [ret]"=r"(ret)
: [x]"r"(x)
);
return ret;
#elif defined(HAVE_BUILTIN_BSWAP32)
return __builtin_bswap32(x); return __builtin_bswap32(x);
#elif defined(__i386__) || defined(__x86_64__) #elif defined(__i386__) || defined(__x86_64__)
uint32_t swapped_bytes; uint32_t swapped_bytes;