Mercurial > hg > xemacs-beta
view src/number-gmp.h @ 5146:88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-15 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (c_readonly):
* alloc.c (deadbeef_memory):
* alloc.c (make_compiled_function):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (noseeum_make_marker):
* alloc.c (ADDITIONAL_FREE_string):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* casetab.c:
* casetab.c (print_case_table):
* console.c:
* console.c (print_console):
* database.c (print_database):
* database.c (finalize_database):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (print_devmode):
* device-msw.c (finalize_devmode):
* device.c:
* device.c (print_device):
* elhash.c:
* elhash.c (print_hash_table):
* eval.c (print_multiple_value):
* eval.c (mark_multiple_value):
* events.c (deinitialize_event):
* events.c (print_event):
* events.c (event_equal):
* extents.c:
* extents.c (soe_dump):
* extents.c (soe_insert):
* extents.c (soe_delete):
* extents.c (soe_move):
* extents.c (extent_fragment_update):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* frame.c:
* frame.c (print_frame):
* free-hook.c:
* free-hook.c (check_free):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c:
* gui.c (copy_gui_item):
* hash.c:
* hash.c (NULL_ENTRY):
* hash.c (KEYS_DIFFER_P):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lrecord.h:
* lrecord.h (LISP_OBJECT_UID):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lstream.c (print_lstream):
* lstream.c (finalize_lstream):
* marker.c (print_marker):
* marker.c (marker_equal):
* mc-alloc.c (visit_all_used_page_headers):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* opaque.c (print_opaque):
* opaque.c (print_opaque_ptr):
* opaque.c (equal_opaque_ptr):
* print.c (internal_object_printer):
* print.c (enum printing_badness):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c:
* symbols.c (print_symbol_value_magic):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* window.c (print_window):
* window.c (debug_print_window):
(1) Make lrecord UID's have a separate UID space for each object.
Otherwise, with 20-bit UID's, we rapidly wrap around, especially
when common objects like conses and strings increment the UID value
for every object created. (Originally I tried making two UID spaces,
one for objects that always print readably and hence don't display
the UID, and one for other objects. But certain objects like markers
for which a UID is displayed are still generated rapidly enough that
UID overflow is a serious issue.) This also has the advantage of
making UID values smaller, hence easier to remember -- their main
purpose is to make it easier to keep track of different objects of
the same type when debugging code. Make sure we dump lrecord UID's
so that we don't have problems with pdumped and non-dumped objects
having the same UID.
(2) Display UID's consistently whenever an object (a) doesn't
consistently print readably (objects like cons and string, which
always print readably, can't display a UID), and (b) doesn't
otherwise have a unique property that makes objects of a
particular type distinguishable. (E.g. buffers didn't and still
don't print an ID, but the buffer name uniquely identifies the
buffer.) Some types, such as event, extent, compiled-function,
didn't always (or didn't ever) display an ID; others (such as
marker, extent, lstream, opaque, opaque-ptr, any object using
internal_object_printer()) used to display the actual machine
pointer instead.
(3) Rename NORMAL_LISP_OBJECT_UID to LISP_OBJECT_UID; make it work
over all Lisp objects and take a Lisp object, not a struct pointer.
(4) Some misc cleanups in alloc.c, elhash.c.
(5) Change code in events.c that "deinitializes" an event so that
it doesn't increment the event UID counter in the process. Also
use deadbeef_memory() to overwrite memory instead of doing the same
with custom code. In the process, make deadbeef_memory() in
alloc.c always available, and delete extraneous copy in mc-alloc.c.
Also capitalize all uses of 0xDEADBEEF. Similarly in elhash.c
call deadbeef_memory().
(6) Resurrect "debug SOE" code in extents.c. Make it conditional
on DEBUG_XEMACS and on a `debug-soe' variable, rather than on
SOE_DEBUG. Make it output to stderr, not stdout.
(7) Delete some custom print methods that were identical to
external_object_printer().
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 15 Mar 2010 16:35:38 -0500 |
| parents | 2fc0e2f18322 |
| children | ba07c880114a |
line wrap: on
line source
/* Definitions of numeric types for XEmacs using the GNU MP library. Copyright (C) 2004 Jerry James. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02111-1301, USA. */ /* Synched up with: Not in FSF. */ /* This library defines the following types: bignum = mpz_t ratio = mpq_t bigfloat = mpf_t */ #ifndef INCLUDED_number_gmp_h_ #define INCLUDED_number_gmp_h_ #ifdef UNO /* Uno complains about several inline functions that include conditions with assignments and side effects if we don't do this */ #undef __GNUC__ #endif #ifdef _MSC_VER /* "unary minus operator applied to unsigned type, result still unsigned": Occurs on line 1596 of gmp.h in version 4.1.4. */ #pragma warning ( disable : 4146 ) #endif #include <gmp.h> #ifdef _MSC_VER #pragma warning ( default : 4146 ) #endif typedef mpz_t bignum; typedef mpq_t ratio; typedef mpf_t bigfloat; extern void init_number_gmp(void); /********************************* Bignums **********************************/ #define HAVE_BIGNUM 1 extern gmp_randstate_t random_state; /***** Bignum: basic functions *****/ #define bignum_init(b) mpz_init (b) #define bignum_fini(b) mpz_clear (b) #define bignum_hashcode(b) mpz_get_ui (b) #define bignum_sign(b) mpz_sgn (b) #define bignum_evenp(b) mpz_even_p (b) #define bignum_oddp(b) mpz_odd_p (b) /***** Bignum: size *****/ #define bignum_fits_int_p(b) mpz_fits_sint_p (b) #define bignum_fits_uint_p(b) mpz_fits_uint_p (b) #define bignum_fits_long_p(b) mpz_fits_slong_p (b) #define bignum_fits_ulong_p(b) mpz_fits_ulong_p (b) /***** Bignum: conversions *****/ #define bignum_to_string(b,base) mpz_get_str (NULL, base, b) #define bignum_to_int(b) ((int) mpz_get_si (b)) #define bignum_to_uint(b) ((unsigned int) mpz_get_ui (b)) #define bignum_to_long(b) mpz_get_si (b) #define bignum_to_ulong(b) mpz_get_ui (b) #define bignum_to_double(b) mpz_get_d (b) /***** Bignum: converting assignments *****/ #define bignum_set(b1,b2) mpz_set (b1, b2) #define bignum_set_string(b,s,base) mpz_set_str (b, s, base) #define bignum_set_long(b,l) mpz_set_si (b, l) #define bignum_set_ulong(b,l) mpz_set_ui (b, l) #define bignum_set_double(b,f) mpz_set_d (b, f) #define bignum_set_ratio(b,r) mpz_set_q (b, r) #define bignum_set_bigfloat(b,f) mpz_set_f (b, f) /***** Bignum: comparisons *****/ #define bignum_cmp(b1,b2) mpz_cmp (b1, b2) #define bignum_lt(b1,b2) (mpz_cmp (b1, b2) < 0) #define bignum_le(b1,b2) (mpz_cmp (b1, b2) <= 0) #define bignum_eql(b1,b2) (mpz_cmp (b1, b2) == 0) #define bignum_ge(b1,b2) (mpz_cmp (b1, b2) >= 0) #define bignum_gt(b1,b2) (mpz_cmp (b1, b2) > 0) /***** Bignum: arithmetic *****/ #define bignum_neg(b,b2) mpz_neg (b, b2) #define bignum_abs(b,b2) mpz_abs (b, b2) #define bignum_add(b,b1,b2) mpz_add (b, b1, b2) #define bignum_sub(b,b1,b2) mpz_sub (b, b1, b2) #define bignum_mul(b,b1,b2) mpz_mul (b, b1, b2) #define bignum_divisible_p(b1,b2) mpz_divisible_p (b1, b2) #define bignum_div(b,b1,b2) mpz_tdiv_q (b, b1, b2) #define bignum_ceil(b,b1,b2) mpz_cdiv_q (b, b1, b2) #define bignum_floor(b,b1,b2) mpz_fdiv_q (b, b1, b2) #define bignum_mod(b,b1,b2) mpz_mod (b, b1, b2) #define bignum_pow(res,b,pow) mpz_pow_ui (res, b, pow) #define bignum_gcd(res,b1,b2) mpz_gcd (res, b1, b2) #define bignum_lcm(res,b1,b2) mpz_lcm (res, b1, b2) /***** Bignum: bit manipulations *****/ #define bignum_and(res,b1,b2) mpz_and (res, b1, b2) #define bignum_ior(res,b1,b2) mpz_ior (res, b1, b2) #define bignum_xor(res,b1,b2) mpz_xor (res, b1, b2) #define bignum_not(res,b) mpz_com (res, b) #define bignum_setbit(b,bit) mpz_setbit (b, bit) #define bignum_clrbit(b,bit) mpz_clrbit (b, bit) #define bignum_testbit(b,bit) mpz_tstbit (b, bit) #define bignum_lshift(res,b,bits) mpz_mul_2exp (res, b, bits) #define bignum_rshift(res,b,bits) mpz_fdiv_q_2exp (res, b, bits) /***** Bignum: random numbers *****/ #define bignum_random_seed(seed) gmp_randseed_ui (random_state, seed) #define bignum_random(res,limit) mpz_urandomm (res, random_state, limit) /********************************** Ratios **********************************/ #define HAVE_RATIO 1 /***** Ratio: basic functions *****/ #define ratio_init(r) mpq_init (r) #define ratio_fini(r) mpq_clear (r) #define ratio_hashcode(r) \ (mpz_get_ui (mpq_denref (r)) * mpz_get_ui (mpq_numref (r))) #define ratio_sign(r) mpq_sgn (r) #define ratio_numerator(r) mpq_numref (r) #define ratio_denominator(r) mpq_denref (r) #define ratio_canonicalize(r) mpq_canonicalize (r) /***** Ratio: conversions *****/ #define ratio_to_string(r,base) mpq_get_str (NULL, base, r) #define ratio_to_int(r) ((int) (mpq_get_d (r))) #define ratio_to_uint(r) ((unsigned int) (mpq_get_d (r))) #define ratio_to_long(r) ((long) (mpq_get_d (r))) #define ratio_to_ulong(r) ((unsigned long) (mpq_get_d (r))) #define ratio_to_double(r) mpq_get_d (r) /***** Ratio: converting assignments *****/ #define ratio_set(r1,r2) mpq_set (r1, r2) #define ratio_set_string(r,s,base) mpq_set_str (r, s, base) #define ratio_set_long(r,l) mpq_set_si (r, l, 1UL) #define ratio_set_ulong(r,l) mpq_set_ui (r, l, 1UL) #define ratio_set_double(r,f) mpq_set_d (r, f) #define ratio_set_bignum(r,b) mpq_set_z (r, b) #define ratio_set_bigfloat(r,f) mpq_set_f (r, f) #define ratio_set_long_ulong(r,num,den) mpq_set_si (r, num, den) #define ratio_set_ulong_ulong(r,num,den) mpq_set_ui (r, num, den) /* FIXME: Why does this canonicalize, but the previous 2 don't? */ #define ratio_set_bignum_bignum(r,num,den) do { \ mpz_set (mpq_numref (r), num); \ mpz_set (mpq_denref (r), den); \ mpq_canonicalize (r); \ } while (0) /***** Ratio: comparisons *****/ #define ratio_cmp(r1,r2) mpq_cmp (r1, r2) #define ratio_lt(r1,r2) (mpq_cmp (r1, r2) < 0) #define ratio_le(r1,r2) (mpq_cmp (r1, r2) <= 0) #define ratio_eql(r1,r2) mpq_equal (r1, r2) #define ratio_ge(r1,r2) (mpq_cmp (r1, r2) >= 0) #define ratio_gt(r1,r2) (mpq_cmp (r1, r2) > 0) /***** Ratio: arithmetic *****/ #define ratio_neg(q,q2) mpq_neg (q, q2) #define ratio_abs(q,q2) mpq_abs (q, q2) #define ratio_inv(q,q2) mpq_inv (q, q2) #define ratio_add(res,q1,q2) mpq_add (res, q1, q2) #define ratio_sub(res,q1,q2) mpq_sub (res, q1, q2) #define ratio_mul(res,q1,q2) mpq_mul (res, q1, q2) #define ratio_div(res,q1,q2) mpq_div (res, q1, q2) /******************************** Bigfloats *********************************/ #define HAVE_BIGFLOAT 1 /***** Bigfloat: basic functions *****/ #define bigfloat_init(f) mpf_init (f) #define bigfloat_init_prec(f,prec) mpf_init2 (f, prec) #define bigfloat_fini(f) mpf_clear (f) #define bigfloat_hashcode(f) mpf_get_ui (f) #define bigfloat_sign(f) mpf_sgn (f) #define bigfloat_get_prec(f) mpf_get_prec (f) #define bigfloat_set_prec(f, prec) mpf_set_prec (f, prec) #define bigfloat_set_default_prec(prec) mpf_set_default_prec(prec) #define bigfloat_get_default_prec() mpf_get_default_prec () /***** Bigfloat: conversions *****/ extern CIbyte *bigfloat_to_string (bigfloat f, int base); #define bigfloat_to_int(f) ((int) mpf_get_si (f)) #define bigfloat_to_uint(f) ((unsigned int) mpf_get_ui (f)) #define bigfloat_to_long(f) mpf_get_si (f) #define bigfloat_to_ulong(f) mpf_get_ui (f) #define bigfloat_to_double(f) mpf_get_d (f) /***** Bigfloat: converting assignments *****/ #define bigfloat_set(f1,f2) mpf_set (f1, f2) #define bigfloat_set_string(f,str,base) mpf_set_str (f, str, base) #define bigfloat_set_long(f,l) mpf_set_si (f, l) #define bigfloat_set_ulong(f,l) mpf_set_ui (f, l) #define bigfloat_set_double(d,f) mpf_set_d (d, f) #define bigfloat_set_bignum(f,b) mpf_set_z (f, b) #define bigfloat_set_ratio(f,r) mpf_set_q (f, r) /***** Bigfloat: comparisons *****/ #define bigfloat_cmp(f1,f2) mpf_cmp (f1, f2) #define bigfloat_lt(f1,f2) (mpf_cmp (f1, f2) < 0) #define bigfloat_le(f1,f2) (mpf_cmp (f1, f2) <= 0) #define bigfloat_eql(f1,f2) (mpf_cmp (f1, f2) == 0) #define bigfloat_eql_bits(f1,f2,bits) mpf_eq (f1, f2, bits) #define bigfloat_ge(f1,f2) (mpf_cmp (f1, f2) >= 0) #define bigfloat_gt(f1,f2) (mpf_cmp (f1, f2) > 0) /***** Bigfloat: arithmetic *****/ #define bigfloat_neg(f,f2) mpf_neg (f, f2) #define bigfloat_abs(f,f2) mpf_abs (f, f2) #define bigfloat_add(res,f1,f2) mpf_add (res, f1, f2) #define bigfloat_sub(res,f1,f2) mpf_sub (res, f1, f2) #define bigfloat_mul(res,f1,f2) mpf_mul (res, f1, f2) #define bigfloat_div(res,f1,f2) mpf_div (res, f1, f2) #define bigfloat_ceil(res,f) mpf_ceil (res, f) #define bigfloat_floor(res,f) mpf_floor (res, f) #define bigfloat_trunc(res,f) mpf_trunc (res, f) #define bigfloat_sqrt(res,f) mpf_sqrt (res, f) #define bigfloat_pow(res,f,exp) mpf_pow_ui (res, f, exp) #endif /* INCLUDED_number_gmp_h_ */