org.handhelds.familiar/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch

   1 diff -ru SDL-1.2.7/src/audio/SDL_mixer_MMX.c SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c
   2 --- SDL-1.2.7/src/audio/SDL_mixer_MMX.c 2002-11-09 07:13:28.000000000 +0100
   3 +++ SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c     2004-04-25 18:15:46.335228624 +0200
   4 @@ -19,9 +19,9 @@
   5  "      movl %1,%%esi\n"        // esi = src
   6  "      movl %3,%%eax\n"        // eax = volume
   7
   8 -"      movl %2,%%ebx\n"        // ebx = size
   9 +"      movl %2,%%edx\n"        // edx = size
  10
  11 -"      shrl $4,%%ebx\n"        // process 16 bytes per iteration = 8 samples
  12 +"      shrl $4,%%edx\n"        // process 16 bytes per iteration = 8 samples
  13
  14  "      jz .endS16\n"
  15
  16 @@ -95,7 +95,7 @@
  17
  18  "      addl $16,%%edi\n"
  19
  20 -"      dec %%ebx\n"
  21 +"      dec %%edx\n"
  22
  23  "      jnz .mixloopS16\n"
  24
  25 @@ -105,7 +105,7 @@
  26          :
  27          : "m" (dst), "m"(src),"m"(size),
  28          "m"(volume)
  29 -        : "eax","ebx", "esi", "edi","memory"
  30 +        : "eax","edx", "esi", "edi","memory"
  31          );
  32  }
  33
  34 @@ -123,7 +123,7 @@
  35  "      movl %1,%%esi\n"        // esi = src
  36  "      movl %3,%%eax\n"        // eax = volume
  37
  38 -"      movd %%ebx,%%mm0\n"
  39 +"      movd %%edx,%%mm0\n"
  40  "      movq %%mm0,%%mm1\n"
  41  "      psllq $16,%%mm0\n"
  42  "      por %%mm1,%%mm0\n"
  43 @@ -132,10 +132,10 @@
  44  "      psllq $16,%%mm0\n"
  45  "      por %%mm1,%%mm0\n"
  46
  47 -"      movl %2,%%ebx\n"        // ebx = size
  48 -"      shr $3,%%ebx\n" // process 8 bytes per iteration = 8 samples
  49 +"      movl %2,%%edx\n"        // edx = size
  50 +"      shr $3,%%edx\n" // process 8 bytes per iteration = 8 samples
  51
  52 -"      cmp $0,%%ebx\n"
  53 +"      cmp $0,%%edx\n"
  54  "      je .endS8\n"
  55
  56  ".align 16\n"
  57 @@ -169,7 +169,7 @@
  58  "      movq %%mm3,(%%edi)\n"   // store back to ram
  59  "      addl $8,%%edi\n"
  60
  61 -"      dec %%ebx\n"
  62 +"      dec %%edx\n"
  63
  64  "      jnz .mixloopS8\n"
  65
  66 @@ -178,7 +178,7 @@
  67          :
  68          : "m" (dst), "m"(src),"m"(size),
  69          "m"(volume)
  70 -        : "eax","ebx", "esi", "edi","memory"
  71 +        : "eax","edx", "esi", "edi","memory"
  72          );
  73  }
  74  #endif
  75 diff -ru SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c
  76 --- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c 2004-02-10 16:31:35.000000000 +0100
  77 +++ SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c     2004-04-25 18:15:46.336228472 +0200
  78 @@ -118,7 +118,7 @@
  79  "        movl    %%edi,%%ebx\n"
  80         : "=m" (features)
  81         :
  82 -       : "%eax", "%ebx", "%ecx", "%edx", "%edi"
  83 +       : "%eax", "%ecx", "%edx", "%edi"
  84         );
  85  #elif defined(_MSC_VER)
  86         __asm {
  87 @@ -153,7 +153,7 @@
  88  "        movl    %%edi,%%ebx\n"
  89         : "=m" (features)
  90         :
  91 -       : "%eax", "%ebx", "%ecx", "%edx", "%edi"
  92 +       : "%eax", "%ecx", "%edx", "%edi"
  93         );
  94  #elif defined(_MSC_VER)
  95         __asm {
  96 diff -ru SDL-1.2.7/src/video/SDL_yuv_mmx.c SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c
  97 --- SDL-1.2.7/src/video/SDL_yuv_mmx.c   2004-02-18 18:22:04.000000000 +0100
  98 +++ SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c       2004-04-25 18:15:46.337228320 +0200
  99 @@ -120,12 +120,12 @@
 100                  "movd (%2), %%mm2\n"           //    0  0  0  0 l3 l2 l1 l0
 101                  "punpcklbw %%mm7,%%mm1\n" //         0  v3 0  v2 00 v1 00 v0
 102                  "punpckldq %%mm1,%%mm1\n" //         00 v1 00 v0 00 v1 00 v0
 103 -                "psubw _MMX_0080w,%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
 104 +                "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
 105
 106                  // create Cr_g (result in mm0)
 107                  "movq %%mm1,%%mm0\n"           // r1 r1 r0 r0 r1 r1 r0 r0
 108 -                "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
 109 -                "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
 110 +                "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
 111 +                "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
 112                  "psraw  $6, %%mm0\n"           // red=red/64
 113                  "psraw  $6, %%mm1\n"           // red=red/64
 114
 115 @@ -134,8 +134,8 @@
 116                  "movq (%2,%4),%%mm3\n"         //    0  0  0  0 L3 L2 L1 L0
 117                  "punpckldq %%mm3,%%mm2\n"      //   L3 L2 L1 L0 l3 l2 l1 l0
 118                  "movq %%mm2,%%mm4\n"           //   L3 L2 L1 L0 l3 l2 l1 l0
 119 -                "pand _MMX_FF00w,%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
 120 -                "pand _MMX_00FFw,%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
 121 +                "pand %[_MMX_FF00w],%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
 122 +                "pand %[_MMX_00FFw],%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
 123                  "psrlw $8,%%mm2\n"             //   0  L3  0 L1  0 l3  0 l1
 124
 125                  // create R (result in mm6)
 126 @@ -152,11 +152,11 @@
 127                  "movd (%1), %%mm1\n"      //         0  0  0  0  u3 u2 u1 u0
 128                  "punpcklbw %%mm7,%%mm1\n" //         0  u3 0  u2 00 u1 00 u0
 129                  "punpckldq %%mm1,%%mm1\n" //         00 u1 00 u0 00 u1 00 u0
 130 -                "psubw _MMX_0080w,%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
 131 +                "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
 132                  // create Cb_g (result in mm5)
 133                  "movq %%mm1,%%mm5\n"            // u1 u1 u0 u0 u1 u1 u0 u0
 134 -                "pmullw _MMX_UgrnRGB,%%mm5\n"    // blue*-109dec=1.7129*64
 135 -                "pmullw _MMX_UbluRGB,%%mm1\n"    // blue*114dec=1.78125*64
 136 +                "pmullw %[_MMX_UgrnRGB],%%mm5\n"    // blue*-109dec=1.7129*64
 137 +                "pmullw %[_MMX_UbluRGB],%%mm1\n"    // blue*114dec=1.78125*64
 138                  "psraw  $6, %%mm5\n"            // blue=red/64
 139                  "psraw  $6, %%mm1\n"            // blue=blue/64
 140
 141 @@ -238,8 +238,14 @@
 142                  "popl %%ebx\n"
 143                  :
 144                  : "m" (cr), "r"(cb),"r"(lum),
 145 -                "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
 146 -                : "%ebx"
 147 +                "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
 148 +         [_MMX_0080w] "m" (*_MMX_0080w),
 149 +         [_MMX_00FFw] "m" (*_MMX_00FFw),
 150 +         [_MMX_FF00w] "m" (*_MMX_FF00w),
 151 +         [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB),
 152 +         [_MMX_VredRGB] "m" (*_MMX_VredRGB),
 153 +         [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB),
 154 +         [_MMX_UbluRGB] "m" (*_MMX_UbluRGB)
 155                  );
 156  }
 157
 158 @@ -413,8 +419,16 @@
 159          "popl %%ebx\n"
 160           :
 161           :"m" (cr), "r"(cb),"r"(lum),
 162 -        "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
 163 -        : "%ebx"
 164 +        "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
 165 +     [_MMX_0080w] "m" (*_MMX_0080w),
 166 + [_MMX_Ugrn565] "m" (*_MMX_Ugrn565),
 167 + [_MMX_Ublu5x5] "m" (*_MMX_Ublu5x5),
 168 + [_MMX_00FFw] "m" (*_MMX_00FFw),
 169 + [_MMX_Vgrn565] "m" (*_MMX_Vgrn565),
 170 + [_MMX_Vred5x5] "m" (*_MMX_Vred5x5),
 171 + [_MMX_Ycoeff] "m" (*_MMX_Ycoeff),
 172 + [_MMX_red565] "m" (*_MMX_red565),
 173 + [_MMX_grn565] "m" (*_MMX_grn565)
 174           );
 175  }
 176