Mercurial > hg > xemacs-beta
view src/rangetab.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
author | crestani |
---|---|
date | Fri, 08 Apr 2005 23:11:35 +0000 |
parents | 9f70af3ac939 |
children | 861a7995b9fe |
line wrap: on
line source
/* XEmacs routines to deal with range tables. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2002, 2004 Ben Wing. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, August 1995. */ #include <config.h> #include "lisp.h" #include "rangetab.h" Lisp_Object Qrange_tablep; Lisp_Object Qrange_table; Lisp_Object Qstart_closed_end_open; Lisp_Object Qstart_open_end_open; Lisp_Object Qstart_closed_end_closed; Lisp_Object Qstart_open_end_closed; /************************************************************************/ /* Range table object */ /************************************************************************/ static enum range_table_type range_table_symbol_to_type (Lisp_Object symbol) { if (NILP (symbol)) return RANGE_START_CLOSED_END_OPEN; CHECK_SYMBOL (symbol); if (EQ (symbol, Qstart_closed_end_open)) return RANGE_START_CLOSED_END_OPEN; if (EQ (symbol, Qstart_closed_end_closed)) return RANGE_START_CLOSED_END_CLOSED; if (EQ (symbol, Qstart_open_end_open)) return RANGE_START_OPEN_END_OPEN; if (EQ (symbol, Qstart_open_end_closed)) return RANGE_START_OPEN_END_CLOSED; invalid_constant ("Unknown range table type", symbol); RETURN_NOT_REACHED (RANGE_START_CLOSED_END_OPEN); } static Lisp_Object range_table_type_to_symbol (enum range_table_type type) { switch (type) { case RANGE_START_CLOSED_END_OPEN: return Qstart_closed_end_open; case RANGE_START_CLOSED_END_CLOSED: return Qstart_closed_end_closed; case RANGE_START_OPEN_END_OPEN: return Qstart_open_end_open; case RANGE_START_OPEN_END_CLOSED: return Qstart_open_end_closed; } ABORT (); return Qnil; } /* We use a sorted array of ranges. #### We should be using the gap array stuff from extents.c. This is not hard but just requires moving that stuff out of that file. */ static Lisp_Object mark_range_table (Lisp_Object obj) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; for (i = 0; i < Dynarr_length (rt->entries); i++) mark_object (Dynarr_at (rt->entries, i).val); return Qnil; } static void print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; if (print_readably) write_fmt_string_lisp (printcharfun, "#s(range-table type %s data (", 1, range_table_type_to_symbol (rt->type)); else write_c_string (printcharfun, "#<range-table "); for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); int so, ec; if (i > 0) write_c_string (printcharfun, " "); switch (rt->type) { case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break; case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break; case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break; case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break; default: ABORT (); so = 0, ec = 0; break; } write_fmt_string (printcharfun, "%c%ld %ld%c ", print_readably ? '(' : so ? '(' : '[', (long) (rte->first - so), (long) (rte->last - ec), print_readably ? ')' : ec ? ']' : ')' ); print_internal (rte->val, printcharfun, 1); } if (print_readably) write_c_string (printcharfun, "))"); else write_fmt_string (printcharfun, " 0x%x>", rt->header.uid); } static int range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) { Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1); Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2); int i; if (Dynarr_length (rt1->entries) != Dynarr_length (rt2->entries)) return 0; for (i = 0; i < Dynarr_length (rt1->entries); i++) { struct range_table_entry *rte1 = Dynarr_atp (rt1->entries, i); struct range_table_entry *rte2 = Dynarr_atp (rt2->entries, i); if (rte1->first != rte2->first || rte1->last != rte2->last || !internal_equal (rte1->val, rte2->val, depth + 1)) return 0; } return 1; } static Hashcode range_table_entry_hash (struct range_table_entry *rte, int depth) { return HASH3 (rte->first, rte->last, internal_hash (rte->val, depth + 1)); } static Hashcode range_table_hash (Lisp_Object obj, int depth) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; int size = Dynarr_length (rt->entries); Hashcode hash = size; /* approach based on internal_array_hash(). */ if (size <= 5) { for (i = 0; i < size; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i), depth)); return hash; } /* just pick five elements scattered throughout the array. A slightly better approach would be to offset by some noise factor from the points chosen below. */ for (i = 0; i < 5; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i*size/5), depth)); return hash; } static const struct memory_description rte_description_1[] = { { XD_LISP_OBJECT, offsetof (range_table_entry, val) }, { XD_END } }; static const struct sized_memory_description rte_description = { sizeof (range_table_entry), rte_description_1 }; static const struct memory_description rted_description_1[] = { XD_DYNARR_DESC (range_table_entry_dynarr, &rte_description), { XD_END } }; static const struct sized_memory_description rted_description = { sizeof (range_table_entry_dynarr), rted_description_1 }; static const struct memory_description range_table_description[] = { { XD_BLOCK_PTR, offsetof (Lisp_Range_Table, entries), 1, { &rted_description } }, { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION ("range-table", range_table, 1, /*dumpable-flag*/ mark_range_table, print_range_table, 0, range_table_equal, range_table_hash, range_table_description, Lisp_Range_Table); /************************************************************************/ /* Range table operations */ /************************************************************************/ #ifdef ERROR_CHECK_STRUCTURES static void verify_range_table (Lisp_Range_Table *rt) { int i; for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); assert (rte->last >= rte->first); if (i > 0) assert (Dynarr_at (rt->entries, i - 1).last <= rte->first); } } #else #define verify_range_table(rt) #endif /* Look up in a range table without the Dynarr wrapper. Used also by the unified range table format. */ static Lisp_Object get_range_table (EMACS_INT pos, int nentries, struct range_table_entry *tab, Lisp_Object default_) { int left = 0, right = nentries; /* binary search for the entry. Based on similar code in extent_list_locate(). */ while (left != right) { /* RIGHT might not point to a valid entry (i.e. it's at the end of the list), so NEWPOS must round down. */ int newpos = (left + right) >> 1; struct range_table_entry *entry = tab + newpos; if (pos >= entry->last) left = newpos + 1; else if (pos < entry->first) right = newpos; else return entry->val; } return default_; } DEFUN ("range-table-p", Frange_table_p, 1, 1, 0, /* Return non-nil if OBJECT is a range table. */ (object)) { return RANGE_TABLEP (object) ? Qt : Qnil; } DEFUN ("range-table-type", Frange_table_type, 1, 1, 0, /* Return non-nil if OBJECT is a range table. */ (range_table)) { CHECK_RANGE_TABLE (range_table); return range_table_type_to_symbol (XRANGE_TABLE (range_table)->type); } DEFUN ("make-range-table", Fmake_range_table, 0, 1, 0, /* Return a new, empty range table. You can manipulate it using `put-range-table', `get-range-table', `remove-range-table', and `clear-range-table'. Range tables allow you to efficiently set values for ranges of integers. TYPE is a symbol indicating how ranges are assumed to function at their ends. It can be one of SYMBOL RANGE-START RANGE-END ------ ----------- --------- `start-closed-end-open' (the default) closed open `start-closed-end-closed' closed closed `start-open-end-open' open open `start-open-end-closed' open closed A `closed' endpoint of a range means that the number at that end is included in the range. For an `open' endpoint, the number would not be included. For example, a closed-open range from 5 to 20 would be indicated as [5, 20) where a bracket indicates a closed end and a parenthesis an open end, and would mean `all the numbers between 5 and 20', including 5 but not 20. This seems a little strange at first but is in fact extremely common in the outside world as well as in computers and makes things work sensibly. For example, if I say "there are seven days between today and next week today", I'm including today but not next week today; if I included both, there would be eight days. Similarly, there are 15 (= 20 - 5) elements in the range [5, 20), but 16 in the range [5, 20]. */ (type)) { #ifdef MC_ALLOC Lisp_Range_Table *rt = alloc_lrecord_type (Lisp_Range_Table, &lrecord_range_table); #else /* not MC_ALLOC */ Lisp_Range_Table *rt = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table); #endif /* not MC_ALLOC */ rt->entries = Dynarr_new (range_table_entry); rt->type = range_table_symbol_to_type (type); return wrap_range_table (rt); } DEFUN ("copy-range-table", Fcopy_range_table, 1, 1, 0, /* Return a new range table which is a copy of RANGE-TABLE. It will contain the same values for the same ranges as RANGE-TABLE. The values will not themselves be copied. */ (range_table)) { Lisp_Range_Table *rt, *rtnew; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); #ifdef MC_ALLOC rtnew = alloc_lrecord_type (Lisp_Range_Table, &lrecord_range_table); #else /* not MC_ALLOC */ rtnew = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table); #endif /* not MC_ALLOC */ rtnew->entries = Dynarr_new (range_table_entry); rtnew->type = rt->type; Dynarr_add_many (rtnew->entries, Dynarr_atp (rt->entries, 0), Dynarr_length (rt->entries)); return wrap_range_table (rtnew); } DEFUN ("get-range-table", Fget_range_table, 2, 3, 0, /* Find value for position POS in RANGE-TABLE. If there is no corresponding value, return DEFAULT (defaults to nil). */ (pos, range_table, default_)) { Lisp_Range_Table *rt; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (pos); return get_range_table (XINT (pos), Dynarr_length (rt->entries), Dynarr_atp (rt->entries, 0), default_); } void put_range_table (Lisp_Object table, EMACS_INT first, EMACS_INT last, Lisp_Object val) { int i; int insert_me_here = -1; Lisp_Range_Table *rt = XRANGE_TABLE (table); /* Fix up the numbers in accordance with the open/closedness to make them behave like default open/closed. */ switch (rt->type) { case RANGE_START_CLOSED_END_OPEN: break; case RANGE_START_CLOSED_END_CLOSED: last++; break; case RANGE_START_OPEN_END_OPEN: first++; break; case RANGE_START_OPEN_END_CLOSED: first++, last++; break; } if (first == last) return; if (first > last) /* This will happen if originally first == last and both ends are open. #### Should we signal an error? */ return; /* Now insert in the proper place. This gets tricky because we may be overlapping one or more existing ranges and need to fix them up. */ /* First delete all sections of any existing ranges that overlap the new range. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); /* We insert before the first range that begins at or after the new range. */ if (entry->first >= first && insert_me_here < 0) insert_me_here = i; if (entry->last < first) /* completely before the new range. */ continue; if (entry->first > last) /* completely after the new range. No more possibilities of finding overlapping ranges. */ break; /* At this point the existing ENTRY overlaps or touches the new one. */ if (entry->first < first && entry->last <= last) { /* looks like: [ NEW ) [ EXISTING ) or [ NEW ) [ EXISTING ) */ /* truncate the end off of it. */ entry->last = first; } else if (entry->first < first && entry->last > last) /* looks like: [ NEW ) [ EXISTING ) */ /* need to split this one in two. */ { struct range_table_entry insert_me_too; insert_me_too.first = last; insert_me_too.last = entry->last; insert_me_too.val = entry->val; entry->last = first; Dynarr_insert_many (rt->entries, &insert_me_too, 1, i + 1); } else if (entry->last >= last) { /* looks like: [ NEW ) [ EXISTING ) or [ NEW ) [ EXISTING ) */ /* truncate the start off of it. */ entry->first = last; } else { /* existing is entirely within new. */ Dynarr_delete_many (rt->entries, i, 1); i--; /* back up since everything shifted one to the left. */ } } /* Someone asked us to delete the range, not insert it. */ if (UNBOUNDP (val)) return; /* Now insert the new entry, maybe at the end. */ if (insert_me_here < 0) insert_me_here = i; { struct range_table_entry insert_me; insert_me.first = first; insert_me.last = last; insert_me.val = val; Dynarr_insert_many (rt->entries, &insert_me, 1, insert_me_here); } /* Now see if we can combine this entry with adjacent ones just before or after. */ if (insert_me_here > 0) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here - 1); if (EQ (val, entry->val) && entry->last == first) { entry->last = last; Dynarr_delete_many (rt->entries, insert_me_here, 1); insert_me_here--; /* We have morphed into a larger range. Update our records in case we also combine with the one after. */ first = entry->first; } } if (insert_me_here < Dynarr_length (rt->entries) - 1) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here + 1); if (EQ (val, entry->val) && entry->first == last) { entry->first = first; Dynarr_delete_many (rt->entries, insert_me_here, 1); } } } DEFUN ("put-range-table", Fput_range_table, 4, 4, 0, /* Set the value for range START .. END to be VALUE in RANGE-TABLE. */ (start, end, value, range_table)) { EMACS_INT first, last; CHECK_RANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (start); first = XINT (start); CHECK_INT_COERCE_CHAR (end); last = XINT (end); if (first > last) invalid_argument_2 ("start must be <= end", start, end); put_range_table (range_table, first, last, value); verify_range_table (XRANGE_TABLE (range_table)); return Qnil; } DEFUN ("remove-range-table", Fremove_range_table, 3, 3, 0, /* Remove the value for range START .. END in RANGE-TABLE. */ (start, end, range_table)) { return Fput_range_table (start, end, Qunbound, range_table); } DEFUN ("clear-range-table", Fclear_range_table, 1, 1, 0, /* Flush RANGE-TABLE. */ (range_table)) { CHECK_RANGE_TABLE (range_table); Dynarr_reset (XRANGE_TABLE (range_table)->entries); return Qnil; } DEFUN ("map-range-table", Fmap_range_table, 2, 2, 0, /* Map FUNCTION over entries in RANGE-TABLE, calling it with three args, the beginning and end of the range and the corresponding value. Results are guaranteed to be correct (i.e. each entry processed exactly once) if FUNCTION modifies or deletes the current entry \(i.e. passes the current range to `put-range-table' or `remove-range-table'), but not otherwise. */ (function, range_table)) { Lisp_Range_Table *rt; int i; CHECK_RANGE_TABLE (range_table); CHECK_FUNCTION (function); rt = XRANGE_TABLE (range_table); /* Do not "optimize" by pulling out the length computation below! FUNCTION may have changed the table. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); EMACS_INT first, last; Lisp_Object args[4]; int oldlen; again: first = entry->first; last = entry->last; oldlen = Dynarr_length (rt->entries); args[0] = function; args[1] = make_int (first); args[2] = make_int (last); args[3] = entry->val; Ffuncall (countof (args), args); /* Has FUNCTION removed the entry? */ if (oldlen > Dynarr_length (rt->entries) && i < Dynarr_length (rt->entries) && (first != entry->first || last != entry->last)) goto again; } return Qnil; } /************************************************************************/ /* Range table read syntax */ /************************************************************************/ static int rangetab_type_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ range_table_symbol_to_type (value); return 1; } static int rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ EXTERNAL_PROPERTY_LIST_LOOP_3 (range, data, value) { if (!INTP (range) && !CHARP (range) && !(CONSP (range) && CONSP (XCDR (range)) && NILP (XCDR (XCDR (range))) && (INTP (XCAR (range)) || CHARP (XCAR (range))) && (INTP (XCAR (XCDR (range))) || CHARP (XCAR (XCDR (range)))))) sferror ("Invalid range format", range); } return 1; } static Lisp_Object rangetab_instantiate (Lisp_Object plist) { Lisp_Object data = Qnil, type = Qnil, rangetab; PROPERTY_LIST_LOOP_3 (key, value, plist) { if (EQ (key, Qtype)) type = value; else if (EQ (key, Qdata)) data = value; else ABORT (); } rangetab = Fmake_range_table (type); { PROPERTY_LIST_LOOP_3 (range, val, data) { if (CONSP (range)) Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val, rangetab); else Fput_range_table (range, range, val, rangetab); } } return rangetab; } /************************************************************************/ /* Unified range tables */ /************************************************************************/ /* A "unified range table" is a format for storing range tables as contiguous blocks of memory. This is used by the regexp code, which needs to use range tables to properly handle [] constructs in the presence of extended characters but wants to store an entire compiled pattern as a contiguous block of memory. Unified range tables are designed so that they can be placed at an arbitrary (possibly mis-aligned) place in memory. (Dealing with alignment is a pain in the ass.) WARNING: No provisions for garbage collection are currently made. This means that there must not be any Lisp objects in a unified range table that need to be marked for garbage collection. Good candidates for objects that can go into a range table are -- numbers and characters (do not need to be marked) -- nil, t (marked elsewhere) -- charsets and coding systems (automatically marked because they are in a marked list, and can't be removed) Good but slightly less so: -- symbols (could be uninterned, but that is not likely) Somewhat less good: -- buffers, frames, devices (could get deleted) It is expected that you work with range tables in the normal format and then convert to unified format when you are done making modifications. As such, no functions are provided for modifying a unified range table. The only operations you can do to unified range tables are -- look up a value -- retrieve all the ranges in an iterative fashion */ /* The format of a unified range table is as follows: -- The first byte contains the number of bytes to skip to find the actual start of the table. This deals with alignment constraints, since the table might want to go at any arbitrary place in memory. -- The next three bytes contain the number of bytes to skip (from the *first* byte) to find the stuff after the table. It's stored in little-endian format because that's how God intended things. We don't necessarily start the stuff at the very end of the table because we want to have at least ALIGNOF (EMACS_INT) extra space in case we have to move the range table around. (It appears that some architectures don't maintain alignment when reallocing.) -- At the prescribed offset is a struct unified_range_table, containing some number of `struct range_table_entry' entries. */ struct unified_range_table { int nentries; struct range_table_entry first; }; /* Return size in bytes needed to store the data in a range table. */ int unified_range_table_bytes_needed (Lisp_Object rangetab) { return (sizeof (struct range_table_entry) * (Dynarr_length (XRANGE_TABLE (rangetab)->entries) - 1) + sizeof (struct unified_range_table) + /* ALIGNOF a struct may be too big. */ /* We have four bytes for the size numbers, and an extra four or eight bytes for making sure we get the alignment OK. */ ALIGNOF (EMACS_INT) + 4); } /* Convert a range table into unified format and store in DEST, which must be able to hold the number of bytes returned by range_table_bytes_needed(). */ void unified_range_table_copy_data (Lisp_Object rangetab, void *dest) { /* We cast to the above structure rather than just casting to char * and adding sizeof(int), because that will lead to mis-aligned data on the Alpha machines. */ struct unified_range_table *un; range_table_entry_dynarr *rted = XRANGE_TABLE (rangetab)->entries; int total_needed = unified_range_table_bytes_needed (rangetab); void *new_dest = ALIGN_PTR ((char *) dest + 4, EMACS_INT); * (char *) dest = (char) ((char *) new_dest - (char *) dest); * ((unsigned char *) dest + 1) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 2) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 3) = total_needed & 0xFF; un = (struct unified_range_table *) new_dest; un->nentries = Dynarr_length (rted); memcpy (&un->first, Dynarr_atp (rted, 0), sizeof (struct range_table_entry) * Dynarr_length (rted)); } /* Return number of bytes actually used by a unified range table. */ int unified_range_table_bytes_used (void *unrangetab) { return ((* ((unsigned char *) unrangetab + 1)) + ((* ((unsigned char *) unrangetab + 2)) << 8) + ((* ((unsigned char *) unrangetab + 3)) << 16)); } /* Make sure the table is aligned, and move it around if it's not. */ static void align_the_damn_table (void *unrangetab) { void *cur_dest = (char *) unrangetab + * (char *) unrangetab; if (cur_dest != ALIGN_PTR (cur_dest, EMACS_INT)) { int count = (unified_range_table_bytes_used (unrangetab) - 4 - ALIGNOF (EMACS_INT)); /* Find the proper location, just like above. */ void *new_dest = ALIGN_PTR ((char *) unrangetab + 4, EMACS_INT); /* memmove() works in the presence of overlapping data. */ memmove (new_dest, cur_dest, count); * (char *) unrangetab = (char) ((char *) new_dest - (char *) unrangetab); } } /* Look up a value in a unified range table. */ Lisp_Object unified_range_table_lookup (void *unrangetab, EMACS_INT pos, Lisp_Object default_) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return get_range_table (pos, un->nentries, &un->first, default_); } /* Return number of entries in a unified range table. */ int unified_range_table_nentries (void *unrangetab) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return un->nentries; } /* Return the OFFSETth range (counting from 0) in UNRANGETAB. */ void unified_range_table_get_range (void *unrangetab, int offset, EMACS_INT *min, EMACS_INT *max, Lisp_Object *val) { void *new_dest; struct unified_range_table *un; struct range_table_entry *tab; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; assert (offset >= 0 && offset < un->nentries); tab = (&un->first) + offset; *min = tab->first; *max = tab->last; *val = tab->val; } /************************************************************************/ /* Initialization */ /************************************************************************/ void syms_of_rangetab (void) { INIT_LRECORD_IMPLEMENTATION (range_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qrange_tablep); DEFSYMBOL (Qrange_table); DEFSYMBOL (Qstart_closed_end_open); DEFSYMBOL (Qstart_open_end_open); DEFSYMBOL (Qstart_closed_end_closed); DEFSYMBOL (Qstart_open_end_closed); DEFSUBR (Frange_table_p); DEFSUBR (Frange_table_type); DEFSUBR (Fmake_range_table); DEFSUBR (Fcopy_range_table); DEFSUBR (Fget_range_table); DEFSUBR (Fput_range_table); DEFSUBR (Fremove_range_table); DEFSUBR (Fclear_range_table); DEFSUBR (Fmap_range_table); } void structure_type_create_rangetab (void) { struct structure_type *st; st = define_structure_type (Qrange_table, 0, rangetab_instantiate); define_structure_type_keyword (st, Qdata, rangetab_data_validate); define_structure_type_keyword (st, Qtype, rangetab_type_validate); }