Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
[ffmpeg.git] / libswscale / rgb2rgb_template.c
index 807da61..bd8b9e0 100644 (file)
@@ -12,8 +12,6 @@
 #include <stddef.h>
 #include <inttypes.h> /* for __WORDSIZE */
 
-#include "asmalign.h"
-
 #ifndef __WORDSIZE
 // #warning You have misconfigured system and probably will lose performance!
 #define __WORDSIZE MP_WORDSIZE
@@ -343,7 +341,7 @@ static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, long src_
                "movq %3, %%mm5                 \n\t"
                "movq %4, %%mm6                 \n\t"
                "movq %5, %%mm7                 \n\t"
-               ASMALIGN16
+               ASMALIGN(4)
                "1:                             \n\t"
                PREFETCH" 32(%1)                \n\t"
                "movd   (%1), %%mm0             \n\t"
@@ -500,7 +498,7 @@ static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, long src_
                "movq %3, %%mm5                 \n\t"
                "movq %4, %%mm6                 \n\t"
                "movq %5, %%mm7                 \n\t"
-               ASMALIGN16
+               ASMALIGN(4)
                "1:                             \n\t"
                PREFETCH" 32(%1)                \n\t"
                "movd   (%1), %%mm0             \n\t"
@@ -1355,7 +1353,7 @@ static inline void RENAME(rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long s
 /* TODO: unroll this loop */
        asm volatile (
                "xor %%"REG_a", %%"REG_a"       \n\t"
-               ASMALIGN16
+               ASMALIGN(4)
                "1:                             \n\t"
                PREFETCH" 32(%0, %%"REG_a")     \n\t"
                "movq (%0, %%"REG_a"), %%mm0    \n\t"
@@ -1405,7 +1403,7 @@ static inline void RENAME(rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long s
                "movq "MANGLE(mask24r)", %%mm5  \n\t"
                "movq "MANGLE(mask24g)", %%mm6  \n\t"
                "movq "MANGLE(mask24b)", %%mm7  \n\t"
-               ASMALIGN16
+               ASMALIGN(4)
                "1:                             \n\t"
                PREFETCH" 32(%1, %%"REG_a")     \n\t"
                "movq   (%1, %%"REG_a"), %%mm0  \n\t" // BGR BGR BG
@@ -1475,7 +1473,7 @@ static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *u
 //FIXME handle 2 lines a once (fewer prefetch, reuse some chrom, but very likely limited by mem anyway)
                asm volatile(
                        "xor %%"REG_a", %%"REG_a"       \n\t"
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 32(%1, %%"REG_a", 2)  \n\t"
                        PREFETCH" 32(%2, %%"REG_a")     \n\t"
@@ -1628,7 +1626,7 @@ static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *u
 //FIXME handle 2 lines a once (fewer prefetch, reuse some chrom, but very likely limited by mem anyway)
                asm volatile(
                        "xor %%"REG_a", %%"REG_a"       \n\t"
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 32(%1, %%"REG_a", 2)  \n\t"
                        PREFETCH" 32(%2, %%"REG_a")     \n\t"
@@ -1752,7 +1750,7 @@ static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
                        "xor %%"REG_a", %%"REG_a"       \n\t"
                        "pcmpeqw %%mm7, %%mm7           \n\t"
                        "psrlw $8, %%mm7                \n\t" // FF,00,FF,00...
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 64(%0, %%"REG_a", 4)  \n\t"
                        "movq (%0, %%"REG_a", 4), %%mm0 \n\t" // YUYV YUYV(0)
@@ -1805,7 +1803,7 @@ static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
 
                asm volatile(
                        "xor %%"REG_a", %%"REG_a"       \n\t"
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 64(%0, %%"REG_a", 4)  \n\t"
                        "movq (%0, %%"REG_a", 4), %%mm0 \n\t" // YUYV YUYV(0)
@@ -1990,7 +1988,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
                        "xorl %%eax, %%eax              \n\t"
                        "pcmpeqw %%mm7, %%mm7           \n\t"
                        "psrlw $8, %%mm7                \n\t" // FF,00,FF,00...
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 64(%0, %%eax, 4)      \n\t"
                        "movq (%0, %%eax, 4), %%mm0     \n\t" // UYVY UYVY(0)
@@ -2043,7 +2041,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
 
                asm volatile(
                        "xorl %%eax, %%eax              \n\t"
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 64(%0, %%eax, 4)      \n\t"
                        "movq (%0, %%eax, 4), %%mm0     \n\t" // YUYV YUYV(0)
@@ -2121,7 +2119,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
                                "movq "MANGLE(w1111)", %%mm5            \n\t"
                                "pxor %%mm7, %%mm7              \n\t"
                                "lea (%%"REG_a", %%"REG_a", 2), %%"REG_b"\n\t"
-                               ASMALIGN16
+                               ASMALIGN(4)
                                "1:                             \n\t"
                                PREFETCH" 64(%0, %%"REG_b")     \n\t"
                                "movd (%0, %%"REG_b"), %%mm0    \n\t"
@@ -2195,7 +2193,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
                        "pxor %%mm7, %%mm7              \n\t"
                        "lea (%%"REG_a", %%"REG_a", 2), %%"REG_b"\n\t"
                        "add %%"REG_b", %%"REG_b"       \n\t"
-                       ASMALIGN16
+                       ASMALIGN(4)
                        "1:                             \n\t"
                        PREFETCH" 64(%0, %%"REG_b")     \n\t"
                        PREFETCH" 64(%1, %%"REG_b")     \n\t"