Mercurial > hg > xemacs-beta
diff src/glyphs.c @ 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 | eb41da9b4469 |
children | 427a72c6ee17 |
line wrap: on
line diff
--- a/src/glyphs.c Wed Apr 24 20:16:14 2013 -0400 +++ b/src/glyphs.c Mon Jun 17 10:23:00 2013 -0600 @@ -2638,6 +2638,7 @@ check_valid_xbm_inline (Lisp_Object data) { Lisp_Object width, height, bits, args[2]; + unsigned long i_width, i_height; if (!CONSP (data) || !CONSP (XCDR (data)) || @@ -2651,22 +2652,15 @@ CHECK_STRING (bits); - if (!NATNUMP (width)) + if (!FIXNUMP (width) || XREALFIXNUM (width) < 0) invalid_argument ("Width must be a natural number", width); - if (!NATNUMP (height)) + if (!FIXNUMP (height) || XREALFIXNUM (height) < 0) invalid_argument ("Height must be a natural number", height); - args[0] = width; - args[1] = height; - - args[0] = Ftimes (countof (args), args); - args[1] = make_integer (8); - - args[0] = Fquo (countof (args), args); - args[1] = make_integer (string_char_length (bits)); - - if (!NILP (Fgtr (countof (args), args))) + i_width = (unsigned long) XREALFIXNUM (width); + i_height = (unsigned long) XREALFIXNUM (height); + if (i_width * i_height / 8UL > string_char_length (bits)) invalid_argument ("data is too short for width and height", vector3 (width, height, bits)); }