X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fforeign.test.sh;h=2e3be6c3910e537d39388764abbe877de79d20b6;hb=4e8e7b29972c51d3910951e06e8e38a671ecda88;hp=ea05cbc555fa3fdc624bb7fc87152f9bb9f91fb0;hpb=f35f14479a64dd97f93d2d91dc154bdc141d6842;p=sbcl.git

diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
index ea05cbc..2e3be6c 100644
--- a/tests/foreign.test.sh
+++ b/tests/foreign.test.sh
@@ -27,7 +27,8 @@ testfilestem=${TMPDIR:-/tmp}/sbcl-foreign-test-$$
 
 build_so() {
   echo building $1.so
-  if [ "`uname -m`" = x86_64 ]; then
+  if [ "`uname -m`" = x86_64 -o "`uname -m`" = amd64 -o \
+       "`uname -m`" = mips -o "`uname -m`" = mips64 ]; then
     CFLAGS="$CFLAGS -fPIC"
   fi
   if [ "`uname`" = Darwin ]; then
@@ -39,12 +40,62 @@ build_so() {
   ld $SO_FLAGS -o $1.so $1.o  
 }
 
-echo 'int summish(int x, int y) { return 1 + x + y; }' > $testfilestem.c
-echo 'int numberish = 42;' >> $testfilestem.c
-echo 'int nummish(int x) { return numberish + x; }' >> $testfilestem.c
-echo 'short negative_short() { return -1; }' >> $testfilestem.c
-echo 'int negative_int()     { return -2; }' >> $testfilestem.c
-echo 'long negative_long()   { return -3; }' >> $testfilestem.c
+cat > $testfilestem.c <<EOF
+int summish(int x, int y) { return 1 + x + y; }
+
+int numberish = 42;
+
+int nummish(int x) { return numberish + x; }
+
+short negative_short() { return -1; }
+int negative_int()     { return -2; }
+long negative_long()   { return -3; }
+
+long long powish(unsigned int x, unsigned int y) {
+  long long acc = 1;
+  long long xx = (long long) x;
+  for(; y != 1; y /= 2) {
+    if (y & 1) {
+      acc *= xx;
+      y -= 1;
+    }
+    xx *= xx;
+  }
+  return xx*acc;
+}
+
+float return9th(float f1, float f2, float f3, float f4, float f5, 
+		float f6, float f7, float f8, float f9, float f10, 
+		float f11, float f12) { 
+    return f9; 
+}
+
+double return9thd(double f1, double f2, double f3, double f4, double f5, 
+		  double f6, double f7, double f8, double f9, double f10,
+		  double f11, double f12) { 
+    return f9; 
+}
+
+int long_test8(int a1, int a2, int a3, int a4, int a5, 
+	       int a6, int a7, long long l1) { 
+    return (l1 == powish(2,34));
+}
+
+int long_test9(int a1, int a2, int a3, int a4, int a5, 
+	       int a6, int a7, long long l1, int a8) { 
+    return (l1 == powish(2,35));
+}
+
+int long_test2(int i1, int i2, int i3, int i4, int i5, int i6,
+	       int i7, int i8, int i9, long long l1, long long l2) {
+    return (l1 == (1 + powish(2,37)));
+}
+
+long long return_long_long() {
+    return powish(2,33);
+}
+EOF
+
 build_so $testfilestem
 
 echo 'int foo = 13;' > $testfilestem-b.c
@@ -61,7 +112,7 @@ build_so $testfilestem-c
 
 ## Foreign definitions & load
 
-cat > $testfilestem.def.lisp <<EOF
+cat > $testfilestem.base.lisp <<EOF
   (define-alien-variable environ (* c-string))
   (defvar *environ* environ)
   (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -84,6 +135,14 @@ cat > $testfilestem.def.lisp <<EOF
   (define-alien-routine "negative_int" int)
   (define-alien-routine "negative_long" long)
 
+  (define-alien-routine return9th float (input1 float) (input2 float) (input3 float) (input4 float) (input5 float) (input6 float) (input7 float) (input8 float) (input9 float) (input10 float) (input11 float) (input12 float))
+  (define-alien-routine return9thd double (f1 double) (f2 double) (f3 double) (f4 double) (f5 double) (f6 double) (f7 double) (f8 double) (f9 double) (f10 double) (f11 double) (f12 double))
+
+  (define-alien-routine long-test8 int (int1 int) (int2 int) (int3 int) (int4 int) (int5 int) (int6 int) (int7 int) (long1 (integer 64)))
+  (define-alien-routine long-test9 int (int1 int) (int2 int) (int3 int) (int4 int) (int5 int) (int6 int) (int7 int) (long1 (integer 64)) (int8 int))
+  (define-alien-routine long-test2 int (int1 int) (int2 int) (int3 int) (int4 int) (int5 int) (int6 int) (int7 int) (int8 int) (int9 int) (long1 (integer 64)) (long2 (integer 64)))
+  (define-alien-routine return-long-long (integer 64))
+
   ;; compiling this gets us the FOP-FOREIGN-DATAREF-FIXUP on
   ;; linkage-table ports
   (defvar *extern* (extern-alien "negative_short" short))
@@ -97,11 +156,10 @@ cat > $testfilestem.def.lisp <<EOF
   (assert (= (sb-sys:sap-int (alien-sap *environ*))
              (sb-sys:sap-int (alien-sap environ))))
 
-  (enable-debugger)
   ;; automagic restarts
-  (setf *debugger-hook*
+  (setf *invoke-debugger-hook*
         (lambda (condition hook)
-          (print (list :debugger-hook condition))
+          (princ condition)
           (let ((cont (find-restart 'continue condition)))
             (when cont
               (invoke-restart cont)))
@@ -109,9 +167,28 @@ cat > $testfilestem.def.lisp <<EOF
           (invoke-debugger condition)))
 EOF
 
+echo "(declaim (optimize speed))" > $testfilestem.fast.lisp
+cat $testfilestem.base.lisp >> $testfilestem.fast.lisp
+
+echo "(declaim (optimize space))" > $testfilestem.small.lisp
+cat $testfilestem.base.lisp >> $testfilestem.small.lisp
+
 # Test code
 cat > $testfilestem.test.lisp <<EOF
-  (assert (= (summish 10 20) 31))
+  ;; FIXME: currently the start/small case fails on x86/Darwin. Moving
+  ;; this NOTE definition to the base.lisp file fixes that, but obviously
+  ;; it is better fo figure out what is going on instead of doing that...
+  ;;
+  ;; Other trivialish changes that mask the error include:
+  ;; * loading the .lisp file instead of the .fasl at the save test
+  ;; * --eval 'nil' before loading the .fasl at the save test
+  ;;
+  ;; HATE.
+  (defun note (x)
+     (write-line x *standard-output*)
+     (force-output *standard-output*))
+  (note "/initial assertions")
+  (assert (= 31 (summish 10 20)))
   (assert (= 42 numberish))
   (setf numberish 13)
   (assert (= 13 numberish))
@@ -121,24 +198,35 @@ cat > $testfilestem.test.lisp <<EOF
   (assert (= -2 (negative-int)))
   (assert (= -3 (negative-long)))
 
-  (print :stage-1)
+  (assert (= 9.0s0 (return9th 1.0s0 2.0s0 3.0s0 4.0s0 5.0s0 6.0s0 7.0s0 8.0s0 9.0s0 10.0s0 11.0s0 12.0s0)))
+  (assert (= 9.0d0 (return9thd 1.0d0 2.0d0 3.0d0 4.0d0 5.0d0 6.0d0 7.0d0 8.0d0 9.0d0 10.0d0 11.0d0 12.0d0)))
+
+  (assert (= 1 (long-test8 1 2 3 4 5 6 7 (ash 1 34))))
+  (assert (= 1 (long-test9 1 2 3 4 5 6 7 (ash 1 35) 8)))
+  (assert (= 1 (long-test2 1 2 3 4 5 6 7 8 9 (+ 1 (ash 1 37)) 15)))
+  (assert (= (ash 1 33) (return-long-long)))
+
+  (note "/initial assertions ok")
 
   ;; test reloading object file with new definitions
   (assert (= 13 foo))
   (assert (= 42 (bar)))
+  (note "/original definitions ok")
   (rename-file "$testfilestem-b.so" "$testfilestem-b.bak")
   (rename-file "$testfilestem-b2.so" "$testfilestem-b.so")
   (load-shared-object "$testfilestem-b.so")
+  (note "/reloading ok")
   (assert (= 42 foo))
   (assert (= 13 (bar)))
+  (note "/redefined versions ok")
   (rename-file "$testfilestem-b.so" "$testfilestem-b2.so")
   (rename-file "$testfilestem-b.bak" "$testfilestem-b.so")
-
-  (print :stage-2)
+  (note "/renamed back to originals")
 
   ;; test late resolution
   #+linkage-table
   (progn
+    (note "/starting linkage table tests")
     (define-alien-variable late-foo int)
     (define-alien-routine late-bar int)
     (multiple-value-bind (val err) (ignore-errors late-foo)
@@ -149,60 +237,79 @@ cat > $testfilestem.test.lisp <<EOF
       (assert (typep err 'undefined-alien-error)))
     (load-shared-object "$testfilestem-c.so")
     (assert (= 43 late-foo))
-    (assert (= 14 (late-bar))))
-
-  (print :stage-3)
+    (assert (= 14 (late-bar)))
+    (note "/linkage table ok"))
 
   (sb-ext:quit :unix-status 52) ; success convention for Lisp program
 EOF
 
-${SBCL:-sbcl} --eval "(progn (load (compile-file #p\"$testfilestem.def.lisp\")) (sb-ext:quit :unix-status 52))"
-if [ $? = 52 ]; then
-    true # nop
-else
-    # we can't compile the test file. something's wrong.
-    rm $testfilestem.*
-    echo test failed: $?
-    exit 1
-fi
-
-echo compile ok
+test_compile() {
+    ${SBCL:-sbcl} --eval "(progn (load (compile-file #p\"$testfilestem.$1.lisp\")) (sb-ext:quit :unix-status 52))"
+    if [ $? = 52 ]; then
+        echo test compile $1 ok
+    else
+        # we can't compile the test file. something's wrong.
+        # rm $testfilestem.*
+        echo test compile $1 failed: $?
+	exit 1
+    fi
+}
 
-${SBCL:-sbcl} --load $testfilestem.def.fasl --load $testfilestem.test.lisp
-RET=$?
-if [ $RET = 22 ]; then
-    rm $testfilestem.*
-    exit $PUNT # success -- load-shared-object not supported
-elif [ $RET != 52 ]; then
-    rm $testfilestem.*
-    echo test failed: $?
-    exit 1
-fi
+test_compile fast
+test_compile small
+
+test_use() {
+    ${SBCL:-sbcl} --load $testfilestem.$1.fasl --load $testfilestem.test.lisp
+    RET=$?
+    if [ $RET = 22 ]; then
+	rm $testfilestem.*
+	exit $PUNT # success -- load-shared-object not supported
+    elif [ $RET != 52 ]; then
+	rm $testfilestem.*
+	echo test use $1 failed: $?
+	exit 1
+    else
+	echo test use $1 ok
+    fi
+}
 
-echo load ok
+test_use small
+test_use fast
 
-${SBCL:-sbcl} --load $testfilestem.def.fasl --eval "(when (member :linkage-table *features*) (save-lisp-and-die \"$testfilestem.core\"))" <<EOF
+test_save() {
+    echo testing save $1 
+    ${SBCL:-sbcl} --load $testfilestem.$1.fasl --eval "#+linkage-table (save-lisp-and-die \"$testfilestem.$1.core\") #-linkage-table nil" <<EOF
   (sb-ext:quit :unix-status 22) ; catch this
 EOF
-if [ $? = 22 ]; then
-    rm $testfilestem.*
-    exit $PUNT # success -- linkage-table not available
-fi
-
-echo table ok
+    if [ $? = 22 ]; then
+	rm $testfilestem.*
+	exit $PUNT # success -- linkage-table not available
+    else
+	echo save $1 ok
+    fi
+}
 
-${SBCL_ALLOWING_CORE:-sbcl} --core $testfilestem.core --sysinit /dev/null --userinit /dev/null --load $testfilestem.test.lisp
-if [ $? != 52 ]; then
-    rm $testfilestem.*
-    echo test failed: $?
-    exit 1 # Failure
-fi
+test_save small
+test_save fast
+
+test_start() {
+    echo testing start $1
+    ${SBCL_ALLOWING_CORE:-sbcl} --core $testfilestem.$1.core --sysinit /dev/null --userinit /dev/null --load $testfilestem.test.lisp
+    if [ $? != 52 ]; then
+	rm $testfilestem.*
+	echo test failed: $?
+	exit 1 # Failure
+    else
+	echo test start $1 ok
+    fi
+}
 
-echo start ok
+test_start fast
+test_start small
 
 # missing object file
 rm $testfilestem-b.so $testfilestem-b2.so
-${SBCL_ALLOWING_CORE:-sbcl} --core $testfilestem.core --sysinit /dev/null --userinit /dev/null <<EOF
+${SBCL_ALLOWING_CORE:-sbcl} --core $testfilestem.fast.core --sysinit /dev/null --userinit /dev/null <<EOF
   (assert (= 22 (summish 10 11)))
   (multiple-value-bind (val err) (ignore-errors (eval 'foo))
     (assert (not val))
@@ -218,7 +325,7 @@ if [ $? != 52 ]; then
     exit 1 # Failure
 fi
 
-echo missing ok
+echo missing .so ok
 
 rm -f $testfilestem.* $testfilestem-*