diff options
author | John Koleszar <jkoleszar@google.com> | 2012-07-13 15:21:29 -0700 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2012-07-17 11:46:03 -0700 |
commit | c6b9039fd94aede59ac1086a379955137fc8e1b8 (patch) | |
tree | f9b20b2ca2114fe9303c8226bb3b368568fd5509 /vpx_ports | |
parent | 8697c6e454e02c6cf644daa9d29fabd07e846f18 (diff) | |
download | libvpx-c6b9039fd94aede59ac1086a379955137fc8e1b8.tar libvpx-c6b9039fd94aede59ac1086a379955137fc8e1b8.tar.gz libvpx-c6b9039fd94aede59ac1086a379955137fc8e1b8.tar.bz2 libvpx-c6b9039fd94aede59ac1086a379955137fc8e1b8.zip |
Restyle code
Approximate the Google style guide[1] so that that there's a written
document to follow and tools to check compliance[2].
[1]: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
[2]: http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py
Change-Id: Idf40e3d8dddcc72150f6af127b13e5dab838685f
Diffstat (limited to 'vpx_ports')
-rw-r--r-- | vpx_ports/arm_cpudetect.c | 230 | ||||
-rw-r--r-- | vpx_ports/asm_offsets.h | 4 | ||||
-rw-r--r-- | vpx_ports/mem.h | 4 | ||||
-rw-r--r-- | vpx_ports/mem_ops.h | 182 | ||||
-rw-r--r-- | vpx_ports/mem_ops_aligned.h | 80 | ||||
-rw-r--r-- | vpx_ports/vpx_timer.h | 65 | ||||
-rw-r--r-- | vpx_ports/vpxtypes.h | 41 | ||||
-rw-r--r-- | vpx_ports/x86.h | 182 | ||||
-rw-r--r-- | vpx_ports/x86_cpuid.c | 60 |
9 files changed, 397 insertions, 451 deletions
diff --git a/vpx_ports/arm_cpudetect.c b/vpx_ports/arm_cpudetect.c index 4109924cf..758115967 100644 --- a/vpx_ports/arm_cpudetect.c +++ b/vpx_ports/arm_cpudetect.c @@ -12,24 +12,21 @@ #include <string.h> #include "arm.h" -static int arm_cpu_env_flags(int *flags) -{ - char *env; - env = getenv("VPX_SIMD_CAPS"); - if (env && *env) - { - *flags = (int)strtol(env, NULL, 0); - return 0; - } - *flags = 0; - return -1; +static int arm_cpu_env_flags(int *flags) { + char *env; + env = getenv("VPX_SIMD_CAPS"); + if (env && *env) { + *flags = (int)strtol(env, NULL, 0); + return 0; + } + *flags = 0; + return -1; } -static int arm_cpu_env_mask(void) -{ - char *env; - env = getenv("VPX_SIMD_CAPS_MASK"); - return env && *env ? (int)strtol(env, NULL, 0) : ~0; +static int arm_cpu_env_mask(void) { + char *env; + env = getenv("VPX_SIMD_CAPS_MASK"); + return env && *env ? (int)strtol(env, NULL, 0) : ~0; } @@ -39,152 +36,129 @@ static int arm_cpu_env_mask(void) #define WIN32_EXTRA_LEAN #include <windows.h> -int arm_cpu_caps(void) -{ - int flags; - int mask; - if (!arm_cpu_env_flags(&flags)) - { - return flags; - } - mask = arm_cpu_env_mask(); - /* MSVC has no inline __asm support for ARM, but it does let you __emit - * instructions via their assembled hex code. - * All of these instructions should be essentially nops. - */ +int arm_cpu_caps(void) { + int flags; + int mask; + if (!arm_cpu_env_flags(&flags)) { + return flags; + } + mask = arm_cpu_env_mask(); + /* MSVC has no inline __asm support for ARM, but it does let you __emit + * instructions via their assembled hex code. + * All of these instructions should be essentially nops. + */ #if defined(HAVE_ARMV5TE) - if (mask & HAS_EDSP) - { - __try - { - /*PLD [r13]*/ - __emit(0xF5DDF000); - flags |= HAS_EDSP; - } - __except(GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) - { - /*Ignore exception.*/ - } + if (mask & HAS_EDSP) { + __try { + /*PLD [r13]*/ + __emit(0xF5DDF000); + flags |= HAS_EDSP; + } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) { + /*Ignore exception.*/ } + } #if defined(HAVE_ARMV6) - if (mask & HAS_MEDIA) - __try - { - /*SHADD8 r3,r3,r3*/ - __emit(0xE6333F93); - flags |= HAS_MEDIA; - } - __except(GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) - { - /*Ignore exception.*/ - } - } + if (mask & HAS_MEDIA) + __try { + /*SHADD8 r3,r3,r3*/ + __emit(0xE6333F93); + flags |= HAS_MEDIA; + } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) { + /*Ignore exception.*/ + } +} #if defined(HAVE_ARMV7) - if (mask & HAS_NEON) - { - __try - { - /*VORR q0,q0,q0*/ - __emit(0xF2200150); - flags |= HAS_NEON; - } - __except(GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) - { - /*Ignore exception.*/ - } - } +if (mask &HAS_NEON) { + __try { + /*VORR q0,q0,q0*/ + __emit(0xF2200150); + flags |= HAS_NEON; + } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) { + /*Ignore exception.*/ + } +} #endif #endif #endif - return flags & mask; +return flags & mask; } #elif defined(__linux__) #include <stdio.h> -int arm_cpu_caps(void) -{ - FILE *fin; - int flags; - int mask; - if (!arm_cpu_env_flags(&flags)) - { - return flags; - } - mask = arm_cpu_env_mask(); - /* Reading /proc/self/auxv would be easier, but that doesn't work reliably - * on Android. - * This also means that detection will fail in Scratchbox. +int arm_cpu_caps(void) { + FILE *fin; + int flags; + int mask; + if (!arm_cpu_env_flags(&flags)) { + return flags; + } + mask = arm_cpu_env_mask(); + /* Reading /proc/self/auxv would be easier, but that doesn't work reliably + * on Android. + * This also means that detection will fail in Scratchbox. + */ + fin = fopen("/proc/cpuinfo", "r"); + if (fin != NULL) { + /* 512 should be enough for anybody (it's even enough for all the flags + * that x86 has accumulated... so far). */ - fin = fopen("/proc/cpuinfo","r"); - if(fin != NULL) - { - /* 512 should be enough for anybody (it's even enough for all the flags - * that x86 has accumulated... so far). - */ - char buf[512]; - while (fgets(buf, 511, fin) != NULL) - { + char buf[512]; + while (fgets(buf, 511, fin) != NULL) { #if defined(HAVE_ARMV5TE) || defined(HAVE_ARMV7) - if (memcmp(buf, "Features", 8) == 0) - { - char *p; + if (memcmp(buf, "Features", 8) == 0) { + char *p; #if defined(HAVE_ARMV5TE) - p=strstr(buf, " edsp"); - if (p != NULL && (p[5] == ' ' || p[5] == '\n')) - { - flags |= HAS_EDSP; - } + p = strstr(buf, " edsp"); + if (p != NULL && (p[5] == ' ' || p[5] == '\n')) { + flags |= HAS_EDSP; + } #if defined(HAVE_ARMV7) - p = strstr(buf, " neon"); - if (p != NULL && (p[5] == ' ' || p[5] == '\n')) - { - flags |= HAS_NEON; - } + p = strstr(buf, " neon"); + if (p != NULL && (p[5] == ' ' || p[5] == '\n')) { + flags |= HAS_NEON; + } #endif #endif - } + } #endif #if defined(HAVE_ARMV6) - if (memcmp(buf, "CPU architecture:",17) == 0){ - int version; - version = atoi(buf+17); - if (version >= 6) - { - flags |= HAS_MEDIA; - } - } -#endif + if (memcmp(buf, "CPU architecture:", 17) == 0) { + int version; + version = atoi(buf + 17); + if (version >= 6) { + flags |= HAS_MEDIA; } - fclose(fin); + } +#endif } - return flags & mask; + fclose(fin); + } + return flags & mask; } #elif !CONFIG_RUNTIME_CPU_DETECT -int arm_cpu_caps(void) -{ - int flags; - int mask; - if (!arm_cpu_env_flags(&flags)) - { - return flags; - } - mask = arm_cpu_env_mask(); +int arm_cpu_caps(void) { + int flags; + int mask; + if (!arm_cpu_env_flags(&flags)) { + return flags; + } + mask = arm_cpu_env_mask(); #if defined(HAVE_ARMV5TE) - flags |= HAS_EDSP; + flags |= HAS_EDSP; #endif #if defined(HAVE_ARMV6) - flags |= HAS_MEDIA; + flags |= HAS_MEDIA; #endif #if defined(HAVE_ARMV7) - flags |= HAS_NEON; + flags |= HAS_NEON; #endif - return flags & mask; + return flags & mask; } #else #error "--enable-runtime-cpu-detect selected, but no CPU detection method " \ - "available for your platform. Reconfigure without --enable-runtime-cpu-detect." +"available for your platform. Reconfigure without --enable-runtime-cpu-detect." #endif diff --git a/vpx_ports/asm_offsets.h b/vpx_ports/asm_offsets.h index d3b4fc706..05da24f2b 100644 --- a/vpx_ports/asm_offsets.h +++ b/vpx_ports/asm_offsets.h @@ -15,8 +15,8 @@ #include <stddef.h> #define ct_assert(name,cond) \ - static void assert_##name(void) UNUSED;\ - static void assert_##name(void) {switch(0){case 0:case !!(cond):;}} + static void assert_##name(void) UNUSED;\ + static void assert_##name(void) {switch(0){case 0:case !!(cond):;}} #if INLINE_ASM #define DEFINE(sym, val) asm("\n" #sym " EQU %0" : : "i" (val)); diff --git a/vpx_ports/mem.h b/vpx_ports/mem.h index 9ec34fec6..c68b90862 100644 --- a/vpx_ports/mem.h +++ b/vpx_ports/mem.h @@ -31,8 +31,8 @@ * within the array. */ #define DECLARE_ALIGNED_ARRAY(a,typ,val,n)\ -typ val##_[(n)+(a)/sizeof(typ)+1];\ -typ *val = (typ*)((((intptr_t)val##_)+(a)-1)&((intptr_t)-(a))) + typ val##_[(n)+(a)/sizeof(typ)+1];\ + typ *val = (typ*)((((intptr_t)val##_)+(a)-1)&((intptr_t)-(a))) /* Indicates that the usage of the specified variable has been audited to assure diff --git a/vpx_ports/mem_ops.h b/vpx_ports/mem_ops.h index 0e523681d..038f293bc 100644 --- a/vpx_ports/mem_ops.h +++ b/vpx_ports/mem_ops.h @@ -60,88 +60,82 @@ #undef mem_get_be16 #define mem_get_be16 mem_ops_wrap_symbol(mem_get_be16) -static unsigned MEM_VALUE_T mem_get_be16(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[0] << 8; - val |= mem[1]; - return val; +static unsigned MEM_VALUE_T mem_get_be16(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[0] << 8; + val |= mem[1]; + return val; } #undef mem_get_be24 #define mem_get_be24 mem_ops_wrap_symbol(mem_get_be24) -static unsigned MEM_VALUE_T mem_get_be24(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[0] << 16; - val |= mem[1] << 8; - val |= mem[2]; - return val; +static unsigned MEM_VALUE_T mem_get_be24(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[0] << 16; + val |= mem[1] << 8; + val |= mem[2]; + return val; } #undef mem_get_be32 #define mem_get_be32 mem_ops_wrap_symbol(mem_get_be32) -static unsigned MEM_VALUE_T mem_get_be32(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[0] << 24; - val |= mem[1] << 16; - val |= mem[2] << 8; - val |= mem[3]; - return val; +static unsigned MEM_VALUE_T mem_get_be32(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[0] << 24; + val |= mem[1] << 16; + val |= mem[2] << 8; + val |= mem[3]; + return val; } #undef mem_get_le16 #define mem_get_le16 mem_ops_wrap_symbol(mem_get_le16) -static unsigned MEM_VALUE_T mem_get_le16(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[1] << 8; - val |= mem[0]; - return val; +static unsigned MEM_VALUE_T mem_get_le16(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[1] << 8; + val |= mem[0]; + return val; } #undef mem_get_le24 #define mem_get_le24 mem_ops_wrap_symbol(mem_get_le24) -static unsigned MEM_VALUE_T mem_get_le24(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[2] << 16; - val |= mem[1] << 8; - val |= mem[0]; - return val; +static unsigned MEM_VALUE_T mem_get_le24(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[2] << 16; + val |= mem[1] << 8; + val |= mem[0]; + return val; } #undef mem_get_le32 #define mem_get_le32 mem_ops_wrap_symbol(mem_get_le32) -static unsigned MEM_VALUE_T mem_get_le32(const void *vmem) -{ - unsigned MEM_VALUE_T val; - const MAU_T *mem = (const MAU_T *)vmem; - - val = mem[3] << 24; - val |= mem[2] << 16; - val |= mem[1] << 8; - val |= mem[0]; - return val; +static unsigned MEM_VALUE_T mem_get_le32(const void *vmem) { + unsigned MEM_VALUE_T val; + const MAU_T *mem = (const MAU_T *)vmem; + + val = mem[3] << 24; + val |= mem[2] << 16; + val |= mem[1] << 8; + val |= mem[0]; + return val; } #define mem_get_s_generic(end,sz) \ - static signed MEM_VALUE_T mem_get_s##end##sz(const void *vmem) {\ - const MAU_T *mem = (const MAU_T*)vmem;\ - signed MEM_VALUE_T val = mem_get_##end##sz(mem);\ - return (val << (MEM_VALUE_T_SZ_BITS - sz)) >> (MEM_VALUE_T_SZ_BITS - sz);\ - } + static signed MEM_VALUE_T mem_get_s##end##sz(const void *vmem) {\ + const MAU_T *mem = (const MAU_T*)vmem;\ + signed MEM_VALUE_T val = mem_get_##end##sz(mem);\ + return (val << (MEM_VALUE_T_SZ_BITS - sz)) >> (MEM_VALUE_T_SZ_BITS - sz);\ + } #undef mem_get_sbe16 #define mem_get_sbe16 mem_ops_wrap_symbol(mem_get_sbe16) @@ -169,66 +163,60 @@ mem_get_s_generic(le, 32); #undef mem_put_be16 #define mem_put_be16 mem_ops_wrap_symbol(mem_put_be16) -static void mem_put_be16(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; +static void mem_put_be16(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; - mem[0] = (val >> 8) & 0xff; - mem[1] = (val >> 0) & 0xff; + mem[0] = (val >> 8) & 0xff; + mem[1] = (val >> 0) & 0xff; } #undef mem_put_be24 #define mem_put_be24 mem_ops_wrap_symbol(mem_put_be24) -static void mem_put_be24(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; +static void mem_put_be24(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; - mem[0] = (val >> 16) & 0xff; - mem[1] = (val >> 8) & 0xff; - mem[2] = (val >> 0) & 0xff; + mem[0] = (val >> 16) & 0xff; + mem[1] = (val >> 8) & 0xff; + mem[2] = (val >> 0) & 0xff; } #undef mem_put_be32 #define mem_put_be32 mem_ops_wrap_symbol(mem_put_be32) -static void mem_put_be32(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; - - mem[0] = (val >> 24) & 0xff; - mem[1] = (val >> 16) & 0xff; - mem[2] = (val >> 8) & 0xff; - mem[3] = (val >> 0) & 0xff; +static void mem_put_be32(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; + + mem[0] = (val >> 24) & 0xff; + mem[1] = (val >> 16) & 0xff; + mem[2] = (val >> 8) & 0xff; + mem[3] = (val >> 0) & 0xff; } #undef mem_put_le16 #define mem_put_le16 mem_ops_wrap_symbol(mem_put_le16) -static void mem_put_le16(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; +static void mem_put_le16(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; - mem[0] = (val >> 0) & 0xff; - mem[1] = (val >> 8) & 0xff; + mem[0] = (val >> 0) & 0xff; + mem[1] = (val >> 8) & 0xff; } #undef mem_put_le24 #define mem_put_le24 mem_ops_wrap_symbol(mem_put_le24) -static void mem_put_le24(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; +static void mem_put_le24(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; - mem[0] = (val >> 0) & 0xff; - mem[1] = (val >> 8) & 0xff; - mem[2] = (val >> 16) & 0xff; + mem[0] = (val >> 0) & 0xff; + mem[1] = (val >> 8) & 0xff; + mem[2] = (val >> 16) & 0xff; } #undef mem_put_le32 #define mem_put_le32 mem_ops_wrap_symbol(mem_put_le32) -static void mem_put_le32(void *vmem, MEM_VALUE_T val) -{ - MAU_T *mem = (MAU_T *)vmem; - - mem[0] = (val >> 0) & 0xff; - mem[1] = (val >> 8) & 0xff; - mem[2] = (val >> 16) & 0xff; - mem[3] = (val >> 24) & 0xff; +static void mem_put_le32(void *vmem, MEM_VALUE_T val) { + MAU_T *mem = (MAU_T *)vmem; + + mem[0] = (val >> 0) & 0xff; + mem[1] = (val >> 8) & 0xff; + mem[2] = (val >> 16) & 0xff; + mem[3] = (val >> 24) & 0xff; } diff --git a/vpx_ports/mem_ops_aligned.h b/vpx_ports/mem_ops_aligned.h index 82a18b2e0..de1b6d408 100644 --- a/vpx_ports/mem_ops_aligned.h +++ b/vpx_ports/mem_ops_aligned.h @@ -24,61 +24,61 @@ * could redefine these macros. */ #define swap_endian_16(val,raw) do {\ - val = ((raw>>8) & 0x00ff) \ - | ((raw<<8) & 0xff00);\ - } while(0) + val = ((raw>>8) & 0x00ff) \ + | ((raw<<8) & 0xff00);\ + } while(0) #define swap_endian_32(val,raw) do {\ - val = ((raw>>24) & 0x000000ff) \ - | ((raw>>8) & 0x0000ff00) \ - | ((raw<<8) & 0x00ff0000) \ - | ((raw<<24) & 0xff000000); \ - } while(0) + val = ((raw>>24) & 0x000000ff) \ + | ((raw>>8) & 0x0000ff00) \ + | ((raw<<8) & 0x00ff0000) \ + | ((raw<<24) & 0xff000000); \ + } while(0) #define swap_endian_16_se(val,raw) do {\ - swap_endian_16(val,raw);\ - val = ((val << 16) >> 16);\ - } while(0) + swap_endian_16(val,raw);\ + val = ((val << 16) >> 16);\ + } while(0) #define swap_endian_32_se(val,raw) swap_endian_32(val,raw) #define mem_get_ne_aligned_generic(end,sz) \ - static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ - const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ - return *mem;\ - } + static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ + const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ + return *mem;\ + } #define mem_get_sne_aligned_generic(end,sz) \ - static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ - const int##sz##_t *mem = (const int##sz##_t *)vmem;\ - return *mem;\ - } + static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ + const int##sz##_t *mem = (const int##sz##_t *)vmem;\ + return *mem;\ + } #define mem_get_se_aligned_generic(end,sz) \ - static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ - const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ - unsigned MEM_VALUE_T val, raw = *mem;\ - swap_endian_##sz(val,raw);\ - return val;\ - } + static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ + const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ + unsigned MEM_VALUE_T val, raw = *mem;\ + swap_endian_##sz(val,raw);\ + return val;\ + } #define mem_get_sse_aligned_generic(end,sz) \ - static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ - const int##sz##_t *mem = (const int##sz##_t *)vmem;\ - unsigned MEM_VALUE_T val, raw = *mem;\ - swap_endian_##sz##_se(val,raw);\ - return val;\ - } + static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ + const int##sz##_t *mem = (const int##sz##_t *)vmem;\ + unsigned MEM_VALUE_T val, raw = *mem;\ + swap_endian_##sz##_se(val,raw);\ + return val;\ + } #define mem_put_ne_aligned_generic(end,sz) \ - static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ - uint##sz##_t *mem = (uint##sz##_t *)vmem;\ - *mem = (uint##sz##_t)val;\ - } + static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ + uint##sz##_t *mem = (uint##sz##_t *)vmem;\ + *mem = (uint##sz##_t)val;\ + } #define mem_put_se_aligned_generic(end,sz) \ - static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ - uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\ - swap_endian_##sz(raw,val);\ - *mem = (uint##sz##_t)raw;\ - } + static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ + uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\ + swap_endian_##sz(raw,val);\ + *mem = (uint##sz##_t)raw;\ + } #include "config.h" #if CONFIG_BIG_ENDIAN diff --git a/vpx_ports/vpx_timer.h b/vpx_ports/vpx_timer.h index c8335a0a8..ae7a9967f 100644 --- a/vpx_ports/vpx_timer.h +++ b/vpx_ports/vpx_timer.h @@ -31,67 +31,63 @@ /* timersub is not provided by msys at this time. */ #ifndef timersub #define timersub(a, b, result) \ - do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ - } while (0) + do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ + } while (0) #endif #endif -struct vpx_usec_timer -{ +struct vpx_usec_timer { #if defined(_WIN32) - LARGE_INTEGER begin, end; + LARGE_INTEGER begin, end; #else - struct timeval begin, end; + struct timeval begin, end; #endif }; static void -vpx_usec_timer_start(struct vpx_usec_timer *t) -{ +vpx_usec_timer_start(struct vpx_usec_timer *t) { #if defined(_WIN32) - QueryPerformanceCounter(&t->begin); + QueryPerformanceCounter(&t->begin); #else - gettimeofday(&t->begin, NULL); + gettimeofday(&t->begin, NULL); #endif } static void -vpx_usec_timer_mark(struct vpx_usec_timer *t) -{ +vpx_usec_timer_mark(struct vpx_usec_timer *t) { #if defined(_WIN32) - QueryPerformanceCounter(&t->end); + QueryPerformanceCounter(&t->end); #else - gettimeofday(&t->end, NULL); + gettimeofday(&t->end, NULL); #endif } static long -vpx_usec_timer_elapsed(struct vpx_usec_timer *t) -{ +vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { #if defined(_WIN32) - LARGE_INTEGER freq, diff; + LARGE_INTEGER freq, diff; - diff.QuadPart = t->end.QuadPart - t->begin.QuadPart; + diff.QuadPart = t->end.QuadPart - t->begin.QuadPart; - if (QueryPerformanceFrequency(&freq) && diff.QuadPart < freq.QuadPart) - return (long)(diff.QuadPart * 1000000 / freq.QuadPart); + if (QueryPerformanceFrequency(&freq) && diff.QuadPart < freq.QuadPart) + return (long)(diff.QuadPart * 1000000 / freq.QuadPart); - return 1000000; + return 1000000; #else - struct timeval diff; + struct timeval diff; - timersub(&t->end, &t->begin, &diff); - return diff.tv_sec ? 1000000 : diff.tv_usec; + timersub(&t->end, &t->begin, &diff); + return diff.tv_sec ? 1000000 : diff.tv_usec; #endif } @@ -102,9 +98,8 @@ vpx_usec_timer_elapsed(struct vpx_usec_timer *t) #define timersub(a, b, result) #endif -struct vpx_usec_timer -{ - void *dummy; +struct vpx_usec_timer { + void *dummy; }; static void @@ -114,7 +109,9 @@ static void vpx_usec_timer_mark(struct vpx_usec_timer *t) { } static long -vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { return 0; } +vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { + return 0; +} #endif /* CONFIG_OS_SUPPORT */ diff --git a/vpx_ports/vpxtypes.h b/vpx_ports/vpxtypes.h index 2ab66b14b..9dce15e33 100644 --- a/vpx_ports/vpxtypes.h +++ b/vpx_ports/vpxtypes.h @@ -14,7 +14,7 @@ #include "vpx_ports/config.h" -//#include <sys/types.h> +// #include <sys/types.h> #ifdef _MSC_VER # include <basetsd.h> typedef SSIZE_T ssize_t; @@ -112,25 +112,24 @@ typedef vpxu64 uint64_t; /*!\ingroup basetypes \brief Common return type*/ -typedef enum -{ - VPX_NOT_FOUND = -404, - VPX_BUFFER_EMPTY = -202, - VPX_BUFFER_FULL = -201, - - VPX_CONNREFUSED = -102, - VPX_TIMEDOUT = -101, - VPX_WOULDBLOCK = -100, - - VPX_NET_ERROR = -9, - VPX_INVALID_VERSION = -8, - VPX_INPROGRESS = -7, - VPX_NOT_SUPP = -6, - VPX_NO_MEM = -3, - VPX_INVALID_PARAMS = -2, - VPX_ERROR = -1, - VPX_OK = 0, - VPX_DONE = 1 +typedef enum { + VPX_NOT_FOUND = -404, + VPX_BUFFER_EMPTY = -202, + VPX_BUFFER_FULL = -201, + + VPX_CONNREFUSED = -102, + VPX_TIMEDOUT = -101, + VPX_WOULDBLOCK = -100, + + VPX_NET_ERROR = -9, + VPX_INVALID_VERSION = -8, + VPX_INPROGRESS = -7, + VPX_NOT_SUPP = -6, + VPX_NO_MEM = -3, + VPX_INVALID_PARAMS = -2, + VPX_ERROR = -1, + VPX_OK = 0, + VPX_DONE = 1 } vpxsc; #if defined(WIN32) || defined(_WIN32_WCE) @@ -140,7 +139,7 @@ typedef enum #elif defined(LINUX) # define DLLIMPORT /*visibility attribute support is available in 3.4 and later. - see: http://gcc.gnu.org/wiki/Visibility for more info*/ + see: http:// gcc.gnu.org/wiki/Visibility for more info*/ # if defined(__GNUC__) && ((__GNUC__<<16|(__GNUC_MINOR__&0xff)) >= (3<<16|4)) # define GCC_HASCLASSVISIBILITY # endif /*defined(__GNUC__) && __GNUC_PREREQ(3,4)*/ diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h index b0130fbfe..5aeaf9d19 100644 --- a/vpx_ports/x86.h +++ b/vpx_ports/x86.h @@ -14,58 +14,57 @@ #include <stdlib.h> #include "config.h" -typedef enum -{ - VPX_CPU_UNKNOWN = -1, - VPX_CPU_AMD, - VPX_CPU_AMD_OLD, - VPX_CPU_CENTAUR, - VPX_CPU_CYRIX, - VPX_CPU_INTEL, - VPX_CPU_NEXGEN, - VPX_CPU_NSC, - VPX_CPU_RISE, - VPX_CPU_SIS, - VPX_CPU_TRANSMETA, - VPX_CPU_TRANSMETA_OLD, - VPX_CPU_UMC, - VPX_CPU_VIA, - - VPX_CPU_LAST +typedef enum { + VPX_CPU_UNKNOWN = -1, + VPX_CPU_AMD, + VPX_CPU_AMD_OLD, + VPX_CPU_CENTAUR, + VPX_CPU_CYRIX, + VPX_CPU_INTEL, + VPX_CPU_NEXGEN, + VPX_CPU_NSC, + VPX_CPU_RISE, + VPX_CPU_SIS, + VPX_CPU_TRANSMETA, + VPX_CPU_TRANSMETA_OLD, + VPX_CPU_UMC, + VPX_CPU_VIA, + + VPX_CPU_LAST } vpx_cpu_t; #if defined(__GNUC__) && __GNUC__ #if ARCH_X86_64 #define cpuid(func,ax,bx,cx,dx)\ - __asm__ __volatile__ (\ - "cpuid \n\t" \ - : "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \ - : "a" (func)); + __asm__ __volatile__ (\ + "cpuid \n\t" \ + : "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \ + : "a" (func)); #else #define cpuid(func,ax,bx,cx,dx)\ - __asm__ __volatile__ (\ - "mov %%ebx, %%edi \n\t" \ - "cpuid \n\t" \ - "xchg %%edi, %%ebx \n\t" \ - : "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \ - : "a" (func)); + __asm__ __volatile__ (\ + "mov %%ebx, %%edi \n\t" \ + "cpuid \n\t" \ + "xchg %%edi, %%ebx \n\t" \ + : "=a" (ax), "=D" (bx), "=c" (cx), "=d" (dx) \ + : "a" (func)); #endif #else #if ARCH_X86_64 void __cpuid(int CPUInfo[4], int info_type); #pragma intrinsic(__cpuid) #define cpuid(func,a,b,c,d) do{\ - int regs[4];\ - __cpuid(regs,func); a=regs[0]; b=regs[1]; c=regs[2]; d=regs[3];\ - } while(0) + int regs[4];\ + __cpuid(regs,func); a=regs[0]; b=regs[1]; c=regs[2]; d=regs[3];\ + } while(0) #else #define cpuid(func,a,b,c,d)\ - __asm mov eax, func\ - __asm cpuid\ - __asm mov a, eax\ - __asm mov b, ebx\ - __asm mov c, ecx\ - __asm mov d, edx + __asm mov eax, func\ + __asm cpuid\ + __asm mov a, eax\ + __asm mov b, ebx\ + __asm mov c, ecx\ + __asm mov d, edx #endif #endif @@ -80,47 +79,46 @@ void __cpuid(int CPUInfo[4], int info_type); #endif static int -x86_simd_caps(void) -{ - unsigned int flags = 0; - unsigned int mask = ~0; - unsigned int reg_eax, reg_ebx, reg_ecx, reg_edx; - char *env; - (void)reg_ebx; +x86_simd_caps(void) { + unsigned int flags = 0; + unsigned int mask = ~0; + unsigned int reg_eax, reg_ebx, reg_ecx, reg_edx; + char *env; + (void)reg_ebx; - /* See if the CPU capabilities are being overridden by the environment */ - env = getenv("VPX_SIMD_CAPS"); + /* See if the CPU capabilities are being overridden by the environment */ + env = getenv("VPX_SIMD_CAPS"); - if (env && *env) - return (int)strtol(env, NULL, 0); + if (env && *env) + return (int)strtol(env, NULL, 0); - env = getenv("VPX_SIMD_CAPS_MASK"); + env = getenv("VPX_SIMD_CAPS_MASK"); - if (env && *env) - mask = strtol(env, NULL, 0); + if (env && *env) + mask = strtol(env, NULL, 0); - /* Ensure that the CPUID instruction supports extended features */ - cpuid(0, reg_eax, reg_ebx, reg_ecx, reg_edx); + /* Ensure that the CPUID instruction supports extended features */ + cpuid(0, reg_eax, reg_ebx, reg_ecx, reg_edx); - if (reg_eax < 1) - return 0; + if (reg_eax < 1) + return 0; - /* Get the standard feature flags */ - cpuid(1, reg_eax, reg_ebx, reg_ecx, reg_edx); + /* Get the standard feature flags */ + cpuid(1, reg_eax, reg_ebx, reg_ecx, reg_edx); - if (reg_edx & BIT(23)) flags |= HAS_MMX; + if (reg_edx & BIT(23)) flags |= HAS_MMX; - if (reg_edx & BIT(25)) flags |= HAS_SSE; /* aka xmm */ + if (reg_edx & BIT(25)) flags |= HAS_SSE; /* aka xmm */ - if (reg_edx & BIT(26)) flags |= HAS_SSE2; /* aka wmt */ + if (reg_edx & BIT(26)) flags |= HAS_SSE2; /* aka wmt */ - if (reg_ecx & BIT(0)) flags |= HAS_SSE3; + if (reg_ecx & BIT(0)) flags |= HAS_SSE3; - if (reg_ecx & BIT(9)) flags |= HAS_SSSE3; + if (reg_ecx & BIT(9)) flags |= HAS_SSSE3; - if (reg_ecx & BIT(19)) flags |= HAS_SSE4_1; + if (reg_ecx & BIT(19)) flags |= HAS_SSE4_1; - return flags & mask; + return flags & mask; } vpx_cpu_t vpx_x86_vendor(void); @@ -130,17 +128,16 @@ unsigned __int64 __rdtsc(void); #pragma intrinsic(__rdtsc) #endif static unsigned int -x86_readtsc(void) -{ +x86_readtsc(void) { #if defined(__GNUC__) && __GNUC__ - unsigned int tsc; - __asm__ __volatile__("rdtsc\n\t":"=a"(tsc):); - return tsc; + unsigned int tsc; + __asm__ __volatile__("rdtsc\n\t":"=a"(tsc):); + return tsc; #else #if ARCH_X86_64 - return __rdtsc(); + return __rdtsc(); #else - __asm rdtsc; + __asm rdtsc; #endif #endif } @@ -148,29 +145,27 @@ x86_readtsc(void) #if defined(__GNUC__) && __GNUC__ #define x86_pause_hint()\ - __asm__ __volatile__ ("pause \n\t") + __asm__ __volatile__ ("pause \n\t") #else #if ARCH_X86_64 #define x86_pause_hint()\ - _mm_pause(); + _mm_pause(); #else #define x86_pause_hint()\ - __asm pause + __asm pause #endif #endif #if defined(__GNUC__) && __GNUC__ static void -x87_set_control_word(unsigned short mode) -{ - __asm__ __volatile__("fldcw %0" : : "m"(*&mode)); +x87_set_control_word(unsigned short mode) { + __asm__ __volatile__("fldcw %0" : : "m"( *&mode)); } static unsigned short -x87_get_control_word(void) -{ - unsigned short mode; - __asm__ __volatile__("fstcw %0\n\t":"=m"(*&mode):); - return mode; +x87_get_control_word(void) { + unsigned short mode; + __asm__ __volatile__("fstcw %0\n\t":"=m"( *&mode):); + return mode; } #elif ARCH_X86_64 /* No fldcw intrinsics on Windows x64, punt to external asm */ @@ -180,25 +175,22 @@ extern unsigned short vpx_winx64_fstcw(void); #define x87_get_control_word vpx_winx64_fstcw #else static void -x87_set_control_word(unsigned short mode) -{ - __asm { fldcw mode } +x87_set_control_word(unsigned short mode) { + __asm { fldcw mode } } static unsigned short -x87_get_control_word(void) -{ - unsigned short mode; - __asm { fstcw mode } - return mode; +x87_get_control_word(void) { + unsigned short mode; + __asm { fstcw mode } + return mode; } #endif static unsigned short -x87_set_double_precision(void) -{ - unsigned short mode = x87_get_control_word(); - x87_set_control_word((mode&~0x300) | 0x200); - return mode; +x87_set_double_precision(void) { + unsigned short mode = x87_get_control_word(); + x87_set_control_word((mode&~0x300) | 0x200); + return mode; } diff --git a/vpx_ports/x86_cpuid.c b/vpx_ports/x86_cpuid.c index ce6403374..fe86cfc7b 100644 --- a/vpx_ports/x86_cpuid.c +++ b/vpx_ports/x86_cpuid.c @@ -11,43 +11,39 @@ #include <string.h> #include "x86.h" -struct cpuid_vendors -{ - char vendor_string[12]; - vpx_cpu_t vendor_id; +struct cpuid_vendors { + char vendor_string[12]; + vpx_cpu_t vendor_id; }; -static struct cpuid_vendors cpuid_vendor_list[VPX_CPU_LAST] = -{ - { "AuthenticAMD", VPX_CPU_AMD }, - { "AMDisbetter!", VPX_CPU_AMD_OLD }, - { "CentaurHauls", VPX_CPU_CENTAUR }, - { "CyrixInstead", VPX_CPU_CYRIX }, - { "GenuineIntel", VPX_CPU_INTEL }, - { "NexGenDriven", VPX_CPU_NEXGEN }, - { "Geode by NSC", VPX_CPU_NSC }, - { "RiseRiseRise", VPX_CPU_RISE }, - { "SiS SiS SiS ", VPX_CPU_SIS }, - { "GenuineTMx86", VPX_CPU_TRANSMETA }, - { "TransmetaCPU", VPX_CPU_TRANSMETA_OLD }, - { "UMC UMC UMC ", VPX_CPU_UMC }, - { "VIA VIA VIA ", VPX_CPU_VIA }, +static struct cpuid_vendors cpuid_vendor_list[VPX_CPU_LAST] = { + { "AuthenticAMD", VPX_CPU_AMD }, + { "AMDisbetter!", VPX_CPU_AMD_OLD }, + { "CentaurHauls", VPX_CPU_CENTAUR }, + { "CyrixInstead", VPX_CPU_CYRIX }, + { "GenuineIntel", VPX_CPU_INTEL }, + { "NexGenDriven", VPX_CPU_NEXGEN }, + { "Geode by NSC", VPX_CPU_NSC }, + { "RiseRiseRise", VPX_CPU_RISE }, + { "SiS SiS SiS ", VPX_CPU_SIS }, + { "GenuineTMx86", VPX_CPU_TRANSMETA }, + { "TransmetaCPU", VPX_CPU_TRANSMETA_OLD }, + { "UMC UMC UMC ", VPX_CPU_UMC }, + { "VIA VIA VIA ", VPX_CPU_VIA }, }; -vpx_cpu_t vpx_x86_vendor(void) -{ - unsigned int reg_eax; - unsigned int vs[3]; - int i; +vpx_cpu_t vpx_x86_vendor(void) { + unsigned int reg_eax; + unsigned int vs[3]; + int i; - /* Get the Vendor String from the CPU */ - cpuid(0, reg_eax, vs[0], vs[2], vs[1]); + /* Get the Vendor String from the CPU */ + cpuid(0, reg_eax, vs[0], vs[2], vs[1]); - for (i = 0; i < VPX_CPU_LAST; i++) - { - if (strncmp ((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0) - return (cpuid_vendor_list[i].vendor_id); - } + for (i = 0; i < VPX_CPU_LAST; i++) { + if (strncmp((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0) + return (cpuid_vendor_list[i].vendor_id); + } - return VPX_CPU_UNKNOWN; + return VPX_CPU_UNKNOWN; } |