Index: source/libvpx/vpx_ports/mem_ops.h |
=================================================================== |
--- source/libvpx/vpx_ports/mem_ops.h (revision 172621) |
+++ source/libvpx/vpx_ports/mem_ops.h (working copy) |
@@ -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; |
+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; |
+ 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; |
+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; |
+ 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; |
+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; |
+ 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; |
+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; |
+ 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; |
+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; |
+ 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; |
+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; |
+ 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 @@ |
#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; |
+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; |
+ 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; |
+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; |
+ mem[0] = (val >> 0) & 0xff; |
+ mem[1] = (val >> 8) & 0xff; |
+ mem[2] = (val >> 16) & 0xff; |
+ mem[3] = (val >> 24) & 0xff; |
} |