summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-13 14:10:43 +0100
committerwm4 <wm4@nowhere>2013-01-13 14:10:43 +0100
commitfe6c93eab8d9f747248e297b646343414ce95442 (patch)
tree41f0bbd8ec4fb97b03361b511b39a7aa98ca51ec /video
parentec57c94ba2333d08cad49be31ade353af46b5709 (diff)
downloadmpv-fe6c93eab8d9f747248e297b646343414ce95442.tar.bz2
mpv-fe6c93eab8d9f747248e297b646343414ce95442.tar.xz
configure: remove check for .align semantics
The check determined whether the argument for .align is in bytes, or log2(bytes). Apparently it's always in bytes for ELF i386 systems, and this check is used for x86 inline assembler only. Even if this assumption should be wrong, it likely won't cause much damage: the existing code uses it only in the form ".align 4", which means in the worst case it will try to align to 16 bytes, which doesn't cause any problems (unless the object file format does not support such a high alignment). Update the filters that used this. Quoting the GNU as manual: For other systems, including ppc, i386 using a.out format, arm and strongarm, it is the number of low-order zero bits the location counter must have after advancement. For example `.align 3' advances the location counter until it a multiple of 8. If the location counter is already a multiple of 8, no change is needed.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_divtc.c2
-rw-r--r--video/filter/vf_eq.c2
-rw-r--r--video/filter/vf_ilpack.c6
-rw-r--r--video/filter/vf_noise.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index a99bd8f96e..02386d0d3b 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -61,7 +61,7 @@ static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns)
"pxor %%mm4, %%mm4 \n\t"
"pxor %%mm7, %%mm7 \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
"1: \n\t"
"movq (%%"REG_S"), %%mm0 \n\t"
diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c
index 946fa73550..57945dc379 100644
--- a/video/filter/vf_eq.c
+++ b/video/filter/vf_eq.c
@@ -149,7 +149,7 @@ void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src,
"movq (%6), %%mm4 \n\t"
"pxor %%mm0, %%mm0 \n\t"
"movl %4, %%eax\n\t"
- ASMALIGN(4)
+ ".align 4\n\t"
"1: \n\t"
"movq (%0), %%mm1 \n\t"
"movq (%0), %%mm2 \n\t"
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index 05eff04f26..6519a0c512 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -83,7 +83,7 @@ static void pack_nn_MMX(unsigned char *dst, unsigned char *y,
int av_unused us, int av_unused vs)
{
__asm__ volatile (""
- ASMALIGN(4)
+ ".align 4 \n\t"
"1: \n\t"
"movq (%0), %%mm1 \n\t"
"movq (%0), %%mm2 \n\t"
@@ -123,7 +123,7 @@ static void pack_li_0_MMX(unsigned char *dst, unsigned char *y,
#endif
"pxor %%mm0, %%mm0 \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
".Lli0: \n\t"
"movq (%%"REG_S"), %%mm1 \n\t"
"movq (%%"REG_S"), %%mm2 \n\t"
@@ -231,7 +231,7 @@ static void pack_li_1_MMX(unsigned char *dst, unsigned char *y,
#endif
"pxor %%mm0, %%mm0 \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
".Lli1: \n\t"
"movq (%%"REG_S"), %%mm1 \n\t"
"movq (%%"REG_S"), %%mm2 \n\t"
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index df359833d4..19a41111ed 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -152,7 +152,7 @@ static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int
"pcmpeqb %%mm7, %%mm7 \n\t"
"psllw $15, %%mm7 \n\t"
"packsswb %%mm7, %%mm7 \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
"1: \n\t"
"movq (%0, %%"REG_a"), %%mm0 \n\t"
"movq (%1, %%"REG_a"), %%mm1 \n\t"
@@ -181,7 +181,7 @@ static inline void lineNoise_MMX2(uint8_t *dst, uint8_t *src, int8_t *noise, int
"pcmpeqb %%mm7, %%mm7 \n\t"
"psllw $15, %%mm7 \n\t"
"packsswb %%mm7, %%mm7 \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
"1: \n\t"
"movq (%0, %%"REG_a"), %%mm0 \n\t"
"movq (%1, %%"REG_a"), %%mm1 \n\t"
@@ -219,7 +219,7 @@ static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t
__asm__ volatile(
"mov %5, %%"REG_a" \n\t"
- ASMALIGN(4)
+ ".align 4 \n\t"
"1: \n\t"
"movq (%1, %%"REG_a"), %%mm1 \n\t"
"movq (%0, %%"REG_a"), %%mm0 \n\t"