components/library/liboil/patches/liboil-04-ss11.patch

   1 --- liboil-0.3.17/liboil/i386_amd64/convert.c-orig      2010-04-15 14:34:29.693567169 -0500
   2 +++ liboil-0.3.17/liboil/i386_amd64/convert.c   2010-04-15 14:34:47.168164102 -0500
   3 @@ -61,6 +61,7 @@ convert_u8_s16_mmx (uint8_t * dest, cons
   4  }
   5  OIL_DEFINE_IMPL_FULL (convert_u8_s16_mmx, convert_u8_s16, OIL_IMPL_FLAG_MMX);
   6
   7 +#if 0
   8  static void
   9  convert_u8_s16_mmx_2 (uint8_t * dest, const int16_t * src, int n)
  10  {
  11 @@ -106,6 +107,7 @@ convert_u8_s16_mmx_2 (uint8_t * dest, co
  12    __asm__ __volatile__ ("emms\n");
  13  }
  14  OIL_DEFINE_IMPL_FULL (convert_u8_s16_mmx_2, convert_u8_s16, OIL_IMPL_FLAG_MMX);
  15 +#endif
  16
  17  static void
  18  convert_s16_u8_mmx (int16_t * dest, const uint8_t * src, int n)
  19 --- liboil-0.3.16/liboil/i386_amd64/yuv.c-orig  2010-04-08 12:07:09.131114728 -0500
  20 +++ liboil-0.3.16/liboil/i386_amd64/yuv.c       2010-04-08 12:07:53.826906101 -0500
  21 @@ -3,6 +3,7 @@
  22  #include <liboil/liboilclasses.h>
  23
  24
  25 +#if 0
  26  void
  27  packyuyv_mmx (uint32_t *d, uint8_t *s1_nx2, uint8_t *s2, uint8_t *s3, int n)
  28  {
  29 @@ -99,4 +100,5 @@ packyuyv_mmx2 (uint32_t *d, uint8_t *s1_
  30    }
  31  }
  32  OIL_DEFINE_IMPL_FULL (packyuyv_mmx2, packyuyv, OIL_IMPL_FLAG_MMX);
  33 +#endif
  34
  35 --- liboil-0.3.16/liboil/i386_amd64/mas.c-orig  2010-04-08 11:34:33.694242943 -0500
  36 +++ liboil-0.3.16/liboil/i386_amd64/mas.c       2010-04-08 13:11:03.460299411 -0500
  37 @@ -3,6 +3,7 @@
  38  #include <liboil/liboilclasses.h>
  39
  40
  41 +#if 0
  42  void
  43  mas10_u8_mmx (uint8_t *d, const uint8_t *s1_np9, const int16_t *s2_10,
  44          const int16_t *s3_2, int n)
  45 @@ -734,6 +735,7 @@ mas8_u8_sym_mmx_5 (uint8_t *d, const uin
  46        : "ecx");
  47  }
  48  OIL_DEFINE_IMPL_FULL (mas8_u8_sym_mmx_5, mas8_u8_sym_l15, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
  49 +#endif
  50
  51  #ifdef HAVE_SSSE3_ASM
  52  void
  53 @@ -893,6 +895,7 @@ mas8_u8_supersym_mmx (uint8_t *d, const
  54  OIL_DEFINE_IMPL_FULL (mas8_u8_supersym_mmx, mas8_u8_sym_l15, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
  55  #endif
  56
  57 +#if 0
  58  void
  59  mas12_addc_rshift_decim2_u8_mmx_4 (uint8_t *d, const uint8_t *s1_2xnp11,
  60      const int16_t *s2_12, const int16_t *s3_2, int n)
  61 @@ -947,6 +950,7 @@ mas12_addc_rshift_decim2_u8_mmx_4 (uint8
  62  }
  63  OIL_DEFINE_IMPL_FULL (mas12_addc_rshift_decim2_u8_mmx_4,
  64      mas12_addc_rshift_decim2_u8, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
  65 +#endif
  66
  67  #if 0
  68  void
  69 --- liboil-0.3.16/liboil/i386_amd64/copy.c-orig 2010-04-08 11:32:46.460572471 -0500
  70 +++ liboil-0.3.16/liboil/i386_amd64/copy.c      2010-04-08 12:40:53.025051322 -0500
  71 @@ -256,7 +256,6 @@ copy_u8_mmx5 (uint8_t *dest, uint8_t *sr
  72  }
  73  OIL_DEFINE_IMPL_FULL (copy_u8_mmx5, copy_u8, OIL_IMPL_FLAG_MMX);
  74
  75 -
  76  static void splat_u8_ns_i386_mmx (uint8_t *dest, const uint8_t *param, int n)
  77  {
  78    uint32_t p;
  79 @@ -306,6 +305,7 @@ static void splat_u8_ns_mmx2 (uint8_t *d
  80  }
  81  OIL_DEFINE_IMPL_FULL(splat_u8_ns_mmx2, splat_u8_ns, OIL_IMPL_FLAG_MMX);
  82
  83 +#if 0
  84  static void splat_u8_ns_mmx2a (uint8_t *dest, const uint8_t *param, int n)
  85  {
  86    uint32_t p;
  87 @@ -435,4 +435,4 @@ static void splat_u16_ns_mmx_3 (uint16_t
  88      : "ecx");
  89  }
  90  OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_3, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
  91 -
  92 +#endif
  93 --- liboil-0.3.16/liboil/i386_amd64/mt19937.c-orig      2010-04-08 11:35:26.503879386 -0500
  94 +++ liboil-0.3.16/liboil/i386_amd64/mt19937.c   2010-04-08 12:49:33.973854216 -0500
  95 @@ -232,6 +232,7 @@ mt19937_i386_mmx_2 (uint32_t *d, uint32_
  96  OIL_DEFINE_IMPL_FULL (mt19937_i386_mmx_2, mt19937, OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
  97
  98
  99 +#if 0
 100  static void
 101  mt19937_i386_mmx_3 (uint32_t *d, uint32_t *mt)
 102  {
 103 @@ -324,6 +325,7 @@ mt19937_i386_mmx_3 (uint32_t *d, uint32_
 104
 105  }
 106  OIL_DEFINE_IMPL_FULL (mt19937_i386_mmx_3, mt19937, OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
 107 +#endif
 108
 109  #undef TWIST
 110  #undef TWIST2
 111 --- liboil-0.3.16/liboil/i386_amd64/sad8x8.c-orig       2010-04-08 11:35:45.557471388 -0500
 112 +++ liboil-0.3.16/liboil/i386_amd64/sad8x8.c    2010-04-08 12:59:18.475624130 -0500
 113 @@ -33,7 +33,7 @@
 114  #include <liboil/liboilclasses.h>
 115  #include <stddef.h>
 116
 117 -
 118 +#if 0
 119  static void
 120  sad8x8_u8_mmx (uint32_t * dest, uint8_t * src1, int sstr1, uint8_t * src2,
 121      int sstr2)
 122 @@ -91,6 +91,7 @@ sad8x8_u8_mmx (uint32_t * dest, uint8_t
 123    *dest = diff;
 124  }
 125  OIL_DEFINE_IMPL_FULL (sad8x8_u8_mmx, sad8x8_u8, OIL_IMPL_FLAG_MMX);
 126 +#endif
 127
 128  static void
 129  sad8x8_u8_mmxext (uint32_t * dest, uint8_t * src1, int sstr1, uint8_t * src2,
 130 @@ -289,6 +290,7 @@ sad8x8_u8_mmxext_4 (uint32_t * dest, uin
 131  }
 132  OIL_DEFINE_IMPL_FULL (sad8x8_u8_mmxext_4, sad8x8_u8, OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
 133
 134 +#if 0
 135  static void
 136  sad8x8_8xn_u8_psadbw (uint32_t * dest, uint8_t * src1, int sstr1, uint8_t * src2,
 137      int sstr2, int n)
 138 @@ -363,6 +365,7 @@ sad8x8_8xn_u8_psadbw (uint32_t * dest, u
 139    );
 140  }
 141  OIL_DEFINE_IMPL_FULL (sad8x8_8xn_u8_psadbw, sad8x8_8xn_u8, OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
 142 +#endif
 143
 144
 145  static void
 146 @@ -777,6 +780,7 @@ combine2_16xn_u8_mmx (uint8_t *d, int ds
 147  }
 148  OIL_DEFINE_IMPL_FULL (combine2_16xn_u8_mmx, combine2_16xn_u8, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 149
 150 +#if 0
 151  #define AVG2_4(offset) \
 152          "  movd " #offset "(%1), %%mm0\n" \
 153          "  punpcklbw %%mm7, %%mm0\n" \
 154 @@ -889,4 +893,4 @@ avg2_32xn_u8_mmx (uint8_t *d, int ds1, u
 155    asm volatile ("emms");
 156  }
 157  OIL_DEFINE_IMPL_FULL (avg2_32xn_u8_mmx, avg2_32xn_u8, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 158 -
 159 +#endif
 160 --- liboil-0.3.16/liboil/i386_amd64/multiply_and_acc.c-orig     2010-04-08 11:35:05.517375333 -0500
 161 +++ liboil-0.3.16/liboil/i386_amd64/multiply_and_acc.c  2010-04-08 13:12:14.373386908 -0500
 162 @@ -2,6 +2,7 @@
 163  #include <liboil/liboilfunction.h>
 164  #include <liboil/liboilclasses.h>
 165
 166 +#if 0
 167  void
 168  multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
 169      int ss1, uint8_t *s2, int ss2, int n)
 170 @@ -178,7 +179,6 @@ OIL_DEFINE_IMPL_FULL (multiply_and_acc_2
 171      multiply_and_acc_24xn_s16_u8, OIL_IMPL_FLAG_MMX);
 172
 173
 174 -#if 0
 175  void
 176  mas2_add_s16_sse (int16_t *d1, int16_t *s1, int16_t *s2, int16_t *s3_2,
 177      int16_t *s4_2, int n)
 178 --- liboil-0.3.16/liboil/i386/sad8x8avg_i386.c-orig     2010-04-08 10:47:59.428085736 -0500
 179 +++ liboil-0.3.16/liboil/i386/sad8x8avg_i386.c  2010-04-08 12:26:18.364764404 -0500
 180 @@ -33,6 +33,7 @@
 181
 182  OIL_DECLARE_CLASS (sad8x8_u8_avg);
 183
 184 +#if 0
 185  static void
 186  sad8x8_u8_avg_mmx (uint32_t *dest, uint8_t *src1, int ss1, uint8_t *src2, uint8_t *src3, int ss2)
 187  {
 188 @@ -140,3 +141,4 @@ sad8x8_u8_avg_mmxext (uint32_t *dest, ui
 189    *dest = diff;
 190  }
 191  OIL_DEFINE_IMPL_FULL (sad8x8_u8_avg_mmxext, sad8x8_u8_avg, OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
 192 +#endif
 193 --- liboil-0.3.16/liboil/i386/diff8x8_i386.c-orig       2010-04-08 10:38:46.418919506 -0500
 194 +++ liboil-0.3.16/liboil/i386/diff8x8_i386.c    2010-04-08 13:00:49.093277760 -0500
 195 @@ -84,6 +84,7 @@ diff8x8_s16_u8_mmx (int16_t *dest, uint8
 196  }
 197  OIL_DEFINE_IMPL_FULL (diff8x8_s16_u8_mmx, diff8x8_s16_u8, OIL_IMPL_FLAG_MMX);
 198
 199 +#if 0
 200  static void
 201  diff8x8_const128_s16_u8_mmx (int16_t *dest, uint8_t *src1, int ss1)
 202  {
 203 @@ -128,7 +129,9 @@ diff8x8_const128_s16_u8_mmx (int16_t *de
 204    );
 205  }
 206  OIL_DEFINE_IMPL_FULL (diff8x8_const128_s16_u8_mmx, diff8x8_const128_s16_u8, OIL_IMPL_FLAG_MMX);
 207 +#endif
 208
 209 +#if 0
 210  static void
 211  diff8x8_average_s16_u8_mmx (int16_t *dest, uint8_t *src1, int ss1, uint8_t *src2, int ss2, uint8_t *src3)
 212  {
 213 @@ -186,4 +189,5 @@ diff8x8_average_s16_u8_mmx (int16_t *des
 214    );
 215  }
 216  OIL_DEFINE_IMPL_FULL (diff8x8_average_s16_u8_mmx, diff8x8_average_s16_u8, OIL_IMPL_FLAG_MMX);
 217 +#endif
 218
 219 --- liboil-0.3.16/liboil/i386/error8x8_i386.c-orig      2010-04-08 10:40:01.141129823 -0500
 220 +++ liboil-0.3.16/liboil/i386/error8x8_i386.c   2010-04-08 12:24:54.131037212 -0500
 221 @@ -95,6 +95,7 @@ err_intra8x8_u8_mmx (uint32_t *dest, uin
 222  }
 223  OIL_DEFINE_IMPL_FULL (err_intra8x8_u8_mmx, err_intra8x8_u8, OIL_IMPL_FLAG_MMX);
 224
 225 +#if 0
 226  static void
 227  err_inter8x8_u8_mmx (uint32_t *dest, uint8_t *src1, int ss1, uint8_t *src2, int ss2)
 228  {
 229 @@ -248,6 +249,7 @@ err_inter8x8_u8_avg_mmx (uint32_t *dest,
 230  }
 231
 232  OIL_DEFINE_IMPL_FULL (err_inter8x8_u8_avg_mmx, err_inter8x8_u8_avg, OIL_IMPL_FLAG_MMX);
 233 +#endif
 234
 235  #ifdef ENABLE_BROKEN_IMPLS
 236  static void
 237 --- liboil-0.3.16/liboil/i386/wavelet.c-orig    2010-04-08 10:48:53.456139667 -0500
 238 +++ liboil-0.3.16/liboil/i386/wavelet.c 2010-04-08 12:36:08.380045855 -0500
 239 @@ -104,6 +104,7 @@ deinterleave2_c_1 (int16_t *d1, int16_t
 240  }
 241  OIL_DEFINE_IMPL (deinterleave2_c_1, deinterleave2_s16);
 242
 243 +#if 0
 244  void
 245  deinterleave2_asm (int16_t *d1, int16_t *d2, int16_t *s_2xn, int n)
 246  {
 247 @@ -290,7 +291,6 @@ deinterleave2_mmx_4 (int16_t *d1, int16_
 248  }
 249  OIL_DEFINE_IMPL_FULL (deinterleave2_mmx_4, deinterleave2_s16, OIL_IMPL_FLAG_MMX);
 250
 251 -
 252  void
 253  lift_add_mult_shift12_i386_mmx (int16_t *d, int16_t *s1, int16_t *s2,
 254      int16_t *s3, int16_t *s4, int n)
 255 @@ -596,6 +596,7 @@ synth_53_mmx (int16_t *d_2xn, int16_t *s
 256  }
 257  OIL_DEFINE_IMPL_FULL (synth_53_mmx, synth_53, OIL_IMPL_FLAG_MMX);
 258  #endif
 259 +#endif
 260
 261
 262  void
 263 @@ -1373,6 +1374,7 @@ mas8_add_s16_sse2 (int16_t *d1, int16_t
 264  OIL_DEFINE_IMPL_FULL (mas8_add_s16_sse2, mas8_add_s16, OIL_IMPL_FLAG_SSE);
 265  #endif
 266
 267 +#if 0
 268  void
 269  mas2_across_add_s16_mmx (int16_t *d1, int16_t *s1, int16_t *s2, int16_t *s3,
 270      int16_t *s4_2, int16_t *s5_2, int n)
 271 @@ -1455,6 +1457,7 @@ mas2_across_add_s16_mmx (int16_t *d1, in
 272  }
 273  OIL_DEFINE_IMPL_FULL (mas2_across_add_s16_mmx, mas2_across_add_s16,
 274      OIL_IMPL_FLAG_MMX | OIL_IMPL_FLAG_MMXEXT);
 275 +#endif
 276
 277  void
 278  add_const_rshift_s16_mmx(int16_t *d1, int16_t *s1, int16_t *s2_2, int n)
 279 @@ -1603,6 +1606,7 @@ multiply_and_add_s16_u8_mmx_2(int16_t *d
 280  OIL_DEFINE_IMPL_FULL (multiply_and_add_s16_u8_mmx_2, multiply_and_add_s16_u8,
 281      OIL_IMPL_FLAG_MMX);
 282
 283 +#if 0
 284  void
 285  multiply_and_acc_12xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
 286      int ss1, uint8_t *s2, int ss2, int n)
 287 @@ -1639,6 +1643,7 @@ multiply_and_acc_12xn_s16_u8_mmx (int16_
 288  }
 289  OIL_DEFINE_IMPL_FULL (multiply_and_acc_12xn_s16_u8_mmx,
 290      multiply_and_acc_12xn_s16_u8, OIL_IMPL_FLAG_MMX);
 291 +#endif
 292
 293  #ifdef ENABLE_BROKEN_IMPLS
 294  void
 295 @@ -1719,7 +1724,6 @@ mas4_across_add_s16_mmx (int16_t *d, int
 296  }
 297  OIL_DEFINE_IMPL_FULL (mas4_across_add_s16_mmx, mas4_across_add_s16,
 298      OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 299 -#endif
 300
 301  void
 302  mas4_across_add_s16_mmx (int16_t *d, int16_t *s1, int16_t *s2_nx4, int sstr2,
 303 @@ -2047,5 +2051,6 @@ lshift_s16_mmx_2(int16_t *d1, int16_t *s
 304        : "ecx");
 305  }
 306  OIL_DEFINE_IMPL_FULL (lshift_s16_mmx_2, lshift_s16, OIL_IMPL_FLAG_MMX);
 307 +#endif
 308
 309
 310 --- liboil-0.3.16/liboil/i386/md5_i386.c-orig   2010-04-08 10:41:58.951515808 -0500
 311 +++ liboil-0.3.16/liboil/i386/md5_i386.c        2010-04-08 13:08:09.599963383 -0500
 312 @@ -33,6 +33,7 @@
 313  #include <liboil/liboilclasses.h>
 314
 315
 316 +#if 0
 317  #define F1(x, y, z) (z ^ (x & (y ^ z)))
 318  #define F2(x, y, z) F1(z, x, y)
 319  #define F3(x, y, z) (x ^ y ^ z)
 320 @@ -520,4 +521,5 @@ md5_asm3(uint32_t *state, uint32_t *src)
 321
 322  OIL_DEFINE_IMPL_ASM (md5_asm3, md5);
 323  #endif
 324 +#endif
 325
 326 --- liboil-0.3.16/liboil/i386/mult8x8_i386.c-orig       2010-04-08 10:47:27.732953570 -0500
 327 +++ liboil-0.3.16/liboil/i386/mult8x8_i386.c    2010-04-08 12:25:41.555657336 -0500
 328 @@ -35,6 +35,7 @@
 329  #include <math.h>
 330
 331
 332 +#if 0
 333  static void
 334  mult8x8_s16_mmx(int16_t *dest, int16_t *src1, int16_t *src2, int dstr, int sstr1,
 335      int sstr2)
 336 @@ -131,4 +132,5 @@ mult8x8_s16_mmx(int16_t *dest, int16_t *
 337  }
 338
 339  OIL_DEFINE_IMPL_FULL (mult8x8_s16_mmx, mult8x8_s16, OIL_IMPL_FLAG_MMX);
 340 +#endif
 341
 342 --- liboil-0.3.16/liboil/i386/abs_i386.c-orig   2010-04-08 11:31:15.033982276 -0500
 343 +++ liboil-0.3.16/liboil/i386/abs_i386.c        2010-04-08 13:13:19.334990752 -0500
 344 @@ -107,6 +107,7 @@ abs_u16_s16_i386asm2 (uint16_t * dest, i
 345  OIL_DEFINE_IMPL_FULL (abs_u16_s16_i386asm2, abs_u16_s16, OIL_IMPL_FLAG_CMOV);
 346  #endif
 347
 348 +#if 0
 349  static void
 350  abs_u16_s16_i386asm3 (uint16_t * dest, int dstr, int16_t * src, int sstr, int n)
 351  {
 352 @@ -128,6 +129,7 @@ abs_u16_s16_i386asm3 (uint16_t * dest, i
 353        : "eax", "edx");
 354  }
 355  OIL_DEFINE_IMPL_ASM (abs_u16_s16_i386asm3, abs_u16_s16);
 356 +#endif
 357
 358
 359