Mercurial > libavcodec.hg
changeset 2765:e44ff53b1c85 libavcodec
Communicate proper aliasing to gcc (needed for 4.1).
| author | mellum |
|---|---|
| date | Sun, 19 Jun 2005 21:46:14 +0000 |
| parents | 2b37bcabe608 |
| children | 0609f405e000 |
| files | alpha/asm.h alpha/simple_idct_alpha.c |
| diffstat | 2 files changed, 45 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/alpha/asm.h Fri Jun 17 15:02:53 2005 +0000 +++ b/alpha/asm.h Sun Jun 19 21:46:14 2005 +0000 @@ -56,13 +56,33 @@ return x; } -#define ldq(p) (*(const uint64_t *) (p)) -#define ldl(p) (*(const int32_t *) (p)) -#define stl(l, p) do { *(uint32_t *) (p) = (l); } while (0) -#define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0) #define sextw(x) ((int16_t) (x)) #ifdef __GNUC__ +#define ldq(p) \ + (((union { \ + uint64_t __l; \ + __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)]; \ + } *) (p))->__l) +#define ldl(p) \ + (((union { \ + int32_t __l; \ + __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)]; \ + } *) (p))->__l) +#define stq(l, p) \ + do { \ + (((union { \ + uint64_t __l; \ + __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)]; \ + } *) (p))->__l) = l; \ + } while (0) +#define stl(l, p) \ + do { \ + (((union { \ + int32_t __l; \ + __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)]; \ + } *) (p))->__l) = l; \ + } while (0) struct unaligned_long { uint64_t l; } __attribute__((packed)); #define ldq_u(p) (*(const uint64_t *) (((uint64_t) (p)) & ~7ul)) #define uldq(a) (((const struct unaligned_long *) (a))->l) @@ -132,6 +152,10 @@ #elif defined(__DECC) /* Digital/Compaq/hp "ccc" compiler */ #include <c_asm.h> +#define ldq(p) (*(const uint64_t *) (p)) +#define ldl(p) (*(const int32_t *) (p)) +#define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0) +#define stl(l, p) do { *(int32_t *) (p) = (l); } while (0) #define ldq_u(a) asm ("ldq_u %v0,0(%a0)", a) #define uldq(a) (*(const __unaligned uint64_t *) (a)) #define cmpbge(a, b) asm ("cmpbge %a0,%a1,%v0", a, b)
--- a/alpha/simple_idct_alpha.c Fri Jun 17 15:02:53 2005 +0000 +++ b/alpha/simple_idct_alpha.c Sun Jun 19 21:46:14 2005 +0000 @@ -235,25 +235,22 @@ { int i; uint64_t l, r; - uint64_t *lcol = (uint64_t *) col; for (i = 0; i < 8; ++i) { - int_fast32_t a0 = col[0] + (1 << (COL_SHIFT - 1)) / W4; + int_fast32_t a0 = col[i] + (1 << (COL_SHIFT - 1)) / W4; a0 *= W4; - col[0] = a0 >> COL_SHIFT; - ++col; + col[i] = a0 >> COL_SHIFT; } - l = lcol[0]; - r = lcol[1]; - lcol[ 2] = l; lcol[ 3] = r; - lcol[ 4] = l; lcol[ 5] = r; - lcol[ 6] = l; lcol[ 7] = r; - lcol[ 8] = l; lcol[ 9] = r; - lcol[10] = l; lcol[11] = r; - lcol[12] = l; lcol[13] = r; - lcol[14] = l; lcol[15] = r; + l = ldq(col + 0 * 4); r = ldq(col + 1 * 4); + stq(l, col + 2 * 4); stq(r, col + 3 * 4); + stq(l, col + 4 * 4); stq(r, col + 5 * 4); + stq(l, col + 6 * 4); stq(r, col + 7 * 4); + stq(l, col + 8 * 4); stq(r, col + 9 * 4); + stq(l, col + 10 * 4); stq(r, col + 11 * 4); + stq(l, col + 12 * 4); stq(r, col + 13 * 4); + stq(l, col + 14 * 4); stq(r, col + 15 * 4); } void simple_idct_axp(DCTELEM *block) @@ -275,22 +272,20 @@ if (rowsZero) { idct_col2(block); } else if (rowsConstant) { - uint64_t *lblock = (uint64_t *) block; - idct_col(block); for (i = 0; i < 8; i += 2) { - uint64_t v = (uint16_t) block[i * 8]; - uint64_t w = (uint16_t) block[i * 8 + 8]; + uint64_t v = (uint16_t) block[0]; + uint64_t w = (uint16_t) block[8]; v |= v << 16; w |= w << 16; v |= v << 32; w |= w << 32; - lblock[0] = v; - lblock[1] = v; - lblock[2] = w; - lblock[3] = w; - lblock += 4; + stq(v, block + 0 * 4); + stq(v, block + 1 * 4); + stq(w, block + 2 * 4); + stq(w, block + 3 * 4); + block += 4 * 4; } } else { for (i = 0; i < 8; i++)