diff options
| author | Willem Jan Palenstijn | 2015-01-04 21:54:11 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-01-04 22:00:00 +0100 |
| commit | 1084f2eea67d3a7f2293392af0c7a2c1d97b1b2b (patch) | |
| tree | 29a6f48ee604deef4f09b5e16aee25c098650d87 /common | |
| parent | 7c7bdf3543ee198b4dfbb06c9a95ea387342b56d (diff) | |
| download | scummvm-rg350-1084f2eea67d3a7f2293392af0c7a2c1d97b1b2b.tar.gz scummvm-rg350-1084f2eea67d3a7f2293392af0c7a2c1d97b1b2b.tar.bz2 scummvm-rg350-1084f2eea67d3a7f2293392af0c7a2c1d97b1b2b.zip | |
COMMON: Implement MIPS SWAP_BYTES_64 in terms of SWAP_BYTES_32
Diffstat (limited to 'common')
| -rw-r--r-- | common/endian.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/common/endian.h b/common/endian.h index 9f10b63053..0c6b3db621 100644 --- a/common/endian.h +++ b/common/endian.h @@ -160,22 +160,17 @@ // Test for GCC and if the target has the MIPS rel.2 instructions (we know the psp does) // -// TODO: Fix this #if statement. It isn't changed from 32 bit. Is there a 64 bit swap instruction? #if defined(__GNUC__) && (defined(__psp__) || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2)) - FORCEINLINE uint32 SWAP_BYTES_32(const uint32 a) { + FORCEINLINE uint64 SWAP_BYTES_64(const uint64 a) { if (__builtin_constant_p(a)) { - return SWAP_CONSTANT_32(a); + return SWAP_CONSTANT_64(a); } else { - uint32 result; -# if defined(__psp__) - // use special allegrex instruction - __asm__ ("wsbw %0,%1" : "=r" (result) : "r" (a)); -# else - __asm__ ("wsbh %0,%1\n" - "rotr %0,%0,16" : "=r" (result) : "r" (a)); -# endif - return result; + uint32 low = (uint32)a, high = (uint32)(a >> 32); + low = SWAP_BYTES_32(low); + high = SWAP_BYTES_32(high); + + return (((uint64)low) << 32) | high; } } |