comparison src/lisp.h @ 5736:3192994c49ca

Convert C (un)signed long long values to bignums properly. This patch also does the following: - Uses make_fixnum instead of make_integer when the argument is guaranteed to be in the fixnum range. - Introduces make_unsigned_integer so that we handle unsigned values with the high bit set correctly. - Introduces conversions between bignums and (un)signed long long values. - Uses mp_set_memory_functions with the BSD MP code, if it exists. - Eliminates some unnecessary consing in the Lisp + and * implementations. - Fixes a problem with check_valid_xbm_inline(). This function is called during intialization. It calls Ftimes. When using pdump, this is a problem, because (a) the bignum code is not initialized until *after* dumping, so we don't try to dump any bignums, and (b) multiplication of integers is done inside bignums so we handle fixnum overflow correctly. I decided that an XBM file with dimensions that don't fit into fixnums is probably not something we want to try to handle anyway, and did the arithmetic with C values instead of Lisp values. Doing that broke one test, which started getting a different error message from the one it expected, so I adjusted the test to match the new reality. - Fixes a few miscellaneous bugs in the BSD MP code. See <CAHCOHQk0u0=eD1fUMHTNWi2Yh=1WgiYyCXdMbsGzHBNhdqYz4w@mail.gmail.com> in xemacs-patches, as well as followup messages.
author Jerry James <james@xemacs.org>
date Mon, 17 Jun 2013 10:23:00 -0600
parents b490ddbd42aa
children cd4f5f1f1f4c
comparison
equal deleted inserted replaced
5735:ff13c44ce0d9 5736:3192994c49ca
1675 #define GCBITS 2 1675 #define GCBITS 2
1676 #define FIXNUM_GCBITS 1 1676 #define FIXNUM_GCBITS 1
1677 1677
1678 #define FIXNUM_VALBITS (BITS_PER_EMACS_INT - FIXNUM_GCBITS) 1678 #define FIXNUM_VALBITS (BITS_PER_EMACS_INT - FIXNUM_GCBITS)
1679 #define VALBITS (BITS_PER_EMACS_INT - GCBITS) 1679 #define VALBITS (BITS_PER_EMACS_INT - GCBITS)
1680 #define MOST_POSITIVE_FIXNUM ((EMACS_INT) ((1UL << (FIXNUM_VALBITS - 1)) -1UL)) 1680 #define MOST_POSITIVE_FIXNUM_UNSIGNED ((1UL << (FIXNUM_VALBITS - 1)) -1UL)
1681 #define MOST_POSITIVE_FIXNUM ((EMACS_INT) MOST_POSITIVE_FIXNUM_UNSIGNED)
1681 #define MOST_NEGATIVE_FIXNUM (-(MOST_POSITIVE_FIXNUM) - 1) 1682 #define MOST_NEGATIVE_FIXNUM (-(MOST_POSITIVE_FIXNUM) - 1)
1682 /* WARNING: evaluates its arg twice. */ 1683 /* WARNING: evaluates its arg twice. */
1683 #define NUMBER_FITS_IN_A_FIXNUM(num) \ 1684 #define NUMBER_FITS_IN_A_FIXNUM(num) \
1684 ((num) <= MOST_POSITIVE_FIXNUM && (num) >= MOST_NEGATIVE_FIXNUM) 1685 ((num) <= MOST_POSITIVE_FIXNUM && (num) >= MOST_NEGATIVE_FIXNUM)
1686 #define UNSIGNED_NUMBER_FITS_IN_A_FIXNUM(num) \
1687 ((num) <= MOST_POSITIVE_FIXNUM_UNSIGNED)
1685 1688
1686 #ifdef USE_UNION_TYPE 1689 #ifdef USE_UNION_TYPE
1687 # include "lisp-union.h" 1690 # include "lisp-union.h"
1688 #else /* !USE_UNION_TYPE */ 1691 #else /* !USE_UNION_TYPE */
1689 # include "lisp-disunion.h" 1692 # include "lisp-disunion.h"