mplayer.hg: libswscale/rgb2rgb_template.c comparison

comparison libswscale/rgb2rgb_template.c @ 28957:e538af2c69c1

Do not assume long is same width as x86 register.

author	ramiro
date	Wed, 18 Mar 2009 17:07:30 +0000
parents	8a0785c19f48
children	992cca4d7dd3

comparison

equal deleted inserted replaced

-:6d0da4fd4544
+:e538af2c69c1
 }
 }
 static inline void RENAME(rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long src_size)
 {
-long idx = 15 - src_size;
+x86_reg idx = 15 - src_size;
 const uint8_t *s = src-idx;
 uint8_t *d = dst-idx;
 #if HAVE_MMX
 __asm__ volatile(
 "test          %0, %0           \n\t"
 static inline void RENAME(rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size)
 {
 unsigned i;
 #if HAVE_MMX
-long mmx_size= 23 - src_size;
+x86_reg mmx_size= 23 - src_size;
 __asm__ volatile (
 "test             %%"REG_a", %%"REG_a"          \n\t"
 "jns                     2f                     \n\t"
 "movq     "MANGLE(mask24r)", %%mm5              \n\t"
 "movq     "MANGLE(mask24g)", %%mm6              \n\t"
 static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
 long width, long height,
 long lumStride, long chromStride, long dstStride, long vertLumPerChroma)
 {
 long y;
-const long chromWidth= width>>1;
+const x86_reg chromWidth= width>>1;
 for (y=0; y<height; y++)
 {
 #if HAVE_MMX
 //FIXME handle 2 lines at once (fewer prefetches, reuse some chroma, but very likely memory-limited anyway)
 __asm__ volatile(
 static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
 long width, long height,
 long lumStride, long chromStride, long dstStride, long vertLumPerChroma)
 {
 long y;
-const long chromWidth= width>>1;
+const x86_reg chromWidth= width>>1;
 for (y=0; y<height; y++)
 {
 #if HAVE_MMX
 //FIXME handle 2 lines at once (fewer prefetches, reuse some chroma, but very likely memory-limited anyway)
 __asm__ volatile(
 static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 long width, long height,
 long lumStride, long chromStride, long srcStride)
 {
 long y;
-const long chromWidth= width>>1;
+const x86_reg chromWidth= width>>1;
 for (y=0; y<height; y+=2)
 {
 #if HAVE_MMX
 __asm__ volatile(
 "xor                 %%"REG_a", %%"REG_a"   \n\t"
 dst+= dstStride;
 for (y=1; y<srcHeight; y++){
 #if HAVE_MMX2 || HAVE_AMD3DNOW
-const long mmxSize= srcWidth&~15;
+const x86_reg mmxSize= srcWidth&~15;
 __asm__ volatile(
 "mov           %4, %%"REG_a"            \n\t"
 "1:                                     \n\t"
 "movq         (%0, %%"REG_a"), %%mm0    \n\t"
 "movq         (%1, %%"REG_a"), %%mm1    \n\t"
 "g" (-mmxSize)
 : "%"REG_a
 );
 #else
-const long mmxSize=1;
+const x86_reg mmxSize=1;
 #endif
 dst[0        ]= (3*src[0] +   src[srcStride])>>2;
 dst[dstStride]= (  src[0] + 3*src[srcStride])>>2;
 for (x=mmxSize-1; x<srcWidth-1; x++){
 static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 long width, long height,
 long lumStride, long chromStride, long srcStride)
 {
 long y;
-const long chromWidth= width>>1;
+const x86_reg chromWidth= width>>1;
 for (y=0; y<height; y+=2)
 {
 #if HAVE_MMX
 __asm__ volatile(
 "xor                 %%"REG_a", %%"REG_a"   \n\t"
 static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 long width, long height,
 long lumStride, long chromStride, long srcStride)
 {
 long y;
-const long chromWidth= width>>1;
+const x86_reg chromWidth= width>>1;
 #if HAVE_MMX
 for (y=0; y<height-2; y+=2)
 {
 long i;
 for (i=0; i<2; i++)
 "paddusb "MANGLE(ff_bgr2YOffset)", %%mm0    \n\t"
 MOVNTQ"                  %%mm0, (%1, %%"REG_a") \n\t"
 "add                        $8,      %%"REG_a"  \n\t"
 " js                        1b                  \n\t"
-: : "r" (src+width*3), "r" (ydst+width), "g" (-width)
+: : "r" (src+width*3), "r" (ydst+width), "g" ((x86_reg)-width)
 : "%"REG_a, "%"REG_d
 );
 ydst += lumStride;
 src  += srcStride;
 }
 "movntdq             %%xmm0,   (%0, %%"REG_a", 2)   \n\t"
 "movntdq             %%xmm1, 16(%0, %%"REG_a", 2)   \n\t"
 "add                    $16, %%"REG_a"  \n\t"
 "cmp                     %3, %%"REG_a"  \n\t"
 " jb                     1b             \n\t"
-::"r"(dest), "r"(src1), "r"(src2), "r" (width-15)
+::"r"(dest), "r"(src1), "r"(src2), "r" ((x86_reg)width-15)
 : "memory", "%"REG_a""
 );
 #else
 __asm__(
 "xor %%"REG_a", %%"REG_a"               \n\t"
 MOVNTQ"               %%mm2, 16(%0, %%"REG_a", 2)   \n\t"
 MOVNTQ"               %%mm3, 24(%0, %%"REG_a", 2)   \n\t"
 "add                    $16, %%"REG_a"  \n\t"
 "cmp                     %3, %%"REG_a"  \n\t"
 " jb                     1b             \n\t"
-::"r"(dest), "r"(src1), "r"(src2), "r" (width-15)
+::"r"(dest), "r"(src1), "r"(src2), "r" ((x86_reg)width-15)
 : "memory", "%"REG_a
 );
 #endif
 for (w= (width&(~15)); w < width; w++)
 {
 uint8_t *dst1, uint8_t *dst2,
 long width, long height,
 long srcStride1, long srcStride2,
 long dstStride1, long dstStride2)
 {
-long y,x,w,h;
+x86_reg y;
+long x,w,h;
 w=width/2; h=height/2;
 #if HAVE_MMX
 __asm__ volatile(
 PREFETCH" %0    \n\t"
 PREFETCH" %1    \n\t"
 uint8_t *dst,
 long width, long height,
 long srcStride1, long srcStride2,
 long srcStride3, long dstStride)
 {
-long y,x,w,h;
+x86_reg x;
+long y,w,h;
 w=width/2; h=height;
 for (y=0;y<h;y++){
 const uint8_t* yp=src1+srcStride1*y;
 const uint8_t* up=src2+srcStride2*(y>>2);
 const uint8_t* vp=src3+srcStride3*(y>>2);

Mercurial > mplayer.hg

comparison libswscale/rgb2rgb_template.c @ 28957:e538af2c69c1