add mangling

Originally committed as revision 4924 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

3 files changed, 26 insertions, 25 deletions

diff --git a/postproc/rgb2rgb.c b/postproc/rgb2rgb.c
index 7668a395c8..abe1223065 100644
--- a/postproc/rgb2rgb.c
+++ b/postproc/rgb2rgb.c
@@ -11,6 +11,7 @@
 #include "../config.h"
 #include "rgb2rgb.h"
 #include "../cpudetect.h"
+#include "../mangle.h"
 
 #ifdef ARCH_X86
 #define CAN_COMPILE_X86_ASM
diff --git a/postproc/rgb2rgb_template.c b/postproc/rgb2rgb_template.c
index 2db74cdb5b..3a1a3320f7 100644
--- a/postproc/rgb2rgb_template.c
+++ b/postproc/rgb2rgb_template.c
@@ -545,9 +545,9 @@ static inline void RENAME(rgb32tobgr32)(const uint8_t *src, uint8_t *dst, unsign
 		"movq %%mm0, %%mm2		\n\t"
 		"pslld $16, %%mm0		\n\t"
 		"psrld $16, %%mm1		\n\t"
-		"pand mask32r, %%mm0		\n\t"
-		"pand mask32g, %%mm2		\n\t"
-		"pand mask32b, %%mm1		\n\t"
+		"pand "MANGLE(mask32r)", %%mm0		\n\t"
+		"pand "MANGLE(mask32g)", %%mm2		\n\t"
+		"pand "MANGLE(mask32b)", %%mm1		\n\t"
 		"por %%mm0, %%mm2		\n\t"
 		"por %%mm1, %%mm2		\n\t"
 		MOVNTQ" %%mm2, (%1, %%eax)	\n\t"
@@ -915,8 +915,8 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 		{
 			asm volatile(
 				"movl %2, %%eax			\n\t"
-				"movq bgr2YCoeff, %%mm6		\n\t"
-				"movq w1111, %%mm5		\n\t"
+				"movq "MANGLE(bgr2YCoeff)", %%mm6		\n\t"
+				"movq "MANGLE(w1111)", %%mm5		\n\t"
 				"pxor %%mm7, %%mm7		\n\t"
 				"leal (%%eax, %%eax, 2), %%ebx	\n\t"
 				".balign 16			\n\t"
@@ -974,7 +974,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 				"psraw $7, %%mm4		\n\t"
 
 				"packuswb %%mm4, %%mm0		\n\t"
-				"paddusb bgr2YOffset, %%mm0	\n\t"
+				"paddusb "MANGLE(bgr2YOffset)", %%mm0	\n\t"
 
 				MOVNTQ" %%mm0, (%1, %%eax)	\n\t"
 				"addl $8, %%eax			\n\t"
@@ -988,8 +988,8 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 		src -= srcStride*2;
 		asm volatile(
 			"movl %4, %%eax			\n\t"
-			"movq w1111, %%mm5		\n\t"
-			"movq bgr2UCoeff, %%mm6		\n\t"
+			"movq "MANGLE(w1111)", %%mm5		\n\t"
+			"movq "MANGLE(bgr2UCoeff)", %%mm6		\n\t"
 			"pxor %%mm7, %%mm7		\n\t"
 			"leal (%%eax, %%eax, 2), %%ebx	\n\t"
 			"addl %%ebx, %%ebx		\n\t"
@@ -1038,8 +1038,8 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 			"psrlw $2, %%mm0		\n\t"
 			"psrlw $2, %%mm2		\n\t"
 #endif
-			"movq bgr2VCoeff, %%mm1		\n\t"
-			"movq bgr2VCoeff, %%mm3		\n\t"
+			"movq "MANGLE(bgr2VCoeff)", %%mm1		\n\t"
+			"movq "MANGLE(bgr2VCoeff)", %%mm3		\n\t"
 
 			"pmaddwd %%mm0, %%mm1		\n\t"
 			"pmaddwd %%mm2, %%mm3		\n\t"
@@ -1096,12 +1096,12 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 			"paddw %%mm1, %%mm5		\n\t"
 			"paddw %%mm3, %%mm2		\n\t"
 			"paddw %%mm5, %%mm2		\n\t"
-			"movq w1111, %%mm5		\n\t"
+			"movq "MANGLE(w1111)", %%mm5		\n\t"
 			"psrlw $2, %%mm4		\n\t"
 			"psrlw $2, %%mm2		\n\t"
 #endif
-			"movq bgr2VCoeff, %%mm1		\n\t"
-			"movq bgr2VCoeff, %%mm3		\n\t"
+			"movq "MANGLE(bgr2VCoeff)", %%mm1		\n\t"
+			"movq "MANGLE(bgr2VCoeff)", %%mm3		\n\t"
 
 			"pmaddwd %%mm4, %%mm1		\n\t"
 			"pmaddwd %%mm2, %%mm3		\n\t"
@@ -1125,7 +1125,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
 			"punpckldq %%mm4, %%mm0		\n\t"
 			"punpckhdq %%mm4, %%mm1		\n\t"
 			"packsswb %%mm1, %%mm0		\n\t"
-			"paddb bgr2UVOffset, %%mm0	\n\t"
+			"paddb "MANGLE(bgr2UVOffset)", %%mm0	\n\t"
 
 			"movd %%mm0, (%2, %%eax)	\n\t"
 			"punpckhdq %%mm0, %%mm0		\n\t"
diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c
index aca4d1f0fa..291ba0ccfb 100644
--- a/postproc/swscale_template.c
+++ b/postproc/swscale_template.c
@@ -1647,8 +1647,8 @@ static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, int width)
 #ifdef HAVE_MMX
 	asm volatile(
 		"movl %2, %%eax			\n\t"
-		"movq bgr2YCoeff, %%mm6		\n\t"
-		"movq w1111, %%mm5		\n\t"
+		"movq "MANGLE(bgr2YCoeff)", %%mm6		\n\t"
+		"movq "MANGLE(w1111)", %%mm5		\n\t"
 		"pxor %%mm7, %%mm7		\n\t"
 		"leal (%%eax, %%eax, 2), %%ebx	\n\t"
 		".balign 16			\n\t"
@@ -1706,7 +1706,7 @@ static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, int width)
 		"psraw $7, %%mm4		\n\t"
 
 		"packuswb %%mm4, %%mm0		\n\t"
-		"paddusb bgr2YOffset, %%mm0	\n\t"
+		"paddusb "MANGLE(bgr2YOffset)", %%mm0	\n\t"
 
 		"movq %%mm0, (%1, %%eax)	\n\t"
 		"addl $8, %%eax			\n\t"
@@ -1732,8 +1732,8 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
 #ifdef HAVE_MMX
 	asm volatile(
 		"movl %4, %%eax			\n\t"
-		"movq w1111, %%mm5		\n\t"
-		"movq bgr2UCoeff, %%mm6		\n\t"
+		"movq "MANGLE(w1111)", %%mm5		\n\t"
+		"movq "MANGLE(bgr2UCoeff)", %%mm6		\n\t"
 		"pxor %%mm7, %%mm7		\n\t"
 		"leal (%%eax, %%eax, 2), %%ebx	\n\t"
 		"addl %%ebx, %%ebx		\n\t"
@@ -1782,8 +1782,8 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
 		"psrlw $2, %%mm0		\n\t"
 		"psrlw $2, %%mm2		\n\t"
 #endif
-		"movq bgr2VCoeff, %%mm1		\n\t"
-		"movq bgr2VCoeff, %%mm3		\n\t"
+		"movq "MANGLE(bgr2VCoeff)", %%mm1		\n\t"
+		"movq "MANGLE(bgr2VCoeff)", %%mm3		\n\t"
 		
 		"pmaddwd %%mm0, %%mm1		\n\t"
 		"pmaddwd %%mm2, %%mm3		\n\t"
@@ -1840,12 +1840,12 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
 		"paddw %%mm1, %%mm5		\n\t"
 		"paddw %%mm3, %%mm2		\n\t"
 		"paddw %%mm5, %%mm2		\n\t"
-		"movq w1111, %%mm5		\n\t"
+		"movq "MANGLE(w1111)", %%mm5		\n\t"
 		"psrlw $2, %%mm4		\n\t"
 		"psrlw $2, %%mm2		\n\t"
 #endif
-		"movq bgr2VCoeff, %%mm1		\n\t"
-		"movq bgr2VCoeff, %%mm3		\n\t"
+		"movq "MANGLE(bgr2VCoeff)", %%mm1		\n\t"
+		"movq "MANGLE(bgr2VCoeff)", %%mm3		\n\t"
 		
 		"pmaddwd %%mm4, %%mm1		\n\t"
 		"pmaddwd %%mm2, %%mm3		\n\t"
@@ -1869,7 +1869,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
 		"punpckldq %%mm4, %%mm0		\n\t"
 		"punpckhdq %%mm4, %%mm1		\n\t"
 		"packsswb %%mm1, %%mm0		\n\t"
-		"paddb bgr2UVOffset, %%mm0	\n\t"
+		"paddb "MANGLE(bgr2UVOffset)", %%mm0	\n\t"
 
 		"movd %%mm0, (%2, %%eax)	\n\t"
 		"punpckhdq %%mm0, %%mm0		\n\t"