add support for intel mac. mp3lib is not fixed yet.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18105 b3059339-0415-0410-9bf9-f77b7e298cf2

10 files changed, 28 insertions, 18 deletions

diff --git a/libmpcodecs/pullup.c b/libmpcodecs/pullup.c
index df4069cc67..12bc5e739c 100644
--- a/libmpcodecs/pullup.c
+++ b/libmpcodecs/pullup.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include "pullup.h"
 #include "config.h"
+#include "asmalign.h"
 
 
 
@@ -18,7 +19,7 @@ static int diff_y_mmx(unsigned char *a, unsigned char *b, int s)
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%esi), %%mm0 \n\t"
@@ -67,7 +68,7 @@ static int licomb_y_mmx(unsigned char *a, unsigned char *b, int s)
 		"pxor %%mm7, %%mm7 \n\t"
 		"subl %%eax, %%edi \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"2: \n\t"
 
 		"movq (%%esi), %%mm0 \n\t"
@@ -156,7 +157,7 @@ static int var_y_mmx(unsigned char *a, unsigned char *b, int s)
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%esi), %%mm0 \n\t"
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c
index 0fc7bb9a5a..03c05a4af5 100644
--- a/libmpcodecs/vf_decimate.c
+++ b/libmpcodecs/vf_decimate.c
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -28,7 +29,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"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index 849f694c09..2efd7a33be 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -8,6 +8,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 #include "bswap.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -41,7 +42,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"
 
-	".balign 16 \n\t"
+	ASMALIGN16
 	"1: \n\t"
 
 	"movq (%%"REG_S"), %%mm0 \n\t"
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 6f1bf675c1..504e91a605 100644
--- a/libmpcodecs/vf_eq.c
+++ b/libmpcodecs/vf_eq.c
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -51,7 +52,7 @@ static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, in
 			"movq (%6), %%mm4 \n\t"
 			"pxor %%mm0, %%mm0 \n\t"
 			"movl %4, %%eax\n\t"
-                       ".balign 16 \n\t"
+                       ASMALIGN16
 			"1: \n\t"
 			"movq (%0), %%mm1 \n\t"
 			"movq (%0), %%mm2 \n\t"
diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c
index 9bb5ed7467..faac982f75 100644
--- a/libmpcodecs/vf_eq2.c
+++ b/libmpcodecs/vf_eq2.c
@@ -18,6 +18,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -135,7 +136,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"
-      ".balign 16 \n\t"
+      ASMALIGN16
       "1: \n\t"
       "movq (%0), %%mm1 \n\t"
       "movq (%0), %%mm2 \n\t"
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index 304db8faed..006fcb0d47 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -37,6 +37,7 @@
 #include <math.h>
 
 #include "config.h"
+#include "asmalign.h"
 
 #include "mp_msg.h"
 #include "cpudetect.h"
@@ -888,7 +889,7 @@ static void column_fidct_c(int16_t* thr_adr, DCTELEM *data, DCTELEM *output, int
 static void column_fidct_mmx(int16_t* thr_adr,  DCTELEM *data,  DCTELEM *output,  int cnt)
 {
     asm volatile(
-	".align 16                   \n\t"
+	ASMALIGN16
 	"1:                   \n\t"
 	"movq "DCTSIZE_S"*0*2(%%"REG_S"), %%mm1 \n\t"
 	//
diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c
index 99b569a8b1..7f8b87a21b 100644
--- a/libmpcodecs/vf_halfpack.c
+++ b/libmpcodecs/vf_halfpack.c
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -40,7 +41,7 @@ static void halfpack_MMX(unsigned char *dst, unsigned char *src[3],
 	for (h/=2; h; h--) {
 		asm (
 			"pxor %%mm0, %%mm0 \n\t"
-			".balign 16 \n\t"
+			ASMALIGN16
 			"1: \n\t"
 			"movq (%0), %%mm1 \n\t"
 			"movq (%0), %%mm2 \n\t"
diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c
index d369e5e295..7eb65c5818 100644
--- a/libmpcodecs/vf_ilpack.c
+++ b/libmpcodecs/vf_ilpack.c
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -66,7 +67,7 @@ static void pack_nn_MMX(unsigned char *dst, unsigned char *y,
 {
 	int j;
 	asm volatile (""
-		".balign 16 \n\t"
+		ASMALIGN16                
 		"1: \n\t"
 		"movq (%0), %%mm1 \n\t"
 		"movq (%0), %%mm2 \n\t"
@@ -105,7 +106,7 @@ static void pack_li_0_MMX(unsigned char *dst, unsigned char *y,
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16 
 		".Lli0: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
@@ -213,7 +214,7 @@ static void pack_li_1_MMX(unsigned char *dst, unsigned char *y,
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		".Lli1: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c
index 62bc749447..50cabe0ee1 100644
--- a/libmpcodecs/vf_ivtc.c
+++ b/libmpcodecs/vf_ivtc.c
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -67,7 +68,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char
 		"pxor %%mm5, %%mm5 \n\t" // 4 odd difference sums
 		"pxor %%mm7, %%mm7 \n\t" // all zeros
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		"1: \n\t"
 		
 		// Even difference
@@ -127,7 +128,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char
 		"pxor %%mm5, %%mm5 \n\t" // Temporal noise
 		"pxor %%mm6, %%mm6 \n\t" // Current spacial noise
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		"2: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"
@@ -181,7 +182,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char
 		"pxor %%mm5, %%mm5 \n\t"
 		"pxor %%mm6, %%mm6 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"3: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c
index ea762c0b0b..c3427b3fd9 100644
--- a/libmpcodecs/vf_noise.c
+++ b/libmpcodecs/vf_noise.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -153,7 +154,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"
-		".balign 16			\n\t"
+		ASMALIGN16   
 		"1:				\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
@@ -182,7 +183,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"
-		".balign 16			\n\t"
+		ASMALIGN16  
 		"1:				\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
@@ -220,7 +221,7 @@ static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t
 
 	asm volatile(
 		"mov %5, %%"REG_a"		\n\t"
-		".balign 16			\n\t"
+		ASMALIGN16   
 		"1:				\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"