[Mplayer-cvslog] CVS: main/postproc rgb2rgb.c,1.42,1.43 rgb2rgb_template.c,1.43,1.44 swscale_template.c,1.74,1.75
Atmosfear
atmos4 at mplayer.dev.hu
Sun Mar 3 14:33:50 CET 2002
Update of /cvsroot/mplayer/main/postproc
In directory mplayer:/var/tmp.root/cvs-serv11792/postproc
Modified Files:
rgb2rgb.c rgb2rgb_template.c swscale_template.c
Log Message:
add mangling
Index: rgb2rgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rgb2rgb.c 10 Feb 2002 00:30:24 -0000 1.42
+++ rgb2rgb.c 3 Mar 2002 13:33:40 -0000 1.43
@@ -11,6 +11,7 @@
#include "../config.h"
#include "rgb2rgb.h"
#include "../cpudetect.h"
+#include "../mangle.h"
#ifdef ARCH_X86
#define CAN_COMPILE_X86_ASM
Index: rgb2rgb_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb_template.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rgb2rgb_template.c 10 Feb 2002 00:30:24 -0000 1.43
+++ rgb2rgb_template.c 3 Mar 2002 13:33:40 -0000 1.44
@@ -545,9 +545,9 @@
"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 @@
{
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 @@
"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 @@
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 @@
"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 @@
"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 @@
"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"
Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- swscale_template.c 21 Feb 2002 19:41:50 -0000 1.74
+++ swscale_template.c 3 Mar 2002 13:33:40 -0000 1.75
@@ -1647,8 +1647,8 @@
#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 @@
"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 @@
#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 @@
"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 @@
"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 @@
"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"
More information about the MPlayer-cvslog
mailing list