Mercurial > hg > xemacs-beta

comparison src/number-gmp.c @ 5736:3192994c49ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2aa9cd456ae7
children a2912073be85
comparison
equal deleted inserted replaced
5735:ff13c44ce0d9 5736:3192994c49ca
25 #include "sysproc.h" /* For qxe_getpid */ 25 #include "sysproc.h" /* For qxe_getpid */
26 26
27 static mp_exp_t float_print_min, float_print_max; 27 static mp_exp_t float_print_min, float_print_max;
28 gmp_randstate_t random_state; 28 gmp_randstate_t random_state;
29 29
30 long long
31 bignum_to_llong (const bignum b)
32 {
33 long long l;
34
35 mpz_export (&l, NULL, 1, sizeof (l), 0, 0U, b);
36 return (mpz_sgn (b) < 0) ? -l : l;
37 }
38
39 unsigned long long
40 bignum_to_ullong (const bignum b)
41 {
42 unsigned long long l;
43
44 mpz_export (&l, NULL, 1, sizeof (l), 0, 0U, b);
45 return l;
46 }
47
48 void
49 bignum_set_llong (bignum b, long long l)
50 {
51 if (l < 0LL)
52 {
53 /* This even works for LLONG_MIN. Try it! */
54 l = -l;
55 mpz_import (b, 1U, 1, sizeof (l), 0, 0U, &l);
56 mpz_neg (b, b);
57 }
58 else
59 {
60 mpz_import (b, 1U, 1, sizeof (l), 0, 0U, &l);
61 }
62 }
63
30 CIbyte * 64 CIbyte *
31 bigfloat_to_string(mpf_t f, int base) 65 bigfloat_to_string (mpf_t f, int base)
32 { 66 {
33 mp_exp_t expt; 67 mp_exp_t expt;
34 CIbyte *str = mpf_get_str (NULL, &expt, base, 0, f); 68 CIbyte *str = mpf_get_str (NULL, &expt, base, 0, f);
35 const int sign = mpf_sgn (f); 69 const int sign = mpf_sgn (f);
36 const int neg = (sign < 0) ? 1 : 0; 70 const int neg = (sign < 0) ? 1 : 0;
92 return str; 126 return str;
93 } 127 }
94 128
95 /* We need the next two functions since GNU MP insists on giving us an extra 129 /* We need the next two functions since GNU MP insists on giving us an extra
96 parameter. */ 130 parameter. */
97 static void *gmp_realloc (void *ptr, size_t UNUSED (old_size), size_t new_size) 131 static void *
132 gmp_realloc (void *ptr, size_t UNUSED (old_size), size_t new_size)
98 { 133 {
99 return xrealloc (ptr, new_size); 134 return xrealloc (ptr, new_size);
100 } 135 }
101 136
102 static void gmp_free (void *ptr, size_t UNUSED (size)) 137 static void
138 gmp_free (void *ptr, size_t UNUSED (size))
103 { 139 {
104 xfree (ptr); 140 xfree (ptr);
105 } 141 }
106 142
107 void 143 void