diff options
| -rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 12 | ||||
| -rw-r--r-- | libavcodec/i386/dsputil_mmx_rnd.h | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 464713e..5fce7f9 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -790,7 +790,7 @@ void OPNAME ## mpeg4_qpel16_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstSt "addl %4, %1 \n\t"\ "decl %2 \n\t"\ " jnz 1b \n\t"\ - : "+a"(src), "+b"(dst), "+c"(h)\ + : "+a"(src), "+c"(dst), "+m"(h)\ : "d"(srcStride), "S"(dstStride), /*"m"(ff_pw_20), "m"(ff_pw_3),*/ "m"(temp), "m"(ROUNDER)\ : "memory"\ );\ @@ -903,7 +903,7 @@ void OPNAME ## mpeg4_qpel8_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstStr "addl %4, %1 \n\t"\ "decl %2 \n\t"\ " jnz 1b \n\t"\ - : "+a"(src), "+b"(dst), "+c"(h)\ + : "+a"(src), "+c"(dst), "+m"(h)\ : "S"(srcStride), "D"(dstStride), /*"m"(ff_pw_20), "m"(ff_pw_3),*/ "m"(temp), "m"(ROUNDER)\ : "memory"\ );\ @@ -961,14 +961,14 @@ static void OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(uint8_t *dst, uint8_t *src, "punpckhbw %%mm7, %%mm3 \n\t"\ "movq %%mm0, (%1) \n\t"\ "movq %%mm1, 17*8(%1) \n\t"\ - "movq %%mm2, (%1, %4) \n\t"\ - "movq %%mm3, (%1, %5) \n\t"\ + "movq %%mm2, 2*17*8(%1) \n\t"\ + "movq %%mm3, 3*17*8(%1) \n\t"\ "addl $8, %1 \n\t"\ "addl %3, %0 \n\t"\ "decl %2 \n\t"\ " jnz 1b \n\t"\ : "+r" (src), "+r" (temp_ptr), "+r"(count)\ - : "r" (srcStride), "r"(2*8*17), "r"(3*8*17)\ + : "r" (srcStride)\ : "memory"\ );\ \ @@ -1014,7 +1014,7 @@ static void OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(uint8_t *dst, uint8_t *src, "decl %2 \n\t"\ " jnz 1b \n\t"\ \ - : "+r"(temp_ptr), "+r"(dst), "+r"(count)\ + : "+r"(temp_ptr), "+r"(dst), "+g"(count)\ : "r"(dstStride), "r"(2*dstStride), /*"m"(ff_pw_20), "m"(ff_pw_3),*/ "m"(ROUNDER), "g"(4-14*dstStride)\ :"memory"\ );\ diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h index 2a2f669..0ae1cd9 100644 --- a/libavcodec/i386/dsputil_mmx_rnd.h +++ b/libavcodec/i386/dsputil_mmx_rnd.h @@ -85,7 +85,11 @@ static void DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int "addl %5, %3 \n\t" "subl $4, %0 \n\t" "jnz 1b \n\t" - :"+a"(h), "+b"(src1), "+c"(src2), "+d"(dst) +#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used + :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) +#else + :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) +#endif :"S"(src1Stride), "D"(dstStride) :"memory"); } @@ -163,7 +167,11 @@ static void DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, in "addl $32, %2 \n\t" "subl $2, %0 \n\t" "jnz 1b \n\t" - :"+a"(h), "+b"(src1), "+c"(src2), "+d"(dst) +#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used + :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) +#else + :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) +#endif :"S"(src1Stride), "D"(dstStride) :"memory"); } |
