summaryrefslogtreecommitdiffstats
path: root/liba52
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-13 00:21:14 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-13 00:21:14 +0000
commitb89020afc81892ed27f2ad3da5f0dd1169621bdd (patch)
tree4cb57d6b412576aeb210a5fc23e845d6e0233cc1 /liba52
parent992379a376a9df9aa5b2e28a13b3a1c97568dd8b (diff)
downloadmpv-b89020afc81892ed27f2ad3da5f0dd1169621bdd.tar.bz2
mpv-b89020afc81892ed27f2ad3da5f0dd1169621bdd.tar.xz
Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19378 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
-rw-r--r--liba52/downmix.c55
-rw-r--r--liba52/imdct.c21
2 files changed, 37 insertions, 39 deletions
diff --git a/liba52/downmix.c b/liba52/downmix.c
index fc28071618..91c21a2ef7 100644
--- a/liba52/downmix.c
+++ b/liba52/downmix.c
@@ -28,7 +28,6 @@
*/
#include "config.h"
-#include "asmalign.h"
#include <string.h>
#include <inttypes.h>
@@ -694,7 +693,7 @@ static void mix2to1_SSE (sample_t * dest, sample_t * src, sample_t bias)
"movlps %2, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 16(%0, %%"REG_S"), %%xmm1\n\t"
@@ -717,7 +716,7 @@ static void mix3to1_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t"
@@ -738,7 +737,7 @@ static void mix4to1_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t"
@@ -760,7 +759,7 @@ static void mix5to1_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t"
@@ -783,7 +782,7 @@ static void mix3to2_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"
"addps %%xmm7, %%xmm0 \n\t" //common
@@ -806,7 +805,7 @@ static void mix21to2_SSE (sample_t * left, sample_t * right, sample_t bias)
"movlps %2, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%1, %%"REG_S"), %%xmm0\n\t"
"addps %%xmm7, %%xmm0 \n\t" //common
@@ -829,7 +828,7 @@ static void mix21toS_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm0\n\t" // surround
"movaps (%0, %%"REG_S"), %%xmm1 \n\t"
@@ -853,7 +852,7 @@ static void mix31to2_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"
"addps 3072(%0, %%"REG_S"), %%xmm0\n\t"
@@ -877,7 +876,7 @@ static void mix31toS_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"
"movaps 3072(%0, %%"REG_S"), %%xmm3\n\t" // surround
@@ -903,7 +902,7 @@ static void mix22toS_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm0\n\t"
"addps 3072(%0, %%"REG_S"), %%xmm0\n\t" // surround
@@ -928,7 +927,7 @@ static void mix32to2_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"
"addps %%xmm7, %%xmm0 \n\t" // common
@@ -952,7 +951,7 @@ static void mix32toS_SSE (sample_t * samples, sample_t bias)
"movlps %1, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"
"movaps 3072(%0, %%"REG_S"), %%xmm2\n\t"
@@ -979,7 +978,7 @@ static void move2to1_SSE (sample_t * src, sample_t * dest, sample_t bias)
"movlps %2, %%xmm7 \n\t"
"shufps $0x00, %%xmm7, %%xmm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 16(%0, %%"REG_S"), %%xmm1\n\t"
@@ -1001,7 +1000,7 @@ static void zero_MMX(sample_t * samples)
asm volatile(
"mov $-1024, %%"REG_S" \n\t"
"pxor %%mm0, %%mm0 \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq %%mm0, (%0, %%"REG_S") \n\t"
"movq %%mm0, 8(%0, %%"REG_S") \n\t"
@@ -1261,7 +1260,7 @@ static void mix2to1_3dnow (sample_t * dest, sample_t * src, sample_t bias)
"movd %2, %%mm7 \n\t"
"punpckldq %2, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
@@ -1292,7 +1291,7 @@ static void mix3to1_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
@@ -1319,7 +1318,7 @@ static void mix4to1_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
@@ -1348,7 +1347,7 @@ static void mix5to1_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
@@ -1379,7 +1378,7 @@ static void mix3to2_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 1024(%0, %%"REG_S"), %%mm0\n\t"
"movq 1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1410,7 +1409,7 @@ static void mix21to2_3dnow (sample_t * left, sample_t * right, sample_t bias)
"movd %2, %%mm7 \n\t"
"punpckldq %2, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 1024(%1, %%"REG_S"), %%mm0\n\t"
"movq 1032(%1, %%"REG_S"), %%mm1\n\t"
@@ -1441,7 +1440,7 @@ static void mix21toS_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 2048(%0, %%"REG_S"), %%mm0\n\t" // surround
"movq 2056(%0, %%"REG_S"), %%mm1\n\t" // surround
@@ -1474,7 +1473,7 @@ static void mix31to2_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 1024(%0, %%"REG_S"), %%mm0\n\t"
"movq 1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1507,7 +1506,7 @@ static void mix31toS_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 1024(%0, %%"REG_S"), %%mm0\n\t"
"movq 1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1544,7 +1543,7 @@ static void mix22toS_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 2048(%0, %%"REG_S"), %%mm0\n\t"
"movq 2056(%0, %%"REG_S"), %%mm1\n\t"
@@ -1579,7 +1578,7 @@ static void mix32to2_3dnow (sample_t * samples, sample_t bias)
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq 1024(%0, %%"REG_S"), %%mm0\n\t"
"movq 1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1611,7 +1610,7 @@ static void mix32toS_3dnow (sample_t * samples, sample_t bias)
{
asm volatile(
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movd %1, %%mm7 \n\t"
"punpckldq %1, %%mm7 \n\t"
@@ -1652,7 +1651,7 @@ static void move2to1_3dnow (sample_t * src, sample_t * dest, sample_t bias)
"movd %2, %%mm7 \n\t"
"punpckldq %2, %%mm7 \n\t"
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
diff --git a/liba52/imdct.c b/liba52/imdct.c
index 48dc536c96..aa4a82547d 100644
--- a/liba52/imdct.c
+++ b/liba52/imdct.c
@@ -34,7 +34,6 @@
*/
#include "config.h"
-#include "asmalign.h"
#include <math.h>
#include <stdio.h>
@@ -769,7 +768,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
"lea "MANGLE(bit_reverse_512)", %%"REG_a"\n\t"
"mov $1008, %%"REG_D" \n\t"
"push %%"REG_BP" \n\t" //use ebp without telling gcc
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%0, %%"REG_S"), %%xmm0 \n\t" // XXXI
"movhps 8(%0, %%"REG_D"), %%xmm0 \n\t" // RXXI
@@ -828,7 +827,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
"xorps %%xmm1, %%xmm1 \n\t"
"xorps %%xmm2, %%xmm2 \n\t"
"mov %0, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%%"REG_S"), %%xmm0\n\t" //buf[p]
"movlps 8(%%"REG_S"), %%xmm1\n\t" //buf[q]
@@ -849,7 +848,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
asm volatile(
"movaps "MANGLE(ps111_1)", %%xmm7\n\t" // 1,1,1,-1
"mov %0, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 16(%%"REG_S"), %%xmm2 \n\t" //r2,i2,r3,i3
"shufps $0xB4, %%xmm2, %%xmm2 \n\t" //r2,i2,i3,r3
@@ -880,7 +879,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
"xorps %%xmm5, %%xmm5 \n\t"
"xorps %%xmm2, %%xmm2 \n\t"
"mov %0, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps 32(%%"REG_S"), %%xmm2 \n\t" //r4,i4,r5,i5
"movaps 48(%%"REG_S"), %%xmm3 \n\t" //r6,i6,r7,i7
@@ -921,7 +920,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
buf_offset = buf+128;
asm volatile(
"mov %0, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"xor %%"REG_D", %%"REG_D" \n\t" // k
"lea (%%"REG_S", %3), %%"REG_d" \n\t"
@@ -953,7 +952,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
/* Post IFFT complex multiply plus IFFT complex conjugate*/
asm volatile(
"mov $-1024, %%"REG_S" \n\t"
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movaps (%0, %%"REG_S"), %%xmm0 \n\t"
"movaps (%0, %%"REG_S"), %%xmm1 \n\t"
@@ -979,7 +978,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
"xor %%"REG_S", %%"REG_S" \n\t" // 0
"movss %3, %%xmm2 \n\t" // bias
"shufps $0x00, %%xmm2, %%xmm2 \n\t" // bias, bias, ...
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%0, %%"REG_S"), %%xmm0 \n\t" // ? ? A ?
"movlps 8(%0, %%"REG_S"), %%xmm1 \n\t" // ? ? C ?
@@ -1006,7 +1005,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
"xor %%"REG_S", %%"REG_S" \n\t" // 0
"movss %3, %%xmm2 \n\t" // bias
"shufps $0x00, %%xmm2, %%xmm2 \n\t" // bias, bias, ...
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%0, %%"REG_S"), %%xmm0 \n\t" // ? ? ? A
"movlps 8(%0, %%"REG_S"), %%xmm1 \n\t" // ? ? ? C
@@ -1033,7 +1032,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
asm volatile(
"xor %%"REG_D", %%"REG_D" \n\t" // 0
"xor %%"REG_S", %%"REG_S" \n\t" // 0
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%0, %%"REG_S"), %%xmm0 \n\t" // ? ? ? A
"movlps 8(%0, %%"REG_S"), %%xmm1 \n\t" // ? ? ? C
@@ -1055,7 +1054,7 @@ imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
asm volatile(
"mov $1024, %%"REG_D" \n\t" // 1024
"xor %%"REG_S", %%"REG_S" \n\t" // 0
- ASMALIGN16
+ ASMALIGN(4)
"1: \n\t"
"movlps (%0, %%"REG_S"), %%xmm0 \n\t" // ? ? A ?
"movlps 8(%0, %%"REG_S"), %%xmm1 \n\t" // ? ? C ?
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 05:00:07 +0000