[FFmpeg-cvslog] r25331 - in trunk: libavcodec/x86/snowdsp_mmx.c libavutil/x86_cpu.h

[mstorsjo]

Author: mstorsjo
Date: Mon Oct  4 15:08:13 2010
New Revision: 25331

Log:
snowdsp: Explicitly state the operand sizes

Fixes compilation with clang's builtin assembler

Patch by ?smail D?nmez, ismail at namtrac dot org

Modified:
   trunk/libavcodec/x86/snowdsp_mmx.c
   trunk/libavutil/x86_cpu.h

Modified: trunk/libavcodec/x86/snowdsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/snowdsp_mmx.c	Mon Oct  4 09:06:58 2010	(r25330)
+++ trunk/libavcodec/x86/snowdsp_mmx.c	Mon Oct  4 15:08:13 2010	(r25331)
@@ -812,7 +812,7 @@ snow_inner_add_yblock_sse2_end_16
              "add %%"REG_c", "PTR_SIZE"*2(%%"REG_a");\n\t"\
              "add %%"REG_c", "PTR_SIZE"*1(%%"REG_a");\n\t"\
              "add %%"REG_c", (%%"REG_a")     \n\t"\
-             "add $"PTR_SIZE"*1, %1          \n\t"\
+             "add"OPSIZE " $"PTR_SIZE"*1, %1 \n\t"\
              "add %%"REG_c", %0              \n\t"\
              "dec %2                         \n\t"\
              "jnz 1b                         \n\t"\

Modified: trunk/libavutil/x86_cpu.h
==============================================================================
--- trunk/libavutil/x86_cpu.h	Mon Oct  4 09:06:58 2010	(r25330)
+++ trunk/libavutil/x86_cpu.h	Mon Oct  4 15:08:13 2010	(r25331)
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #if ARCH_X86_64
+#    define OPSIZE "q"
 #    define REG_a "rax"
 #    define REG_b "rbx"
 #    define REG_c "rcx"
@@ -45,6 +46,7 @@ typedef int64_t x86_reg;
 
 #elif ARCH_X86_32
 
+#    define OPSIZE "l"
 #    define REG_a "eax"
 #    define REG_b "ebx"
 #    define REG_c "ecx"