fixed uint/ulong pointer ref bug (and added appropriate tests).

c64

@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 
 ./configure --prefix=/Users/ikarus/.opt \
+  --enable-libffi \
   CFLAGS="-m64 -I/Users/ikarus/.opt64/include" \
   LDFLAGS="-m64 -L/Users/ikarus/.opt64/lib" \
 && make clean \

configure

@@ -6645,103 +6645,11 @@ fi
 ac_cv_lib_gmp=ac_cv_lib_gmp_main
 
 
-# check that gmp exports mpn_mul
-# unfortunately, gmp.h defines mpn_mul as a macro
-# that expands to __gmpn_mul on my machine.
-
-{ $as_echo "$as_me:$LINENO: checking for __gmpn_mul in -lgmp" >&5
-$as_echo_n "checking for __gmpn_mul in -lgmp... " >&6; }
-if test "${ac_cv_lib_gmp___gmpn_mul+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgmp  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char __gmpn_mul ();
-int
-main ()
-{
-return __gmpn_mul ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_gmp___gmpn_mul=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gmp___gmpn_mul=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpn_mul" >&5
-$as_echo "$ac_cv_lib_gmp___gmpn_mul" >&6; }
-if test "x$ac_cv_lib_gmp___gmpn_mul" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGMP 1
-_ACEOF
-
-  LIBS="-lgmp $LIBS"
-
-else
-  { { $as_echo "$as_me:$LINENO: error:
-ERROR: your version of libgmp does not contain a binding for
-ERROR: some of the primitives that ikarus uses.  This is most
-ERROR: likely to happen if your version of gmp was compiled
-ERROR: in 64-bit mode, while ikarus expects needs the 32-bit
-ERROR: version.  Refer to the following bug report for details
-    https://bugs.launchpad.net/ikarus/+bug/159235
-" >&5
-$as_echo "$as_me: error:
-ERROR: your version of libgmp does not contain a binding for
-ERROR: some of the primitives that ikarus uses.  This is most
-ERROR: likely to happen if your version of gmp was compiled
-ERROR: in 64-bit mode, while ikarus expects needs the 32-bit
-ERROR: version.  Refer to the following bug report for details
-    https://bugs.launchpad.net/ikarus/+bug/159235
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
+# AC_ARG_ENABLE(libffi,
+#   [  --enable-libffi     enable support for libffi.],
+#   AC_DEFINE(ENABLE_LIBFFI, 1, [adds support for libffi]))
+# AC_CHECK_HEADERS([libffi.h])
+# AC_HAVE_LIBRARY([ffi])
 
 # Checks for typedefs, structures, and compiler characteristics.
 { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5

configure.ac

@@ -63,18 +63,11 @@ ERROR: the gmp.h header file), and LDFLAGS=-L</path/to/lib> (containing
 ERROR: libgmp.so) if libgmp is installed in a non-standard location.
 ERROR: libgmp can be obtained from <http://gmplib.org>. ])])
 
-# check that gmp exports mpn_mul
-# unfortunately, gmp.h defines mpn_mul as a macro
-# that expands to __gmpn_mul on my machine.
-AC_CHECK_LIB(gmp,__gmpn_mul,,[AC_MSG_ERROR([
-ERROR: your version of libgmp does not contain a binding for
-ERROR: some of the primitives that ikarus uses.  This is most
-ERROR: likely to happen if your version of gmp was compiled
-ERROR: in 64-bit mode, while ikarus expects needs the 32-bit
-ERROR: version.  Refer to the following bug report for details
-    https://bugs.launchpad.net/ikarus/+bug/159235 
-])])
-
+# AC_ARG_ENABLE(libffi,
+#   [  --enable-libffi     enable support for libffi.],
+#   AC_DEFINE(ENABLE_LIBFFI, 1, [adds support for libffi]))
+# AC_CHECK_HEADERS([libffi.h])
+# AC_HAVE_LIBRARY([ffi])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

scheme/last-revision

@@ -1 +1 @@
-1597
+1598

scheme/run-tests.ss

@@ -55,35 +55,35 @@
   (f 0 536870911000 536870911)
   (printf "[exact-integer-sqrt] Happy Happy Joy Joy\n"))
 
-;(test-bitwise-op)
-;(test-parse-flonums)
-;(test-case-folding)
-;(test-reader)
-;(test-char-syntax)
-;(test-bytevectors)
-;(test-strings)
-;(test-exact-integer-sqrt)
-;(test-bignum-to-flonum)
-;(test-bignum->flonum)
-;(test-string-to-number)
-;(test-div-and-mod)
-;(test-bignums)
-;(test-bignum-length)
-;(test-fxcarry)
-;(test-lists)
-;(test-hashtables)
-;(test-input-ports)
-;(test-bignum-conversion)
-;(test-fldiv-and-mod)
-;(test-fldiv0-and-mod0)
-;(test-fxdiv-and-mod)
-;(test-fxdiv0-and-mod0)
-;(test-fxlength)
-;(test-bitwise-bit-count)
-;(test-io)
-;(test-sorting)
-;(test-fasl)
-;(test-numerics)
-;(test-enums)
+(test-bitwise-op)
+(test-parse-flonums)
+(test-case-folding)
+(test-reader)
+(test-char-syntax)
+(test-bytevectors)
+(test-strings)
+(test-exact-integer-sqrt)
+(test-bignum-to-flonum)
+(test-bignum->flonum)
+(test-string-to-number)
+(test-div-and-mod)
+(test-bignums)
+(test-bignum-length)
+(test-fxcarry)
+(test-lists)
+(test-hashtables)
+(test-input-ports)
+(test-bignum-conversion)
+(test-fldiv-and-mod)
+(test-fldiv0-and-mod0)
+(test-fxdiv-and-mod)
+(test-fxdiv0-and-mod0)
+(test-fxlength)
+(test-bitwise-bit-count)
+(test-io)
+(test-sorting)
+(test-fasl)
+(test-numerics)
+(test-enums)
 (test-pointers)
 (printf "Happy Happy Joy Joy\n")

scheme/tests/pointers.ss

@@ -43,20 +43,23 @@
         (if (< n 0) 
             '()
             (cons (sll 1 n) (one-bit-combinations n)))))
-    (define (two-bit-combinations n)
+    (define (or* ls1 ls2)
       (apply append
         (map 
           (lambda (n1)
             (map 
               (lambda (n2)
                 (bitwise-ior n1 n2))
-              (one-bit-combinations n)))
-          (one-bit-combinations n))))
+              ls2))
+          ls1)))
     (let ([n (min bits n)])
-      (append 
-        (list 0)
-        (one-bit-combinations n)
-        (two-bit-combinations n))))
+      (let* ([ls1 (one-bit-combinations n)]
+             [ls2 (or* ls1 ls1)]
+             [ls3 (or* ls2 ls1)])
+        (append 
+          (list 0 (sub1 (sll 1 (- n 1))) (sub1 (sll 1 n))) 
+          ls1 ls2 ls3))))
+          
 
 
 

src/ikarus-pointers.c

@@ -174,9 +174,9 @@ s_to_number(signed long n, ikpcb* pcb) {
   
 static ikptr
 u_to_number(unsigned long n, ikpcb* pcb) {
-  ikptr fx = fix(n);
-  if (unfix(fx) == n) {
-    return fx;
+  unsigned long mxn = ((unsigned long)-1)>>(fx_shift+1);
+  if (n <= mxn) {
+    return fix(n);
   }
   ikptr bn = ik_safe_alloc(pcb, align(wordsize+disp_bignum_data));
   ref(bn, 0) = (ikptr)(bignum_tag | (1 << bignum_length_shift));