[xiph-commits] r8836 - in trunk/speex: . libspeex

[jm at motherfish-iii.xiph.org]

Author: jm
Date: 2005-02-04 23:42:25 -0800 (Fri, 04 Feb 2005)
New Revision: 8836

Added:
   trunk/speex/libspeex/fixed_arm5e.h
Modified:
   trunk/speex/configure.ac
   trunk/speex/libspeex/Makefile.am
   trunk/speex/libspeex/arch.h
   trunk/speex/libspeex/filters.c
Log:
Renamed --enable-arm-asm to --enable-arm5e-asm to reflect the fact that these
instructions aren't supported everywhere. Also added --enable-arm4-asm.


Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2005-02-05 06:37:23 UTC (rev 8835)
+++ trunk/speex/configure.ac	2005-02-05 07:42:25 UTC (rev 8836)
@@ -75,11 +75,16 @@
   AC_DEFINE([FIXED_POINT], , [Compile as fixed-point])
 fi])
 
-AC_ARG_ENABLE(arm-asm, [  --enable-arm-asm        make use of ARM assembly instructions],
+AC_ARG_ENABLE(arm4-asm, [  --enable-arm4-asm        make use of ARM4 assembly instructions],
 [if test "$enableval" = yes; then
-  AC_DEFINE([ARM_ASM], , [Make use of ARM assembly instructions])
+  AC_DEFINE([ARM4_ASM], , [Make use of ARM4 assembly instructions])
 fi])
 
+AC_ARG_ENABLE(arm5e-asm, [  --enable-arm5e-asm        make use of ARM5E assembly instructions],
+[if test "$enableval" = yes; then
+  AC_DEFINE([ARM5_ASM], , [Make use of ARM5E assembly instructions])
+fi])
+
 AC_ARG_ENABLE(fixed-point-debug, [  --enable-fixed-point-debug  Debug fixed-point implementation],
 [if test "$enableval" = yes; then
   AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])

Modified: trunk/speex/libspeex/Makefile.am
===================================================================
--- trunk/speex/libspeex/Makefile.am	2005-02-05 06:37:23 UTC (rev 8835)
+++ trunk/speex/libspeex/Makefile.am	2005-02-05 07:42:25 UTC (rev 8836)
@@ -63,7 +63,7 @@
 	math_approx.h \
 	smallft.h \
 	arch.h \
-	fixed_arm.h \
+	fixed_arm5e.h \
 	fixed_debug.h \
 	fixed_generic.h \
 	cb_search_sse.h

Modified: trunk/speex/libspeex/arch.h
===================================================================
--- trunk/speex/libspeex/arch.h	2005-02-05 06:37:23 UTC (rev 8835)
+++ trunk/speex/libspeex/arch.h	2005-02-05 07:42:25 UTC (rev 8836)
@@ -64,8 +64,8 @@
 #define VERY_SMALL 0
 
 
-#ifdef ARM_ASM
-#include "fixed_arm.h"
+#ifdef ARM5E_ASM
+#include "fixed_arm5e.h"
 #elif defined (FIXED_DEBUG)
 #include "fixed_debug.h"
 #else

Modified: trunk/speex/libspeex/filters.c
===================================================================
--- trunk/speex/libspeex/filters.c	2005-02-05 06:37:23 UTC (rev 8835)
+++ trunk/speex/libspeex/filters.c	2005-02-05 07:42:25 UTC (rev 8836)
@@ -187,7 +187,7 @@
    return SHR(SHL((spx_word32_t)spx_sqrt(1+DIV32(sum,len)),(sig_shift+3)),SIG_SHIFT);
 }
 
-#ifdef ARM4_ASM
+#if defined(ARM4_ASM) || defined(ARM5E_ASM)
 void filter_mem2(const spx_sig_t *x, const spx_coef_t *num, const spx_coef_t *den, spx_sig_t *y, int N, int ord, spx_mem_t *mem)
 {
    int i,j;

Copied: trunk/speex/libspeex/fixed_arm5e.h (from rev 8827, trunk/speex/libspeex/fixed_arm.h)