* configure.ac: bump versionliboil_0_3_1

* doc/tmpl/liboil-unused.sgml: revert patch
* doc/tmpl/liboilfuncs-doc.sgml:
* doc/xml/liboilfuncs-doc.xml:
* liboil/Makefile.am:
* liboil/simdpack/Makefile.am:
* liboil/simdpack/clip_ref.c:
* liboil/simdpack/scalaradd.c:
* liboil/simdpack/simdpack.h:

10 files changed, 101 insertions, 432 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e3bfa6..c7ffeb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2005-03-17  David Schleef  <ds@schleef.org>
 
+	* configure.ac: bump version
+
+	* doc/tmpl/liboil-unused.sgml: revert patch
+	* doc/tmpl/liboilfuncs-doc.sgml:
+	* doc/xml/liboilfuncs-doc.xml:
+	* liboil/Makefile.am:
+	* liboil/simdpack/Makefile.am:
+	* liboil/simdpack/clip_ref.c:
+	* liboil/simdpack/scalaradd.c:
+	* liboil/simdpack/simdpack.h:
+
+2005-03-17  David Schleef  <ds@schleef.org>
+
 	* examples/work/Makefile.am: yet another random change
 	* examples/work/work.c: (main): same
 	* liboil/liboilcpu.c: (test_altivec): powerpc fixes
diff --git a/configure.ac b/configure.ac
index 9b7abd4..96bf7ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(liboil,0.3.0.1)
+AC_INIT(liboil,0.3.1)
 
 AS_NANO(LIBOIL_CVS=no,LIBOIL_CVS=yes)
 
diff --git a/doc/tmpl/liboil-unused.sgml b/doc/tmpl/liboil-unused.sgml
index c424b57..40fd284 100644
--- a/doc/tmpl/liboil-unused.sgml
+++ b/doc/tmpl/liboil-unused.sgml
@@ -3209,3 +3209,81 @@ liboilfuncs
 </para>
 
 
+<!-- ##### FUNCTION oil_vectoradd_s_f32 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
+<!-- ##### FUNCTION oil_vectoradd_s_f64 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
+<!-- ##### FUNCTION oil_vectoradd_s_s16 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
+<!-- ##### FUNCTION oil_vectoradd_s_s8 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
+<!-- ##### FUNCTION oil_vectoradd_s_u16 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
+<!-- ##### FUNCTION oil_vectoradd_s_u8 ##### -->
+<para>
+
+</para>
+
+@dest: 
+@dstr: 
+@src1: 
+@sstr1: 
+@src2: 
+@sstr2: 
+@n: 
+
diff --git a/doc/tmpl/liboilfuncs-doc.sgml b/doc/tmpl/liboilfuncs-doc.sgml
index f4a36c1..5809286 100644
--- a/doc/tmpl/liboilfuncs-doc.sgml
+++ b/doc/tmpl/liboilfuncs-doc.sgml
@@ -2158,90 +2158,6 @@ Clips each element in the first source array.
 @s4_1: 
 
 
-<!-- ##### FUNCTION oil_vectoradd_s_f32 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
-<!-- ##### FUNCTION oil_vectoradd_s_f64 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
-<!-- ##### FUNCTION oil_vectoradd_s_s16 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
-<!-- ##### FUNCTION oil_vectoradd_s_s8 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
-<!-- ##### FUNCTION oil_vectoradd_s_u16 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
-<!-- ##### FUNCTION oil_vectoradd_s_u8 ##### -->
-<para>
-
-</para>
-
-@dest: 
-@dstr: 
-@src1: 
-@sstr1: 
-@src2: 
-@sstr2: 
-@n: 
-
-
 <!-- ##### FUNCTION oil_vectoradd_u16 ##### -->
 <para>
 
diff --git a/doc/xml/liboilfuncs-doc.xml b/doc/xml/liboilfuncs-doc.xml
index 43e862f..0e1353f 100644
--- a/doc/xml/liboilfuncs-doc.xml
+++ b/doc/xml/liboilfuncs-doc.xml
@@ -903,48 +903,6 @@
                                              <link linkend="int">int</link> n,
                                              const <link linkend="int8-t">int8_t</link> *s3_1,
                                              const <link linkend="int8-t">int8_t</link> *s4_1);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-f32">oil_vectoradd_s_f32</link>             (<link linkend="float">float</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="float">float</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="float">float</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-f64">oil_vectoradd_s_f64</link>             (<link linkend="double">double</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="double">double</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="double">double</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-s16">oil_vectoradd_s_s16</link>             (<link linkend="int16-t">int16_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="int16-t">int16_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="int16-t">int16_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-s8">oil_vectoradd_s_s8</link>              (<link linkend="int8-t">int8_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="int8-t">int8_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="int8-t">int8_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-u16">oil_vectoradd_s_u16</link>             (<link linkend="uint16-t">uint16_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="uint16-t">uint16_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="uint16-t">uint16_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
-<link linkend="void">void</link>        <link linkend="oil-vectoradd-s-u8">oil_vectoradd_s_u8</link>              (<link linkend="uint8-t">uint8_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="uint8-t">uint8_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="uint8-t">uint8_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);
 <link linkend="void">void</link>        <link linkend="oil-vectoradd-u16">oil_vectoradd_u16</link>               (<link linkend="uint16-t">uint16_t</link> *dest,
                                              <link linkend="int">int</link> dstr,
                                              const <link linkend="uint16-t">uint16_t</link> *src1,
@@ -5975,222 +5933,6 @@ Clips each element in the first source array.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="oil-vectoradd-s-f32"/>oil_vectoradd_s_f32 ()</title>
-<indexterm><primary>oil_vectoradd_s_f32</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_f32             (<link linkend="float">float</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="float">float</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="float">float</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="oil-vectoradd-s-f64"/>oil_vectoradd_s_f64 ()</title>
-<indexterm><primary>oil_vectoradd_s_f64</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_f64             (<link linkend="double">double</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="double">double</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="double">double</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="oil-vectoradd-s-s16"/>oil_vectoradd_s_s16 ()</title>
-<indexterm><primary>oil_vectoradd_s_s16</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_s16             (<link linkend="int16-t">int16_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="int16-t">int16_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="int16-t">int16_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="oil-vectoradd-s-s8"/>oil_vectoradd_s_s8 ()</title>
-<indexterm><primary>oil_vectoradd_s_s8</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_s8              (<link linkend="int8-t">int8_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="int8-t">int8_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="int8-t">int8_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="oil-vectoradd-s-u16"/>oil_vectoradd_s_u16 ()</title>
-<indexterm><primary>oil_vectoradd_s_u16</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_u16             (<link linkend="uint16-t">uint16_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="uint16-t">uint16_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="uint16-t">uint16_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="oil-vectoradd-s-u8"/>oil_vectoradd_s_u8 ()</title>
-<indexterm><primary>oil_vectoradd_s_u8</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_s_u8              (<link linkend="uint8-t">uint8_t</link> *dest,
-                                             <link linkend="int">int</link> dstr,
-                                             const <link linkend="uint8-t">uint8_t</link> *src1,
-                                             <link linkend="int">int</link> sstr1,
-                                             const <link linkend="uint8-t">uint8_t</link> *src2,
-                                             <link linkend="int">int</link> sstr2,
-                                             <link linkend="int">int</link> n);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>dest</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dstr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr1</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sstr2</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>n</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
 <title><anchor id="oil-vectoradd-u16"/>oil_vectoradd_u16 ()</title>
 <indexterm><primary>oil_vectoradd_u16</primary></indexterm><programlisting><link linkend="void">void</link>        oil_vectoradd_u16               (<link linkend="uint16-t">uint16_t</link> *dest,
                                              <link linkend="int">int</link> dstr,
diff --git a/liboil/Makefile.am b/liboil/Makefile.am
index 29cb701..d2d9f0d 100644
--- a/liboil/Makefile.am
+++ b/liboil/Makefile.am
@@ -114,3 +114,8 @@ liboilmarshal.c:
 liboilfuncs-doc.h:
 	./build_prototypes_doc >liboilfuncs-doc.h
 
+update:
+	./build_prototypes >liboilfuncs.h
+	./build_marshal >liboilmarshal.c
+	./build_prototypes_doc >liboilfuncs-doc.h
+
diff --git a/liboil/simdpack/Makefile.am b/liboil/simdpack/Makefile.am
index 659bd2e..f923315 100644
--- a/liboil/simdpack/Makefile.am
+++ b/liboil/simdpack/Makefile.am
@@ -23,24 +23,17 @@ c_sources = \
 	sincos_f64.c \
 	squaresum_f64.c \
 	sum_f64.c \
-	vectoradd_s.c \
 	vectoradd_f64.c
 
 if HAVE_CPU_I386
 i386_sources = \
 	abs_i386.c \
 	mult8x8_i386.c \
-	abs_sse.c \
-	scalarmult_i386.c \
-	vectoradd_s_i386.c
+	scalarmult_i386.c
 else
 i386_sources =
 endif
 
-#libsimdpack_la_abs_sse_o_CFLAGS = -msse
-#libsimdpack_la_scalaradd_o_CFLAGS = -mmmx
-#libsimdpack_la_vectoradd_s_o_CFLAGS = -mmmx -msse
-
 if HAVE_CPU_POWERPC
 powerpc_sources = \
 	abs_powerpc.c \
diff --git a/liboil/simdpack/clip_ref.c b/liboil/simdpack/clip_ref.c
index 06517a4..461edaa 100644
--- a/liboil/simdpack/clip_ref.c
+++ b/liboil/simdpack/clip_ref.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <liboil/liboilfunction.h>
-#include <liboil/liboiltest.h>
 
 #define CLIP_DEFINE_REF(type) \
 static void clip_ ## type ## _ref ( \
@@ -49,25 +48,12 @@ static void clip_ ## type ## _ref ( \
     OIL_GET(dest,i*dstr,type_ ## type) = x; \
   } \
 } \
-static void \
-clip_ ## type ## _test (OilTest *test) \
-{ \
-  type_ ## type *s2 = (type_ ## type *)(test->params[OIL_ARG_SRC2].src_data + \
-    OIL_TEST_HEADER); \
-  type_ ## type *s3 = (type_ ## type *)(test->params[OIL_ARG_SRC3].src_data + \
-    OIL_TEST_HEADER); \
-  if (*s2 > *s3) { \
-    type_ ## type tmp; \
-    tmp = *s2; *s2 = *s3; *s3 = tmp; \
-  } \
-} \
-OIL_DEFINE_CLASS_FULL(clip_ ## type, \
+OIL_DEFINE_CLASS(clip_ ## type, \
     "type_" #type " *dest, " \
     "int dstr, " \
     "type_" #type " *src, " \
     "int sstr, int n, " \
-    "type_" #type " *s2_1, type_" #type " *s3_1", \
-    clip_ ## type ## _test); \
+    "type_" #type " *s2_1, type_" #type " *s3_1"); \
 OIL_DEFINE_IMPL_REF(clip_ ## type ## _ref, clip_ ## type)
 
 CLIP_DEFINE_REF (s8);
diff --git a/liboil/simdpack/scalaradd.c b/liboil/simdpack/scalaradd.c
index 96cbe67..f5f8857 100644
--- a/liboil/simdpack/scalaradd.c
+++ b/liboil/simdpack/scalaradd.c
@@ -31,8 +31,6 @@
 
 #include <liboil/liboilfunction.h>
 #include <liboil/simdpack/simdpack.h>
-#include <liboil/liboilgcc.h>
-#include <string.h>
 
 #define SCALARADD_DEFINE_REF(type)		\
 static void scalaradd_ ## type ## _ref(		\
@@ -178,53 +176,4 @@ SCALARADD_DEFINE_UNROLL4 (f32);
 SCALARADD_DEFINE_UNROLL4 (f64);
 
 
-static void scalaradd_s8_mmx(	
-    type_s8 *dest, int dstr,		
-    type_s8 *src, int sstr,		
-    type_s8 *val, int n)			
-{
-  vec_s8 vval;
-  vec_s8 *vsrc;
-  vec_s8 *vdest;
-//  int i;
-  vsrc = (vec_s8*)src;
-  vdest = (vec_s8*)dest;
-  memset(&vval,*val,8);						
-//  for (i=0;i<8;i++) vval[i]=*val;
-  if(n&1) {					
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			\
-    OIL_INCREMENT(src, sstr);			
-  }						  
-  if(n&2) {					\
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-  }						
-  if(n&4) {					\
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-    *dest = *src + *val;			
-    OIL_INCREMENT(dest, dstr);			
-    OIL_INCREMENT(src, sstr);			
-  }						
-  n /= 8;					  
-  
-  while(n>0){					
-    *vdest = *vsrc + vval;			
-    OIL_INCREMENT(vdest,8);			
-    OIL_INCREMENT(vsrc,8);			
-    n--;					
-  }						
-}						
-OIL_DEFINE_IMPL_FULL(scalaradd_s8_mmx,scalaradd_s8,OIL_IMPL_FLAG_MMX);
+
diff --git a/liboil/simdpack/simdpack.h b/liboil/simdpack/simdpack.h
index e5fe549..5116809 100644
--- a/liboil/simdpack/simdpack.h
+++ b/liboil/simdpack/simdpack.h
@@ -128,19 +128,6 @@ OIL_DECLARE_CLASS(vectoradd_u32);
 OIL_DECLARE_CLASS(vectoradd_f32);
 OIL_DECLARE_CLASS(vectoradd_f64);
 
-
-OIL_DECLARE_CLASS(vectoradd_s_s8);
-OIL_DECLARE_CLASS(vectoradd_s_u8);
-OIL_DECLARE_CLASS(vectoradd_s_s16);
-OIL_DECLARE_CLASS(vectoradd_s_u16);
-OIL_DECLARE_CLASS(vectoradd_s_s32);
-OIL_DECLARE_CLASS(vectoradd_s_u32);
-OIL_DECLARE_CLASS(vectoradd_s_f32);
-OIL_DECLARE_CLASS(vectoradd_s_f64);
-
-
-
-
 OIL_DECLARE_CLASS(zigzag8x8_s16);