[FFmpeg-cvslog] r23213 - in branches/0.6: . libavcodec/x86/h264dsp_mmx.c

[siretart]

Author: siretart
Date: Fri May 21 20:19:13 2010
New Revision: 23213

Log:
Replace more "m" constraints with MANGLE to fix compilation issues
with x86_32 gcc 4.4.4 and -fPIC.


backport r23082 by reimar

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavcodec/x86/h264dsp_mmx.c

Modified: branches/0.6/libavcodec/x86/h264dsp_mmx.c
==============================================================================
--- branches/0.6/libavcodec/x86/h264dsp_mmx.c	Fri May 21 20:05:38 2010	(r23212)
+++ branches/0.6/libavcodec/x86/h264dsp_mmx.c	Fri May 21 20:19:13 2010	(r23213)
@@ -1138,7 +1138,7 @@ static av_noinline void OPNAME ## h264_q
     int h=8;\
     __asm__ volatile(\
         "pxor %%mm7, %%mm7          \n\t"\
-        "movq %5, %%mm6             \n\t"\
+        "movq "MANGLE(ff_pw_5)", %%mm6\n\t"\
         "1:                         \n\t"\
         "movq    (%0), %%mm0        \n\t"\
         "movq   1(%0), %%mm2        \n\t"\
@@ -1172,7 +1172,7 @@ static av_noinline void OPNAME ## h264_q
         "punpcklbw %%mm7, %%mm5     \n\t"\
         "paddw %%mm3, %%mm2         \n\t"\
         "paddw %%mm5, %%mm4         \n\t"\
-        "movq %6, %%mm5             \n\t"\
+        "movq "MANGLE(ff_pw_16)", %%mm5\n\t"\
         "paddw %%mm5, %%mm2         \n\t"\
         "paddw %%mm5, %%mm4         \n\t"\
         "paddw %%mm2, %%mm0         \n\t"\
@@ -1186,7 +1186,7 @@ static av_noinline void OPNAME ## h264_q
         "decl %2                    \n\t"\
         " jnz 1b                    \n\t"\
         : "+a"(src), "+c"(dst), "+g"(h)\
-        : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride), "m"(ff_pw_5), "m"(ff_pw_16)\
+        : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride)\
         : "memory"\
     );\
 }\
@@ -1640,7 +1640,7 @@ static av_noinline void OPNAME ## h264_q
     int h=8;\
     __asm__ volatile(\
         "pxor %%xmm7, %%xmm7        \n\t"\
-        "movdqa %5, %%xmm6          \n\t"\
+        "movdqa "MANGLE(ff_pw_5)", %%xmm6\n\t"\
         "1:                         \n\t"\
         "lddqu   -2(%0), %%xmm1     \n\t"\
         "movdqa  %%xmm1, %%xmm0     \n\t"\
@@ -1660,7 +1660,7 @@ static av_noinline void OPNAME ## h264_q
         "paddw   %%xmm4, %%xmm1     \n\t"\
         "psllw   $2,     %%xmm2     \n\t"\
         "psubw   %%xmm1, %%xmm2     \n\t"\
-        "paddw   %6,     %%xmm0     \n\t"\
+        "paddw   "MANGLE(ff_pw_16)", %%xmm0\n\t"\
         "pmullw  %%xmm6, %%xmm2     \n\t"\
         "paddw   %%xmm0, %%xmm2     \n\t"\
         "psraw   $5,     %%xmm2     \n\t"\
@@ -1671,8 +1671,7 @@ static av_noinline void OPNAME ## h264_q
         "decl %2                    \n\t"\
         " jnz 1b                    \n\t"\
         : "+a"(src), "+c"(dst), "+g"(h)\
-        : "D"((x86_reg)srcStride), "S"((x86_reg)dstStride),\
-          "m"(ff_pw_5), "m"(ff_pw_16)\
+        : "D"((x86_reg)srcStride), "S"((x86_reg)dstStride)\
         : "memory"\
     );\
 }\