summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-08-15 23:59:13 +0000
committerDavid Schleef <ds@schleef.org>2005-08-15 23:59:13 +0000
commitc823f1e1bcb79885d6bf2494882dd59619fa1357 (patch)
tree6e50f9a438d989ab98f88631c3748487c802eef0
parent8580401aada75c91422d9ee4f2c055534105e434 (diff)
downloadliboil-c823f1e1bcb79885d6bf2494882dd59619fa1357.tar.gz
* liboil/powerpc/Makefile.am: disable fdct8x8theora_altivec.c,
because it doesn't compile. * liboil/powerpc/recon8x8_ppc.c: (recon8x8_inter_ppc), (recon8x8_inter2_ppc): disable functions, because they cause bus errors. * liboil/simdpack/clip_fast.c: (clip_s16_fast2): Fix endpoint problem. * testsuite/Makefile.am: remove unused GLIB flags
-rw-r--r--ChangeLog11
-rw-r--r--liboil/powerpc/Makefile.am3
-rw-r--r--liboil/powerpc/recon8x8_ppc.c11
-rw-r--r--liboil/simdpack/clip_fast.c1
-rw-r--r--testsuite/Makefile.am17
5 files changed, 28 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 578ed5d..e677ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2005-08-15 David Schleef <ds@schleef.org>
+ * liboil/powerpc/Makefile.am: disable fdct8x8theora_altivec.c,
+ because it doesn't compile.
+ * liboil/powerpc/recon8x8_ppc.c: (recon8x8_inter_ppc),
+ (recon8x8_inter2_ppc): disable functions, because they cause
+ bus errors.
+ * liboil/simdpack/clip_fast.c: (clip_s16_fast2): Fix endpoint
+ problem.
+ * testsuite/Makefile.am: remove unused GLIB flags
+
+2005-08-15 David Schleef <ds@schleef.org>
+
* liboil/i386/Makefile.am: compile empty file on non-i386
* liboil/motovec/motovec.c: get underscore conditional correctly
diff --git a/liboil/powerpc/Makefile.am b/liboil/powerpc/Makefile.am
index f49fcc5..02ffc67 100644
--- a/liboil/powerpc/Makefile.am
+++ b/liboil/powerpc/Makefile.am
@@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libpowerpc.la
sources = \
recon8x8_ppc.c \
- fdct8x8theora_altivec.c \
recon8x8_altivec.c
if HAVE_CPU_POWERPC
@@ -14,5 +13,5 @@ endif
libpowerpc_la_SOURCES = \
$(powerpc_sources)
-libpowerpc_la_CFLAGS = $(LIBOIL_CFLAGS) -fasm-blocks
+libpowerpc_la_CFLAGS = $(LIBOIL_CFLAGS) -maltivec -mabi=altivec -fasm-blocks
diff --git a/liboil/powerpc/recon8x8_ppc.c b/liboil/powerpc/recon8x8_ppc.c
index 53c74b5..0983deb 100644
--- a/liboil/powerpc/recon8x8_ppc.c
+++ b/liboil/powerpc/recon8x8_ppc.c
@@ -42,6 +42,7 @@ OIL_DECLARE_CLASS (recon8x8_inter2);
static const __attribute__ ((aligned(8),used)) uint64_t V128 = 0x8080808080808080LL;
+#ifdef ENABLE_BROKEN_IMPLS
static void
/* r3, r4, r5 */
recon8x8_intra_ppc (uint8_t *dest, int16_t *change, int ds)
@@ -174,7 +175,9 @@ L8:
}
OIL_DEFINE_IMPL_FULL (recon8x8_intra_ppc, recon8x8_intra, OIL_IMPL_FLAG_ASM);
+#endif
+#ifdef ENABLE_BROKEN_IMPLS
static void /* r3, r4, r5, r6 */
recon8x8_inter_ppc (uint8_t *dest, uint8_t *src, int16_t *change, int dss)
{
@@ -326,9 +329,10 @@ L8:
}
}
-
OIL_DEFINE_IMPL_FULL (recon8x8_inter_ppc, recon8x8_inter, OIL_IMPL_FLAG_ASM);
+#endif
+#ifdef ENABLE_BROKEN_IMPLS
static void /* r3, r4, r5, r6, r7 */
recon8x8_inter2_ppc (uint8_t *dest, uint8_t *s1, uint8_t *s2, int16_t *change, int dsss)
{
@@ -345,7 +349,8 @@ recon8x8_inter2_ppc (uint8_t *dest, uint8_t *s1, uint8_t *s2, int16_t *change, i
mr r5,r7 ;//same reg usage as intra
li r24,0x0101
- li r23,0xfefe
+ //li r23,0xfefe
+ li r23,-258
insrwi r23,r23,16,0 ;//0xfefefefe
insrwi r24,r24,16,0 ;//0x01010101
@@ -524,3 +529,5 @@ L8:
}
OIL_DEFINE_IMPL_FULL (recon8x8_inter2_ppc, recon8x8_inter2, OIL_IMPL_FLAG_ASM);
+#endif
+
diff --git a/liboil/simdpack/clip_fast.c b/liboil/simdpack/clip_fast.c
index 7c4a5ed..d132cb8 100644
--- a/liboil/simdpack/clip_fast.c
+++ b/liboil/simdpack/clip_fast.c
@@ -64,6 +64,7 @@ clip_s16_fast2 (int16_t *dest, int dstr, int16_t *src, int sstr, int n,
x1 -= (((x1-*low)>>31)&(x1-*low));
*dest = x1 + (((*hi-x1)>>31)&(*hi-x1));
OIL_INCREMENT(dest,dstr);
+ n--;
}
while(n>0){
x1 = *src;
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index db7c347..a782ac6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,18 +1,13 @@
SUBDIRS = instruction
-if HAVE_GLIB
-glib_programs = abs md5 md5_profile trans copy
-else
-glib_programs =
-endif
+programs = moo introspect proto1 proto2 test1 proto3 proto4 stride \
+ dso_check abs md5 md5_profile trans copy
-programs = moo introspect proto1 proto2 test1 proto3 proto4 stride dso_check
+check_PROGRAMS = $(programs)
-check_PROGRAMS = $(programs) $(glib_programs)
+TESTS = $(programs)
-TESTS = $(programs) $(glib_programs)
-
-AM_LDFLAGS = $(LIBOIL_LIBS) $(GLIB_LIBS)
-AM_CFLAGS = $(LIBOIL_CFLAGS) $(GLIB_CFLAGS)
+AM_LDFLAGS = $(LIBOIL_LIBS)
+AM_CFLAGS = $(LIBOIL_CFLAGS)