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

This commit is contained in:
Abdulaziz Ghuloum 2008-09-14 00:38:59 -07:00
parent 58d937c520
commit 9f2d7484ab
7 changed files with 55 additions and 150 deletions

1
c64
View File

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

102
configure vendored
View File

@ -6645,103 +6645,11 @@ fi
ac_cv_lib_gmp=ac_cv_lib_gmp_main ac_cv_lib_gmp=ac_cv_lib_gmp_main
# check that gmp exports mpn_mul # AC_ARG_ENABLE(libffi,
# unfortunately, gmp.h defines mpn_mul as a macro # [ --enable-libffi enable support for libffi.],
# that expands to __gmpn_mul on my machine. # AC_DEFINE(ENABLE_LIBFFI, 1, [adds support for libffi]))
# AC_CHECK_HEADERS([libffi.h])
{ $as_echo "$as_me:$LINENO: checking for __gmpn_mul in -lgmp" >&5 # AC_HAVE_LIBRARY([ffi])
$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
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5

View File

@ -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.so) if libgmp is installed in a non-standard location.
ERROR: libgmp can be obtained from <http://gmplib.org>. ])]) ERROR: libgmp can be obtained from <http://gmplib.org>. ])])
# check that gmp exports mpn_mul # AC_ARG_ENABLE(libffi,
# unfortunately, gmp.h defines mpn_mul as a macro # [ --enable-libffi enable support for libffi.],
# that expands to __gmpn_mul on my machine. # AC_DEFINE(ENABLE_LIBFFI, 1, [adds support for libffi]))
AC_CHECK_LIB(gmp,__gmpn_mul,,[AC_MSG_ERROR([ # AC_CHECK_HEADERS([libffi.h])
ERROR: your version of libgmp does not contain a binding for # AC_HAVE_LIBRARY([ffi])
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
])])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST

View File

@ -1 +1 @@
1597 1598

View File

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

View File

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

View File

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