|
|
|
@ -1,27 +1,11 @@ |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
|
|
# |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
|
|
# Please add additional copyright information _after_ the line containing |
|
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
|
|
# |
|
|
|
# ROCK Linux: rock-src/package/blindcoder/libsdl/libsdl-gcc3.4.patch |
|
|
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|
|
|
# |
|
|
|
# This patch file is dual-licensed. It is available under the license the |
|
|
|
# patched project is licensed under, as long as it is an OpenSource license |
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
|
|
# of the GNU General Public License as published by the Free Software |
|
|
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
|
|
# version. |
|
|
|
# |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
|
|
|
|
|
|
diff -rduN SDL-old/src/audio/SDL_mixer_MMX.c SDL-new/src/audio/SDL_mixer_MMX.c
|
|
|
|
--- SDL-old/src/audio/SDL_mixer_MMX.c 2002-11-09 07:13:28.000000000 +0100
|
|
|
|
+++ SDL-new/src/audio/SDL_mixer_MMX.c 2004-05-18 15:28:23.000000000 +0200
|
|
|
|
@@ -19,9 +19,9 @@
|
|
|
|
" movl %1,%%esi\n" // esi = src |
|
|
|
--- ./src/audio/SDL_mixer_MMX.c 9 Nov 2002 06:13:28 -0000
|
|
|
|
+++ ./src/audio/SDL_mixer_MMX.c 3 May 2004 19:51:58 -0000
|
|
|
|
@@ -15,13 +15,11 @@
|
|
|
|
{ |
|
|
|
__asm__ __volatile__ ( |
|
|
|
|
|
|
|
-" movl %0,%%edi\n" // edi = dst
|
|
|
|
-" movl %1,%%esi\n" // esi = src
|
|
|
|
" movl %3,%%eax\n" // eax = volume |
|
|
|
|
|
|
|
-" movl %2,%%ebx\n" // ebx = size
|
|
|
|
@ -32,26 +16,76 @@ diff -rduN SDL-old/src/audio/SDL_mixer_MMX.c SDL-new/src/audio/SDL_mixer_MMX.c |
|
|
|
|
|
|
|
" jz .endS16\n" |
|
|
|
|
|
|
|
@@ -95,7 +95,7 @@
|
|
|
|
@@ -39,14 +37,14 @@
|
|
|
|
".align 16\n" |
|
|
|
" .mixloopS16:\n" |
|
|
|
|
|
|
|
-" movq (%%esi),%%mm1\n" // mm1 = a|b|c|d
|
|
|
|
+" movq (%1),%%mm1\n" // mm1 = a|b|c|d
|
|
|
|
|
|
|
|
" movq %%mm1,%%mm2\n" // mm2 = a|b|c|d |
|
|
|
|
|
|
|
-" movq 8(%%esi),%%mm4\n" // mm4 = e|f|g|h
|
|
|
|
+" movq 8(%1),%%mm4\n" // mm4 = e|f|g|h
|
|
|
|
|
|
|
|
// pré charger le buffer dst dans mm7 |
|
|
|
-" movq (%%edi),%%mm7\n" // mm7 = dst[0]"
|
|
|
|
+" movq (%0),%%mm7\n" // mm7 = dst[0]"
|
|
|
|
|
|
|
|
// multiplier par le volume |
|
|
|
" pmullw %%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) |
|
|
|
@@ -69,11 +67,11 @@
|
|
|
|
" punpcklwd %%mm5,%%mm6\n" // mm6 = g*v|h*v |
|
|
|
|
|
|
|
// pré charger le buffer dst dans mm5 |
|
|
|
-" movq 8(%%edi),%%mm5\n" // mm5 = dst[1]
|
|
|
|
+" movq 8(%0),%%mm5\n" // mm5 = dst[1]
|
|
|
|
|
|
|
|
// diviser par 128 |
|
|
|
" psrad $7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME |
|
|
|
-" addl $16,%%esi\n"
|
|
|
|
+" add $16,%1\n"
|
|
|
|
|
|
|
|
" psrad $7,%%mm3\n" // mm3 = c*v/128|d*v/128 |
|
|
|
|
|
|
|
@@ -87,15 +85,15 @@
|
|
|
|
|
|
|
|
// mm4 = le sample avec le volume modifié |
|
|
|
" packssdw %%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v) |
|
|
|
-" movq %%mm3,(%%edi)\n"
|
|
|
|
+" movq %%mm3,(%0)\n"
|
|
|
|
|
|
|
|
" paddsw %%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst |
|
|
|
|
|
|
|
" addl $16,%%edi\n" |
|
|
|
-" movq %%mm6,8(%%edi)\n"
|
|
|
|
+" movq %%mm6,8(%0)\n"
|
|
|
|
|
|
|
|
-" addl $16,%%edi\n"
|
|
|
|
+" add $16,%0\n"
|
|
|
|
|
|
|
|
-" dec %%ebx\n"
|
|
|
|
+" dec %%edx\n"
|
|
|
|
|
|
|
|
" jnz .mixloopS16\n" |
|
|
|
|
|
|
|
@@ -105,7 +105,7 @@
|
|
|
|
@@ -103,9 +101,9 @@
|
|
|
|
|
|
|
|
".endS16:\n" |
|
|
|
: |
|
|
|
: "m" (dst), "m"(src),"m"(size), |
|
|
|
- : "m" (dst), "m"(src),"m"(size),
|
|
|
|
+ : "r" (dst), "r"(src),"m"(size),
|
|
|
|
"m"(volume) |
|
|
|
- : "eax","ebx", "esi", "edi","memory"
|
|
|
|
+ : "eax","edx", "esi", "edi","memory"
|
|
|
|
+ : "eax","edx","memory"
|
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -123,7 +123,7 @@
|
|
|
|
" movl %1,%%esi\n" // esi = src |
|
|
|
@@ -119,11 +117,9 @@
|
|
|
|
{ |
|
|
|
__asm__ __volatile__ ( |
|
|
|
|
|
|
|
-" movl %0,%%edi\n" // edi = dst
|
|
|
|
-" movl %1,%%esi\n" // esi = src
|
|
|
|
" movl %3,%%eax\n" // eax = volume |
|
|
|
|
|
|
|
-" movd %%ebx,%%mm0\n"
|
|
|
|
@ -59,7 +93,7 @@ diff -rduN SDL-old/src/audio/SDL_mixer_MMX.c SDL-new/src/audio/SDL_mixer_MMX.c |
|
|
|
" movq %%mm0,%%mm1\n" |
|
|
|
" psllq $16,%%mm0\n" |
|
|
|
" por %%mm1,%%mm0\n" |
|
|
|
@@ -132,10 +132,10 @@
|
|
|
|
@@ -132,17 +128,17 @@
|
|
|
|
" psllq $16,%%mm0\n" |
|
|
|
" por %%mm1,%%mm0\n" |
|
|
|
|
|
|
|
@ -73,74 +107,74 @@ diff -rduN SDL-old/src/audio/SDL_mixer_MMX.c SDL-new/src/audio/SDL_mixer_MMX.c |
|
|
|
" je .endS8\n" |
|
|
|
|
|
|
|
".align 16\n" |
|
|
|
@@ -169,7 +169,7 @@
|
|
|
|
" movq %%mm3,(%%edi)\n" // store back to ram |
|
|
|
" addl $8,%%edi\n" |
|
|
|
" .mixloopS8:\n" |
|
|
|
|
|
|
|
" pxor %%mm2,%%mm2\n" // mm2 = 0 |
|
|
|
-" movq (%%esi),%%mm1\n" // mm1 = a|b|c|d|e|f|g|h
|
|
|
|
+" movq (%1),%%mm1\n" // mm1 = a|b|c|d|e|f|g|h
|
|
|
|
|
|
|
|
" movq %%mm1,%%mm3\n" // mm3 = a|b|c|d|e|f|g|h |
|
|
|
|
|
|
|
@@ -152,10 +148,10 @@
|
|
|
|
" punpckhbw %%mm2,%%mm1\n" // mm1 = 0|a|0|b|0|c|0|d |
|
|
|
|
|
|
|
" punpcklbw %%mm2,%%mm3\n" // mm3 = 0|e|0|f|0|g|0|h |
|
|
|
-" movq (%%edi),%%mm2\n" // mm2 = destination
|
|
|
|
+" movq (%0),%%mm2\n" // mm2 = destination
|
|
|
|
|
|
|
|
" pmullw %%mm0,%%mm1\n" // mm1 = v*a|v*b|v*c|v*d |
|
|
|
-" addl $8,%%esi\n"
|
|
|
|
+" add $8,%1\n"
|
|
|
|
|
|
|
|
" pmullw %%mm0,%%mm3\n" // mm3 = v*e|v*f|v*g|v*h |
|
|
|
" psraw $7,%%mm1\n" // mm1 = v*a/128|v*b/128|v*c/128|v*d/128 |
|
|
|
@@ -166,19 +162,19 @@
|
|
|
|
|
|
|
|
" paddsb %%mm2,%%mm3\n" // add to destination buffer |
|
|
|
|
|
|
|
-" movq %%mm3,(%%edi)\n" // store back to ram
|
|
|
|
-" addl $8,%%edi\n"
|
|
|
|
+" movq %%mm3,(%0)\n" // store back to ram
|
|
|
|
+" add $8,%0\n"
|
|
|
|
|
|
|
|
-" dec %%ebx\n"
|
|
|
|
+" dec %%edx\n"
|
|
|
|
|
|
|
|
" jnz .mixloopS8\n" |
|
|
|
|
|
|
|
@@ -178,7 +178,7 @@
|
|
|
|
".endS8:\n" |
|
|
|
" emms\n" |
|
|
|
: |
|
|
|
: "m" (dst), "m"(src),"m"(size), |
|
|
|
- : "m" (dst), "m"(src),"m"(size),
|
|
|
|
+ : "r" (dst), "r"(src),"m"(size),
|
|
|
|
"m"(volume) |
|
|
|
- : "eax","ebx", "esi", "edi","memory"
|
|
|
|
+ : "eax","edx", "esi", "edi","memory"
|
|
|
|
+ : "eax","edx","memory"
|
|
|
|
); |
|
|
|
} |
|
|
|
#endif |
|
|
|
diff -rduN SDL-old/src/cpuinfo/SDL_cpuinfo.c SDL-new/src/cpuinfo/SDL_cpuinfo.c
|
|
|
|
--- SDL-old/src/cpuinfo/SDL_cpuinfo.c 2004-02-10 16:31:35.000000000 +0100
|
|
|
|
+++ SDL-new/src/cpuinfo/SDL_cpuinfo.c 2004-05-18 15:29:31.000000000 +0200
|
|
|
|
@@ -105,7 +105,7 @@
|
|
|
|
int features = 0; |
|
|
|
#if defined(__GNUC__) && defined(i386) |
|
|
|
__asm__ ( |
|
|
|
-" movl %%ebx,%%edi\n"
|
|
|
|
+" movl %%edx,%%edi\n"
|
|
|
|
" xorl %%eax,%%eax # Set up for CPUID instruction \n" |
|
|
|
" cpuid # Get and save vendor ID \n" |
|
|
|
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" |
|
|
|
@@ -115,10 +115,10 @@
|
|
|
|
" cpuid # Get family/model/stepping/features\n" |
|
|
|
" movl %%edx,%0 \n" |
|
|
|
"1: \n" |
|
|
|
-" movl %%edi,%%ebx\n"
|
|
|
|
+" movl %%edi,%%edx\n"
|
|
|
|
--- ./src/cpuinfo/SDL_cpuinfo.c 11 Apr 2004 19:49:34 -0000
|
|
|
|
+++ ./src/cpuinfo/SDL_cpuinfo.c 3 May 2004 19:52:08 -0000
|
|
|
|
@@ -118,7 +118,7 @@
|
|
|
|
" movl %%edi,%%ebx\n" |
|
|
|
: "=m" (features) |
|
|
|
: |
|
|
|
- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
|
|
|
|
+ : "%eax", "%edx", "%ecx", "%edx", "%edi"
|
|
|
|
+ : "%eax", "%ecx", "%edx", "%edi"
|
|
|
|
); |
|
|
|
#elif defined(_MSC_VER) |
|
|
|
__asm { |
|
|
|
@@ -141,7 +141,7 @@
|
|
|
|
int features = 0; |
|
|
|
#if defined(__GNUC__) && defined(i386) |
|
|
|
__asm__ ( |
|
|
|
-" movl %%ebx,%%edi\n"
|
|
|
|
+" movl %%edx,%%edi\n"
|
|
|
|
" movl $0x80000000,%%eax # Query for extended functions \n" |
|
|
|
" cpuid # Get extended function limit \n" |
|
|
|
" cmpl $0x80000001,%%eax \n" |
|
|
|
@@ -150,10 +150,10 @@
|
|
|
|
" cpuid # and get the information \n" |
|
|
|
" movl %%edx,%0 \n" |
|
|
|
"1: \n" |
|
|
|
-" movl %%edi,%%ebx\n"
|
|
|
|
+" movl %%edi,%%edx\n"
|
|
|
|
@@ -153,7 +153,7 @@
|
|
|
|
" movl %%edi,%%ebx\n" |
|
|
|
: "=m" (features) |
|
|
|
: |
|
|
|
- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
|
|
|
|
+ : "%eax", "%edx", "%ecx", "%edx", "%edi"
|
|
|
|
+ : "%eax", "%ecx", "%edx", "%edi"
|
|
|
|
); |
|
|
|
#elif defined(_MSC_VER) |
|
|
|
__asm { |
|
|
|
diff -rduN SDL-old/src/video/SDL_yuv_mmx.c SDL-new/src/video/SDL_yuv_mmx.c
|
|
|
|
--- SDL-old/src/video/SDL_yuv_mmx.c 2004-02-18 18:22:04.000000000 +0100
|
|
|
|
+++ SDL-new/src/video/SDL_yuv_mmx.c 2004-05-17 22:53:31.000000000 +0200
|
|
|
|
--- ./src/video/SDL_yuv_mmx.c 4 Jan 2004 16:49:22 -0000
|
|
|
|
+++ ./src/video/SDL_yuv_mmx.c 3 May 2004 19:52:24 -0000
|
|
|
|
@@ -120,12 +120,12 @@
|
|
|
|
"movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 |
|
|
|
"punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 |
|
|
|
@ -183,32 +217,29 @@ diff -rduN SDL-old/src/video/SDL_yuv_mmx.c SDL-new/src/video/SDL_yuv_mmx.c |
|
|
|
"psraw $6, %%mm5\n" // blue=red/64 |
|
|
|
"psraw $6, %%mm1\n" // blue=blue/64 |
|
|
|
|
|
|
|
@@ -238,9 +238,15 @@
|
|
|
|
@@ -238,8 +238,14 @@
|
|
|
|
"popl %%ebx\n" |
|
|
|
: |
|
|
|
: "m" (cr), "r"(cb),"r"(lum), |
|
|
|
- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
|
|
|
|
- : "%ebx"
|
|
|
|
- );
|
|
|
|
+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
|
|
|
|
+ [_MMX_0080w] "m" (*_MMX_0080w),
|
|
|
|
+ [_MMX_00FFw] "m" (*_MMX_00FFw),
|
|
|
|
+ [_MMX_FF00w] "m" (*_MMX_FF00w),
|
|
|
|
+ [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB),
|
|
|
|
+ [_MMX_VredRGB] "m" (*_MMX_VredRGB),
|
|
|
|
+ [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB),
|
|
|
|
+ [_MMX_UbluRGB] "m" (*_MMX_UbluRGB)
|
|
|
|
+ );
|
|
|
|
+ [_MMX_0080w] "m" (*_MMX_0080w),
|
|
|
|
+ [_MMX_00FFw] "m" (*_MMX_00FFw),
|
|
|
|
+ [_MMX_FF00w] "m" (*_MMX_FF00w),
|
|
|
|
+ [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB),
|
|
|
|
+ [_MMX_VredRGB] "m" (*_MMX_VredRGB),
|
|
|
|
+ [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB),
|
|
|
|
+ [_MMX_UbluRGB] "m" (*_MMX_UbluRGB)
|
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix, |
|
|
|
@@ -413,9 +419,17 @@
|
|
|
|
@@ -413,8 +419,16 @@
|
|
|
|
"popl %%ebx\n" |
|
|
|
: |
|
|
|
:"m" (cr), "r"(cb),"r"(lum), |
|
|
|
- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
|
|
|
|
- : "%ebx"
|
|
|
|
- );
|
|
|
|
+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
|
|
|
|
+ [_MMX_0080w] "m" (*_MMX_0080w),
|
|
|
|
+ [_MMX_Ugrn565] "m" (*_MMX_Ugrn565),
|
|
|
|
@ -218,8 +249,7 @@ diff -rduN SDL-old/src/video/SDL_yuv_mmx.c SDL-new/src/video/SDL_yuv_mmx.c |
|
|
|
+ [_MMX_Vred5x5] "m" (*_MMX_Vred5x5),
|
|
|
|
+ [_MMX_Ycoeff] "m" (*_MMX_Ycoeff),
|
|
|
|
+ [_MMX_red565] "m" (*_MMX_red565),
|
|
|
|
+ [_MMX_grn565] "m" (*_MMX_grn565)
|
|
|
|
+ );
|
|
|
|
+ [_MMX_grn565] "m" (*_MMX_grn565)
|
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
#endif /* GCC i386 inline assembly */ |
fake
20 years ago