Mercurial > mplayer.hg

diff liba52/downmix.c @ 18104:7b408d60de9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for intel mac. mp3lib is not fixed yet.
author nplourde
date Sat, 15 Apr 2006 20:46:54 +0000
parents d6219ce521e9
children 4bad7f00556e
line wrap: on
line diff
--- a/liba52/downmix.c	Sat Apr 15 16:47:25 2006 +0000
+++ b/liba52/downmix.c	Sat Apr 15 20:46:54 2006 +0000
@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include "asmalign.h"
 
 #include <string.h>
 #include <inttypes.h>
@@ -691,7 +692,7 @@
 	"movlps %2, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps (%0, %%"REG_S"), %%xmm0	\n\t" 
 	"movaps 16(%0, %%"REG_S"), %%xmm1\n\t" 
@@ -714,7 +715,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps (%0, %%"REG_S"), %%xmm0	\n\t" 
 	"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t" 
@@ -735,7 +736,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps (%0, %%"REG_S"), %%xmm0	\n\t" 
 	"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t" 
@@ -757,7 +758,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps (%0, %%"REG_S"), %%xmm0	\n\t" 
 	"movaps 1024(%0, %%"REG_S"), %%xmm1\n\t" 
@@ -780,7 +781,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t" 
 	"addps %%xmm7, %%xmm0		\n\t" //common
@@ -803,7 +804,7 @@
 		"movlps %2, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps 1024(%1, %%"REG_S"), %%xmm0\n\t" 
 		"addps %%xmm7, %%xmm0		\n\t" //common
@@ -826,7 +827,7 @@
 		"movlps %1, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps 2048(%0, %%"REG_S"), %%xmm0\n\t"  // surround
 		"movaps (%0, %%"REG_S"), %%xmm1	\n\t" 
@@ -850,7 +851,7 @@
 		"movlps %1, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"  
 		"addps 3072(%0, %%"REG_S"), %%xmm0\n\t"  
@@ -874,7 +875,7 @@
 		"movlps %1, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t"  
 		"movaps 3072(%0, %%"REG_S"), %%xmm3\n\t" // surround
@@ -900,7 +901,7 @@
 		"movlps %1, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps 2048(%0, %%"REG_S"), %%xmm0\n\t"  
 		"addps 3072(%0, %%"REG_S"), %%xmm0\n\t" // surround
@@ -925,7 +926,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t" 
 	"addps %%xmm7, %%xmm0		\n\t" // common
@@ -949,7 +950,7 @@
 	"movlps %1, %%xmm7		\n\t"
 	"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:				\n\t"
 	"movaps 1024(%0, %%"REG_S"), %%xmm0\n\t" 
 	"movaps 3072(%0, %%"REG_S"), %%xmm2\n\t" 
@@ -976,7 +977,7 @@
 		"movlps %2, %%xmm7		\n\t"
 		"shufps $0x00, %%xmm7, %%xmm7	\n\t"
 		"mov $-1024, %%"REG_S"		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movaps (%0, %%"REG_S"), %%xmm0	\n\t"  
 		"movaps 16(%0, %%"REG_S"), %%xmm1\n\t"  
@@ -998,7 +999,7 @@
 	asm volatile(
 		"mov $-1024, %%"REG_S"		\n\t"
 		"pxor %%mm0, %%mm0		\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:				\n\t"
 		"movq %%mm0, (%0, %%"REG_S")	\n\t"
 		"movq %%mm0, 8(%0, %%"REG_S")	\n\t"
@@ -1258,7 +1259,7 @@
 	"movd  %2, %%mm7	\n\t"
 	"punpckldq %2, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq  (%0, %%"REG_S"), %%mm0	\n\t" 
 	"movq  8(%0, %%"REG_S"), %%mm1	\n\t"
@@ -1289,7 +1290,7 @@
 	"movd  %1, %%mm7	\n\t"
 	"punpckldq %1, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq  (%0, %%"REG_S"), %%mm0	\n\t" 
 	"movq  8(%0, %%"REG_S"), %%mm1	\n\t"
@@ -1316,7 +1317,7 @@
 	"movd  %1, %%mm7	\n\t"
 	"punpckldq %1, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq  (%0, %%"REG_S"), %%mm0	\n\t" 
 	"movq  8(%0, %%"REG_S"), %%mm1	\n\t"
@@ -1345,7 +1346,7 @@
 	"movd  %1, %%mm7	\n\t"
 	"punpckldq %1, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq  (%0, %%"REG_S"), %%mm0	\n\t" 
 	"movq  8(%0, %%"REG_S"), %%mm1	\n\t"
@@ -1376,7 +1377,7 @@
 	"movd  %1, %%mm7	\n\t"
 	"punpckldq %1, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq   1024(%0, %%"REG_S"), %%mm0\n\t" 
 	"movq   1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1407,7 +1408,7 @@
 		"movd  %2, %%mm7	\n\t"
 		"punpckldq %2, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq  1024(%1, %%"REG_S"), %%mm0\n\t" 
 		"movq  1032(%1, %%"REG_S"), %%mm1\n\t"
@@ -1438,7 +1439,7 @@
 		"movd  %1, %%mm7	\n\t"
 		"punpckldq %1, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq  2048(%0, %%"REG_S"), %%mm0\n\t"  // surround
 		"movq  2056(%0, %%"REG_S"), %%mm1\n\t"  // surround
@@ -1471,7 +1472,7 @@
 		"movd  %1, %%mm7	\n\t"
 		"punpckldq %1, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq  1024(%0, %%"REG_S"), %%mm0\n\t"  
 		"movq  1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1504,7 +1505,7 @@
 		"movd  %1, %%mm7	\n\t"
 		"punpckldq %1, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq   1024(%0, %%"REG_S"), %%mm0\n\t"  
 		"movq   1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1541,7 +1542,7 @@
 		"movd  %1, %%mm7	\n\t"
 		"punpckldq %1, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq  2048(%0, %%"REG_S"), %%mm0\n\t"  
 		"movq  2056(%0, %%"REG_S"), %%mm1\n\t"
@@ -1576,7 +1577,7 @@
 	"movd  %1, %%mm7	\n\t"
 	"punpckldq %1, %%mm7	\n\t"
 	"mov $-1024, %%"REG_S"	\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movq   1024(%0, %%"REG_S"), %%mm0\n\t" 
 	"movq   1032(%0, %%"REG_S"), %%mm1\n\t"
@@ -1608,7 +1609,7 @@
 {
 	asm volatile(
 	"mov $-1024, %%"REG_S"		\n\t"
-	".balign 16\n\t"
+	ASMALIGN16
 	"1:			\n\t"
 	"movd  %1, %%mm7		\n\t"
 	"punpckldq %1, %%mm7		\n\t"
@@ -1649,7 +1650,7 @@
 		"movd  %2, %%mm7	\n\t"
 		"punpckldq %2, %%mm7	\n\t"
 		"mov $-1024, %%"REG_S"	\n\t"
-		".balign 16\n\t"
+		ASMALIGN16
 		"1:			\n\t"
 		"movq  (%0, %%"REG_S"), %%mm0	\n\t"  
 		"movq  8(%0, %%"REG_S"), %%mm1	\n\t"