From bdf9969c7ef1846fa02207eecd60c33324b8b53f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Apr 2020 07:20:06 +0200 Subject: [PATCH] Update libretro-common --- libretro-common/file/file_path.c | 2 +- libretro-common/include/retro_endianness.h | 65 ++++++++++++---------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 90320c7caa..e46c4f3221 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -611,7 +611,7 @@ bool path_is_absolute(const char *path) || strstr(path, ":\\") || strstr(path, ":\\\\")) return true; -#elif defined(__wiiu__) +#elif defined(__wiiu__) || defined(VITA) if (strstr(path, ":/")) return true; #endif diff --git a/libretro-common/include/retro_endianness.h b/libretro-common/include/retro_endianness.h index 120a92a17f..b069cdf10a 100644 --- a/libretro-common/include/retro_endianness.h +++ b/libretro-common/include/retro_endianness.h @@ -31,38 +31,47 @@ #define SWAP16 _byteswap_ushort #define SWAP32 _byteswap_ulong #else -#define SWAP16(x) ((uint16_t)( \ - (((uint16_t)(x) & 0x00ff) << 8) | \ - (((uint16_t)(x) & 0xff00) >> 8) \ - )) -#define SWAP32(x) ((uint32_t)( \ - (((uint32_t)(x) & 0x000000ff) << 24) | \ - (((uint32_t)(x) & 0x0000ff00) << 8) | \ - (((uint32_t)(x) & 0x00ff0000) >> 8) | \ - (((uint32_t)(x) & 0xff000000) >> 24) \ - )) +static INLINE uint16_t SWAP16(uint16_t x) +{ + return ((x & 0x00ff) << 8) | + ((x & 0xff00) >> 8); +} + +static INLINE uint32_t SWAP32(uint32_t x) +{ + return ((x & 0x000000ff) << 24) | + ((x & 0x0000ff00) << 8) | + ((x & 0x00ff0000) >> 8) | + ((x & 0xff000000) >> 24); +} + #endif #if defined(_MSC_VER) && _MSC_VER <= 1200 -#define SWAP64(val) \ - ((((uint64_t)(val) & 0x00000000000000ff) << 56) \ - | (((uint64_t)(val) & 0x000000000000ff00) << 40) \ - | (((uint64_t)(val) & 0x0000000000ff0000) << 24) \ - | (((uint64_t)(val) & 0x00000000ff000000) << 8) \ - | (((uint64_t)(val) & 0x000000ff00000000) >> 8) \ - | (((uint64_t)(val) & 0x0000ff0000000000) >> 24) \ - | (((uint64_t)(val) & 0x00ff000000000000) >> 40) \ - | (((uint64_t)(val) & 0xff00000000000000) >> 56)) +static INLINE uint64_t SWAP64(uint64_t val) +{ + return + ((val & 0x00000000000000ff) << 56) + | ((val & 0x000000000000ff00) << 40) + | ((val & 0x0000000000ff0000) << 24) + | ((val & 0x00000000ff000000) << 8) + | ((val & 0x000000ff00000000) >> 8) + | ((val & 0x0000ff0000000000) >> 24) + | ((val & 0x00ff000000000000) >> 40) + | ((val & 0xff00000000000000) >> 56); +} #else -#define SWAP64(val) \ - ((((uint64_t)(val) & 0x00000000000000ffULL) << 56) \ - | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40) \ - | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24) \ - | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8) \ - | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8) \ - | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24) \ - | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40) \ - | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56)) +static INLINE uint64_t SWAP64(uint64_t val) +{ + return ((val & 0x00000000000000ffULL) << 56) + | ((val & 0x000000000000ff00ULL) << 40) + | ((val & 0x0000000000ff0000ULL) << 24) + | ((val & 0x00000000ff000000ULL) << 8) + | ((val & 0x000000ff00000000ULL) >> 8) + | ((val & 0x0000ff0000000000ULL) >> 24) + | ((val & 0x00ff000000000000ULL) >> 40) + | ((val & 0xff00000000000000ULL) >> 56); +} #endif