Mercurial > hg > xemacs-beta
comparison src/lrecord.h @ 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 | 05d62157e048 |
comparison
equal
deleted
inserted
replaced
| 2719:5f6ef2b26d9f | 2720:6fa9919a9a0b |
|---|---|
| 24 /* This file has been Mule-ized, Ben Wing, 10-13-04. */ | 24 /* This file has been Mule-ized, Ben Wing, 10-13-04. */ |
| 25 | 25 |
| 26 #ifndef INCLUDED_lrecord_h_ | 26 #ifndef INCLUDED_lrecord_h_ |
| 27 #define INCLUDED_lrecord_h_ | 27 #define INCLUDED_lrecord_h_ |
| 28 | 28 |
| 29 #ifdef MC_ALLOC | |
| 30 /* The "lrecord" type of Lisp object is used for all object types | |
| 31 other than a few simple ones (like char and int). This allows many | |
| 32 types to be implemented but only a few bits required in a Lisp | |
| 33 object for type information. (The tradeoff is that each object has | |
| 34 its type marked in it, thereby increasing its size.) All lrecords | |
| 35 begin with a `struct lrecord_header', which identifies the lisp | |
| 36 object type, by providing an index into a table of `struct | |
| 37 lrecord_implementation', which describes the behavior of the lisp | |
| 38 object. It also contains some other data bits. | |
| 39 | |
| 40 Creating a new lrecord type is fairly easy; just follow the | |
| 41 lead of some existing type (e.g. hash tables). Note that you | |
| 42 do not need to supply all the methods (see below); reasonable | |
| 43 defaults are provided for many of them. Alternatively, if you're | |
| 44 just looking for a way of encapsulating data (which possibly | |
| 45 could contain Lisp_Objects in it), you may well be able to use | |
| 46 the opaque type. | |
| 47 */ | |
| 48 #else /* not MC_ALLOC */ | |
| 29 /* The "lrecord" type of Lisp object is used for all object types | 49 /* The "lrecord" type of Lisp object is used for all object types |
| 30 other than a few simple ones. This allows many types to be | 50 other than a few simple ones. This allows many types to be |
| 31 implemented but only a few bits required in a Lisp object for type | 51 implemented but only a few bits required in a Lisp object for type |
| 32 information. (The tradeoff is that each object has its type marked | 52 information. (The tradeoff is that each object has its type marked |
| 33 in it, thereby increasing its size.) All lrecords begin with a | 53 in it, thereby increasing its size.) All lrecords begin with a |
| 57 defaults are provided for many of them. Alternatively, if you're | 77 defaults are provided for many of them. Alternatively, if you're |
| 58 just looking for a way of encapsulating data (which possibly | 78 just looking for a way of encapsulating data (which possibly |
| 59 could contain Lisp_Objects in it), you may well be able to use | 79 could contain Lisp_Objects in it), you may well be able to use |
| 60 the opaque type. --ben | 80 the opaque type. --ben |
| 61 */ | 81 */ |
| 82 #endif /* not MC_ALLOC */ | |
| 62 | 83 |
| 63 BEGIN_C_DECLS | 84 BEGIN_C_DECLS |
| 64 | 85 |
| 65 struct lrecord_header | 86 struct lrecord_header |
| 66 { | 87 { |
| 67 /* Index into lrecord_implementations_table[]. Objects that have been | 88 /* Index into lrecord_implementations_table[]. Objects that have been |
| 68 explicitly freed using e.g. free_cons() have lrecord_type_free in this | 89 explicitly freed using e.g. free_cons() have lrecord_type_free in this |
| 69 field. */ | 90 field. */ |
| 70 unsigned int type :8; | 91 unsigned int type :8; |
| 71 | 92 |
| 93 #ifdef MC_ALLOC | |
| 94 /* 1 if the object is readonly from lisp */ | |
| 95 unsigned int lisp_readonly :1; | |
| 96 | |
| 97 /* The `free' field is a flag that indicates whether this lrecord | |
| 98 is currently free or not. This is used for error checking and | |
| 99 debugging. */ | |
| 100 unsigned int free :1; | |
| 101 | |
| 102 /* The `uid' field is just for debugging/printing convenience. | |
| 103 Having this slot doesn't hurt us much spacewise, since the | |
| 104 bits are unused anyway. */ | |
| 105 unsigned int uid :22; | |
| 106 | |
| 107 #else /* not MC_ALLOC */ | |
| 72 /* If `mark' is 0 after the GC mark phase, the object will be freed | 108 /* If `mark' is 0 after the GC mark phase, the object will be freed |
| 73 during the GC sweep phase. There are 2 ways that `mark' can be 1: | 109 during the GC sweep phase. There are 2 ways that `mark' can be 1: |
| 74 - by being referenced from other objects during the GC mark phase | 110 - by being referenced from other objects during the GC mark phase |
| 75 - because it is permanently on, for c_readonly objects */ | 111 - because it is permanently on, for c_readonly objects */ |
| 76 unsigned int mark :1; | 112 unsigned int mark :1; |
| 83 /* 1 if the object is readonly from lisp */ | 119 /* 1 if the object is readonly from lisp */ |
| 84 unsigned int lisp_readonly :1; | 120 unsigned int lisp_readonly :1; |
| 85 | 121 |
| 86 unsigned int unused :21; | 122 unsigned int unused :21; |
| 87 | 123 |
| 124 #endif /* not MC_ALLOC */ | |
| 88 }; | 125 }; |
| 89 | 126 |
| 90 struct lrecord_implementation; | 127 struct lrecord_implementation; |
| 91 int lrecord_type_index (const struct lrecord_implementation *implementation); | 128 int lrecord_type_index (const struct lrecord_implementation *implementation); |
| 92 | 129 |
| 130 #ifdef MC_ALLOC | |
| 131 #define set_lheader_implementation(header,imp) do { \ | |
| 132 struct lrecord_header* SLI_header = (header); \ | |
| 133 SLI_header->type = (imp)->lrecord_type_index; \ | |
| 134 SLI_header->lisp_readonly = 0; \ | |
| 135 SLI_header->free = 0; \ | |
| 136 } while (0) | |
| 137 #else /* not MC_ALLOC */ | |
| 93 #define set_lheader_implementation(header,imp) do { \ | 138 #define set_lheader_implementation(header,imp) do { \ |
| 94 struct lrecord_header* SLI_header = (header); \ | 139 struct lrecord_header* SLI_header = (header); \ |
| 95 SLI_header->type = (imp)->lrecord_type_index; \ | 140 SLI_header->type = (imp)->lrecord_type_index; \ |
| 96 SLI_header->mark = 0; \ | 141 SLI_header->mark = 0; \ |
| 97 SLI_header->c_readonly = 0; \ | 142 SLI_header->c_readonly = 0; \ |
| 98 SLI_header->lisp_readonly = 0; \ | 143 SLI_header->lisp_readonly = 0; \ |
| 99 } while (0) | 144 } while (0) |
| 100 | 145 #endif /* not MC_ALLOC */ |
| 146 | |
| 147 #ifndef MC_ALLOC | |
| 101 struct lcrecord_header | 148 struct lcrecord_header |
| 102 { | 149 { |
| 103 struct lrecord_header lheader; | 150 struct lrecord_header lheader; |
| 104 | 151 |
| 105 /* The `next' field is normally used to chain all lcrecords together | 152 /* The `next' field is normally used to chain all lcrecords together |
| 133 struct free_lcrecord_header | 180 struct free_lcrecord_header |
| 134 { | 181 { |
| 135 struct lcrecord_header lcheader; | 182 struct lcrecord_header lcheader; |
| 136 Lisp_Object chain; | 183 Lisp_Object chain; |
| 137 }; | 184 }; |
| 185 #endif /* not MC_ALLOC */ | |
| 138 | 186 |
| 139 enum lrecord_type | 187 enum lrecord_type |
| 140 { | 188 { |
| 141 /* Symbol value magic types come first to make SYMBOL_VALUE_MAGIC_P fast. | 189 /* Symbol value magic types come first to make SYMBOL_VALUE_MAGIC_P fast. |
| 142 #### This should be replaced by a symbol_value_magic_p flag | 190 #### This should be replaced by a symbol_value_magic_p flag |
| 143 in the Lisp_Symbol lrecord_header. */ | 191 in the Lisp_Symbol lrecord_header. */ |
| 144 lrecord_type_symbol_value_forward, /* 0 */ | 192 lrecord_type_symbol_value_forward, /* 0 */ |
| 145 lrecord_type_symbol_value_varalias, /* 1 */ | 193 lrecord_type_symbol_value_varalias, /* 1 */ |
| 146 lrecord_type_symbol_value_lisp_magic, /* 2 */ | 194 lrecord_type_symbol_value_lisp_magic, /* 2 */ |
| 147 lrecord_type_symbol_value_buffer_local, /* 3 */ | 195 lrecord_type_symbol_value_buffer_local, /* 3 */ |
| 148 lrecord_type_max_symbol_value_magic = lrecord_type_symbol_value_buffer_local, | 196 lrecord_type_max_symbol_value_magic = lrecord_type_symbol_value_buffer_local, |
| 149 | 197 lrecord_type_symbol, /* 4 */ |
| 150 lrecord_type_symbol, /* 4 */ | 198 lrecord_type_subr, /* 5 */ |
| 151 lrecord_type_subr, /* 5 */ | 199 lrecord_type_cons, /* 6 */ |
| 152 lrecord_type_cons, /* 6 */ | 200 lrecord_type_vector, /* 7 */ |
| 153 lrecord_type_vector, | 201 lrecord_type_string, /* 8 */ |
| 154 lrecord_type_string, | 202 #ifndef MC_ALLOC |
| 155 lrecord_type_lcrecord_list, | 203 lrecord_type_lcrecord_list, |
| 156 lrecord_type_compiled_function, | 204 #endif /* not MC_ALLOC */ |
| 157 lrecord_type_weak_list, | 205 lrecord_type_compiled_function, /* 9 */ |
| 158 lrecord_type_bit_vector, | 206 lrecord_type_weak_list, /* 10 */ |
| 159 lrecord_type_float, | 207 lrecord_type_bit_vector, /* 11 */ |
| 160 lrecord_type_hash_table, | 208 lrecord_type_float, /* 12 */ |
| 161 lrecord_type_lstream, | 209 lrecord_type_hash_table, /* 13 */ |
| 162 lrecord_type_process, | 210 lrecord_type_lstream, /* 14 */ |
| 163 lrecord_type_charset, | 211 lrecord_type_process, /* 15 */ |
| 164 lrecord_type_coding_system, | 212 lrecord_type_charset, /* 16 */ |
| 165 lrecord_type_char_table, | 213 lrecord_type_coding_system, /* 17 */ |
| 166 lrecord_type_char_table_entry, | 214 lrecord_type_char_table, /* 18 */ |
| 167 lrecord_type_range_table, | 215 lrecord_type_char_table_entry, /* 19 */ |
| 168 lrecord_type_opaque, | 216 lrecord_type_range_table, /* 20 */ |
| 169 lrecord_type_opaque_ptr, | 217 lrecord_type_opaque, /* 21 */ |
| 170 lrecord_type_buffer, | 218 lrecord_type_opaque_ptr, /* 22 */ |
| 171 lrecord_type_extent, | 219 lrecord_type_buffer, /* 23 */ |
| 172 lrecord_type_extent_info, | 220 lrecord_type_extent, /* 24 */ |
| 173 lrecord_type_extent_auxiliary, | 221 lrecord_type_extent_info, /* 25 */ |
| 174 lrecord_type_marker, | 222 lrecord_type_extent_auxiliary, /* 26 */ |
| 175 lrecord_type_event, | 223 lrecord_type_marker, /* 27 */ |
| 176 #ifdef EVENT_DATA_AS_OBJECTS | 224 lrecord_type_event, /* 28 */ |
| 225 #ifdef EVENT_DATA_AS_OBJECTS /* not defined */ | |
| 177 lrecord_type_key_data, | 226 lrecord_type_key_data, |
| 178 lrecord_type_button_data, | 227 lrecord_type_button_data, |
| 179 lrecord_type_motion_data, | 228 lrecord_type_motion_data, |
| 180 lrecord_type_process_data, | 229 lrecord_type_process_data, |
| 181 lrecord_type_timeout_data, | 230 lrecord_type_timeout_data, |
| 182 lrecord_type_eval_data, | 231 lrecord_type_eval_data, |
| 183 lrecord_type_misc_user_data, | 232 lrecord_type_misc_user_data, |
| 184 lrecord_type_magic_eval_data, | 233 lrecord_type_magic_eval_data, |
| 185 lrecord_type_magic_data, | 234 lrecord_type_magic_data, |
| 186 #endif /* EVENT_DATA_AS_OBJECTS */ | 235 #endif /* EVENT_DATA_AS_OBJECTS */ |
| 187 lrecord_type_keymap, | 236 lrecord_type_keymap, /* 29 */ |
| 188 lrecord_type_command_builder, | 237 lrecord_type_command_builder, /* 30 */ |
| 189 lrecord_type_timeout, | 238 lrecord_type_timeout, /* 31 */ |
| 190 lrecord_type_specifier, | 239 lrecord_type_specifier, /* 32 */ |
| 191 lrecord_type_console, | 240 lrecord_type_console, /* 33 */ |
| 192 lrecord_type_device, | 241 lrecord_type_device, /* 34 */ |
| 193 lrecord_type_frame, | 242 lrecord_type_frame, /* 35 */ |
| 194 lrecord_type_window, | 243 lrecord_type_window, /* 36 */ |
| 195 lrecord_type_window_mirror, | 244 lrecord_type_window_mirror, /* 37 */ |
| 196 lrecord_type_window_configuration, | 245 lrecord_type_window_configuration, /* 38 */ |
| 197 lrecord_type_gui_item, | 246 lrecord_type_gui_item, /* 39 */ |
| 198 lrecord_type_popup_data, | 247 lrecord_type_popup_data, /* 40 */ |
| 199 lrecord_type_toolbar_button, | 248 lrecord_type_toolbar_button, /* 41 */ |
| 200 lrecord_type_scrollbar_instance, | 249 lrecord_type_scrollbar_instance, /* 42 */ |
| 201 lrecord_type_color_instance, | 250 lrecord_type_color_instance, /* 43 */ |
| 202 lrecord_type_font_instance, | 251 lrecord_type_font_instance, /* 44 */ |
| 203 lrecord_type_image_instance, | 252 lrecord_type_image_instance, /* 45 */ |
| 204 lrecord_type_glyph, | 253 lrecord_type_glyph, /* 46 */ |
| 205 lrecord_type_face, | 254 lrecord_type_face, /* 47 */ |
| 206 lrecord_type_database, | 255 lrecord_type_database, /* 48 */ |
| 207 lrecord_type_tooltalk_message, | 256 lrecord_type_tooltalk_message, /* 49 */ |
| 208 lrecord_type_tooltalk_pattern, | 257 lrecord_type_tooltalk_pattern, /* 50 */ |
| 209 lrecord_type_ldap, | 258 lrecord_type_ldap, /* 51 */ |
| 210 lrecord_type_pgconn, | 259 lrecord_type_pgconn, /* 52 */ |
| 211 lrecord_type_pgresult, | 260 lrecord_type_pgresult, /* 53 */ |
| 212 lrecord_type_devmode, | 261 lrecord_type_devmode, /* 54 */ |
| 213 lrecord_type_mswindows_dialog_id, | 262 lrecord_type_mswindows_dialog_id, /* 55 */ |
| 214 lrecord_type_case_table, | 263 lrecord_type_case_table, /* 56 */ |
| 215 lrecord_type_emacs_ffi, | 264 lrecord_type_emacs_ffi, /* 57 */ |
| 216 lrecord_type_emacs_gtk_object, | 265 lrecord_type_emacs_gtk_object, /* 58 */ |
| 217 lrecord_type_emacs_gtk_boxed, | 266 lrecord_type_emacs_gtk_boxed, /* 59 */ |
| 218 lrecord_type_weak_box, | 267 lrecord_type_weak_box, /* 60 */ |
| 219 lrecord_type_ephemeron, | 268 lrecord_type_ephemeron, /* 61 */ |
| 220 lrecord_type_bignum, | 269 lrecord_type_bignum, /* 62 */ |
| 221 lrecord_type_ratio, | 270 lrecord_type_ratio, /* 63 */ |
| 222 lrecord_type_bigfloat, | 271 lrecord_type_bigfloat, /* 64 */ |
| 272 #ifndef MC_ALLOC | |
| 223 lrecord_type_free, /* only used for "free" lrecords */ | 273 lrecord_type_free, /* only used for "free" lrecords */ |
| 224 lrecord_type_undefined, /* only used for debugging */ | 274 lrecord_type_undefined, /* only used for debugging */ |
| 225 lrecord_type_last_built_in_type /* must be last */ | 275 #endif /* not MC_ALLOC */ |
| 276 lrecord_type_last_built_in_type /* 65 */ /* must be last */ | |
| 226 }; | 277 }; |
| 227 | 278 |
| 228 extern MODULE_API int lrecord_type_count; | 279 extern MODULE_API int lrecord_type_count; |
| 229 | 280 |
| 230 struct lrecord_implementation | 281 struct lrecord_implementation |
| 287 Lisp_Object (*getprop) (Lisp_Object obj, Lisp_Object prop); | 338 Lisp_Object (*getprop) (Lisp_Object obj, Lisp_Object prop); |
| 288 int (*putprop) (Lisp_Object obj, Lisp_Object prop, Lisp_Object val); | 339 int (*putprop) (Lisp_Object obj, Lisp_Object prop, Lisp_Object val); |
| 289 int (*remprop) (Lisp_Object obj, Lisp_Object prop); | 340 int (*remprop) (Lisp_Object obj, Lisp_Object prop); |
| 290 Lisp_Object (*plist) (Lisp_Object obj); | 341 Lisp_Object (*plist) (Lisp_Object obj); |
| 291 | 342 |
| 343 #ifdef MC_ALLOC | |
| 344 /* Only one of `static_size' and `size_in_bytes_method' is non-0. */ | |
| 345 #else /* not MC_ALLOC */ | |
| 292 /* Only one of `static_size' and `size_in_bytes_method' is non-0. | 346 /* Only one of `static_size' and `size_in_bytes_method' is non-0. |
| 293 If both are 0, this type is not instantiable by basic_alloc_lcrecord(). */ | 347 If both are 0, this type is not instantiable by basic_alloc_lcrecord(). */ |
| 348 #endif /* not MC_ALLOC */ | |
| 294 Bytecount static_size; | 349 Bytecount static_size; |
| 295 Bytecount (*size_in_bytes_method) (const void *header); | 350 Bytecount (*size_in_bytes_method) (const void *header); |
| 296 | 351 |
| 297 /* The (constant) index into lrecord_implementations_table */ | 352 /* The (constant) index into lrecord_implementations_table */ |
| 298 enum lrecord_type lrecord_type_index; | 353 enum lrecord_type lrecord_type_index; |
| 299 | 354 |
| 355 #ifndef MC_ALLOC | |
| 300 /* A "basic" lrecord is any lrecord that's not an lcrecord, i.e. | 356 /* A "basic" lrecord is any lrecord that's not an lcrecord, i.e. |
| 301 one that does not have an lcrecord_header at the front and which | 357 one that does not have an lcrecord_header at the front and which |
| 302 is (usually) allocated in frob blocks. */ | 358 is (usually) allocated in frob blocks. */ |
| 303 unsigned int basic_p :1; | 359 unsigned int basic_p :1; |
| 360 #endif /* not MC_ALLOC */ | |
| 304 }; | 361 }; |
| 305 | 362 |
| 306 /* All the built-in lisp object types are enumerated in `enum lrecord_type'. | 363 /* All the built-in lisp object types are enumerated in `enum lrecord_type'. |
| 307 Additional ones may be defined by a module (none yet). We leave some | 364 Additional ones may be defined by a module (none yet). We leave some |
| 308 room in `lrecord_implementations_table' for such new lisp object types. */ | 365 room in `lrecord_implementations_table' for such new lisp object types. */ |
| 314 #define XRECORD_LHEADER_IMPLEMENTATION(obj) \ | 371 #define XRECORD_LHEADER_IMPLEMENTATION(obj) \ |
| 315 LHEADER_IMPLEMENTATION (XRECORD_LHEADER (obj)) | 372 LHEADER_IMPLEMENTATION (XRECORD_LHEADER (obj)) |
| 316 #define LHEADER_IMPLEMENTATION(lh) lrecord_implementations_table[(lh)->type] | 373 #define LHEADER_IMPLEMENTATION(lh) lrecord_implementations_table[(lh)->type] |
| 317 | 374 |
| 318 extern int gc_in_progress; | 375 extern int gc_in_progress; |
| 376 | |
| 377 #ifdef MC_ALLOC | |
| 378 #include "mc-alloc.h" | |
| 379 #endif /* MC_ALLOC */ | |
| 380 | |
| 381 #ifdef MC_ALLOC_TYPE_STATS | |
| 382 void init_lrecord_stats (void); | |
| 383 void inc_lrecord_stats (Bytecount size, const struct lrecord_header *h); | |
| 384 void dec_lrecord_stats (Bytecount size_including_overhead, | |
| 385 const struct lrecord_header *h); | |
| 386 #endif /* MC_ALLOC_TYPE_STATS */ | |
| 387 | |
| 388 #ifdef MC_ALLOC | |
| 389 /* Tell mc-alloc how to call a finalizer. */ | |
| 390 #define MC_ALLOC_CALL_FINALIZER(ptr) \ | |
| 391 { \ | |
| 392 Lisp_Object MCACF_obj = wrap_pointer_1 (ptr); \ | |
| 393 struct lrecord_header *MCACF_lheader = XRECORD_LHEADER (MCACF_obj); \ | |
| 394 if (XRECORD_LHEADER (MCACF_obj) && LRECORDP (MCACF_obj) \ | |
| 395 && !LRECORD_FREE_P (MCACF_lheader) ) \ | |
| 396 { \ | |
| 397 const struct lrecord_implementation *MCACF_implementation \ | |
| 398 = LHEADER_IMPLEMENTATION (MCACF_lheader); \ | |
| 399 if (MCACF_implementation && MCACF_implementation->finalizer) \ | |
| 400 MCACF_implementation->finalizer (ptr, 0); \ | |
| 401 } \ | |
| 402 } while (0) | |
| 403 | |
| 404 /* Tell mc-alloc how to call a finalizer for disksave. */ | |
| 405 #define MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE(ptr) \ | |
| 406 { \ | |
| 407 Lisp_Object MCACF_obj = wrap_pointer_1 (ptr); \ | |
| 408 struct lrecord_header *MCACF_lheader = XRECORD_LHEADER (MCACF_obj); \ | |
| 409 if (XRECORD_LHEADER (MCACF_obj) && LRECORDP (MCACF_obj) \ | |
| 410 && !LRECORD_FREE_P (MCACF_lheader) ) \ | |
| 411 { \ | |
| 412 const struct lrecord_implementation *MCACF_implementation \ | |
| 413 = LHEADER_IMPLEMENTATION (MCACF_lheader); \ | |
| 414 if (MCACF_implementation && MCACF_implementation->finalizer) \ | |
| 415 MCACF_implementation->finalizer (ptr, 1); \ | |
| 416 } \ | |
| 417 } while (0) | |
| 418 | |
| 419 #define LRECORD_FREE_P(ptr) \ | |
| 420 (((struct lrecord_header *) ptr)->free) | |
| 421 | |
| 422 #define MARK_LRECORD_AS_FREE(ptr) \ | |
| 423 ((void) (((struct lrecord_header *) ptr)->free = 1)) | |
| 424 | |
| 425 #define MARK_LRECORD_AS_NOT_FREE(ptr) \ | |
| 426 ((void) (((struct lrecord_header *) ptr)->free = 0)) | |
| 427 | |
| 428 #define MARKED_RECORD_P(obj) MARKED_P (obj) | |
| 429 #define MARKED_RECORD_HEADER_P(lheader) MARKED_P (lheader) | |
| 430 #define MARK_RECORD_HEADER(lheader) MARK (lheader) | |
| 431 #define UNMARK_RECORD_HEADER(lheader) UNMARK (lheader) | |
| 432 | |
| 433 #define LISP_READONLY_RECORD_HEADER_P(lheader) ((lheader)->lisp_readonly) | |
| 434 #define SET_LISP_READONLY_RECORD_HEADER(lheader) \ | |
| 435 ((void) ((lheader)->lisp_readonly = 1)) | |
| 436 #define MARK_LRECORD_AS_LISP_READONLY(ptr) \ | |
| 437 ((void) (((struct lrecord_header *) ptr)->lisp_readonly = 1)) | |
| 438 | |
| 439 #else /* not MC_ALLOC */ | |
| 440 | |
| 441 #define LRECORD_FREE_P(ptr) \ | |
| 442 (((struct lrecord_header *) ptr)->type == lrecord_type_free) | |
| 443 | |
| 444 #define MARK_LRECORD_AS_FREE(ptr) \ | |
| 445 ((void) (((struct lrecord_header *) ptr)->type = lrecord_type_free)) | |
| 319 | 446 |
| 320 #define MARKED_RECORD_P(obj) (XRECORD_LHEADER (obj)->mark) | 447 #define MARKED_RECORD_P(obj) (XRECORD_LHEADER (obj)->mark) |
| 321 #define MARKED_RECORD_HEADER_P(lheader) ((lheader)->mark) | 448 #define MARKED_RECORD_HEADER_P(lheader) ((lheader)->mark) |
| 322 #define MARK_RECORD_HEADER(lheader) ((void) ((lheader)->mark = 1)) | 449 #define MARK_RECORD_HEADER(lheader) ((void) ((lheader)->mark = 1)) |
| 323 #define UNMARK_RECORD_HEADER(lheader) ((void) ((lheader)->mark = 0)) | 450 #define UNMARK_RECORD_HEADER(lheader) ((void) ((lheader)->mark = 0)) |
| 330 SCRRH_lheader->lisp_readonly = 1; \ | 457 SCRRH_lheader->lisp_readonly = 1; \ |
| 331 SCRRH_lheader->mark = 1; \ | 458 SCRRH_lheader->mark = 1; \ |
| 332 } while (0) | 459 } while (0) |
| 333 #define SET_LISP_READONLY_RECORD_HEADER(lheader) \ | 460 #define SET_LISP_READONLY_RECORD_HEADER(lheader) \ |
| 334 ((void) ((lheader)->lisp_readonly = 1)) | 461 ((void) ((lheader)->lisp_readonly = 1)) |
| 462 #endif /* not MC_ALLOC */ | |
| 335 | 463 |
| 336 #ifdef USE_KKCC | 464 #ifdef USE_KKCC |
| 337 #define RECORD_DESCRIPTION(lheader) lrecord_memory_descriptions[(lheader)->type] | 465 #define RECORD_DESCRIPTION(lheader) lrecord_memory_descriptions[(lheader)->type] |
| 338 #else /* not USE_KKCC */ | 466 #else /* not USE_KKCC */ |
| 339 #define RECORD_MARKER(lheader) lrecord_markers[(lheader)->type] | 467 #define RECORD_MARKER(lheader) lrecord_markers[(lheader)->type] |
| 529 Lisp_Object value; | 657 Lisp_Object value; |
| 530 } htentry; | 658 } htentry; |
| 531 | 659 |
| 532 struct Lisp_Hash_Table | 660 struct Lisp_Hash_Table |
| 533 { | 661 { |
| 662 #ifdef MC_ALLOC | |
| 663 struct lrecord_header header; | |
| 664 #else | |
| 534 struct lcrecord_header header; | 665 struct lcrecord_header header; |
| 666 #endif | |
| 535 Elemcount size; | 667 Elemcount size; |
| 536 Elemcount count; | 668 Elemcount count; |
| 537 Elemcount rehash_count; | 669 Elemcount rehash_count; |
| 538 double rehash_size; | 670 double rehash_size; |
| 539 double rehash_threshold; | 671 double rehash_threshold; |
| 594 ... | 726 ... |
| 595 }; | 727 }; |
| 596 | 728 |
| 597 struct Lisp_Specifier | 729 struct Lisp_Specifier |
| 598 { | 730 { |
| 731 #ifdef MC_ALLOC | |
| 732 struct lrecord_header header; | |
| 733 #else | |
| 599 struct lcrecord_header header; | 734 struct lcrecord_header header; |
| 735 #endif | |
| 600 struct specifier_methods *methods; | 736 struct specifier_methods *methods; |
| 601 | 737 |
| 602 ... | 738 ... |
| 603 // type-specific extra data attached to a specifier | 739 // type-specific extra data attached to a specifier |
| 604 max_align_t data[1]; | 740 max_align_t data[1]; |
| 836 XD_FLAG_NO_KKCC = 1, | 972 XD_FLAG_NO_KKCC = 1, |
| 837 /* If set, pdump does not process this entry. */ | 973 /* If set, pdump does not process this entry. */ |
| 838 XD_FLAG_NO_PDUMP = 2, | 974 XD_FLAG_NO_PDUMP = 2, |
| 839 /* Indicates that this is a "default" entry in a union map. */ | 975 /* Indicates that this is a "default" entry in a union map. */ |
| 840 XD_FLAG_UNION_DEFAULT_ENTRY = 4, | 976 XD_FLAG_UNION_DEFAULT_ENTRY = 4, |
| 977 #ifndef MC_ALLOC | |
| 841 /* Indicates that this is a free Lisp object we're marking. | 978 /* Indicates that this is a free Lisp object we're marking. |
| 842 Only relevant for ERROR_CHECK_GC. This occurs when we're marking | 979 Only relevant for ERROR_CHECK_GC. This occurs when we're marking |
| 843 lcrecord-lists, where the objects have had their type changed to | 980 lcrecord-lists, where the objects have had their type changed to |
| 844 lrecord_type_free and also have had their free bit set, but we mark | 981 lrecord_type_free and also have had their free bit set, but we mark |
| 845 them as normal. */ | 982 them as normal. */ |
| 846 XD_FLAG_FREE_LISP_OBJECT = 8 | 983 XD_FLAG_FREE_LISP_OBJECT = 8 |
| 984 #endif /* not MC_ALLOC */ | |
| 847 #if 0 | 985 #if 0 |
| 848 , | 986 , |
| 849 /* Suggestions for other possible flags: */ | 987 /* Suggestions for other possible flags: */ |
| 850 | 988 |
| 851 /* Eliminate XD_UNION_DYNAMIC_SIZE and replace it with a flag, like this. */ | 989 /* Eliminate XD_UNION_DYNAMIC_SIZE and replace it with a flag, like this. */ |
| 960 MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,0,sizer,1,structtype) | 1098 MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,0,sizer,1,structtype) |
| 961 | 1099 |
| 962 #define DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,sizer,structtype) \ | 1100 #define DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,sizer,structtype) \ |
| 963 MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) | 1101 MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) |
| 964 | 1102 |
| 1103 #ifdef MC_ALLOC | |
| 1104 #define MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ | |
| 1105 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ | |
| 1106 const struct lrecord_implementation lrecord_##c_name = \ | |
| 1107 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ | |
| 1108 getprop, putprop, remprop, plist, size, sizer, \ | |
| 1109 lrecord_type_##c_name } | |
| 1110 #else /* not MC_ALLOC */ | |
| 965 #define MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ | 1111 #define MAKE_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ |
| 966 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ | 1112 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ |
| 967 const struct lrecord_implementation lrecord_##c_name = \ | 1113 const struct lrecord_implementation lrecord_##c_name = \ |
| 968 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ | 1114 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ |
| 969 getprop, putprop, remprop, plist, size, sizer, \ | 1115 getprop, putprop, remprop, plist, size, sizer, \ |
| 970 lrecord_type_##c_name, basic_p } | 1116 lrecord_type_##c_name, basic_p } |
| 1117 #endif /* not MC_ALLOC */ | |
| 971 | 1118 |
| 972 #define DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,structtype) \ | 1119 #define DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,structtype) \ |
| 973 DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,structtype) | 1120 DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,structtype) |
| 974 | 1121 |
| 975 #define DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,structtype) \ | 1122 #define DEFINE_EXTERNAL_LRECORD_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,structtype) \ |
| 979 DEFINE_EXTERNAL_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,sizer,structtype) | 1126 DEFINE_EXTERNAL_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,0,0,0,0,sizer,structtype) |
| 980 | 1127 |
| 981 #define DEFINE_EXTERNAL_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,sizer,structtype) \ | 1128 #define DEFINE_EXTERNAL_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,sizer,structtype) \ |
| 982 MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) | 1129 MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) |
| 983 | 1130 |
| 1131 #ifdef MC_ALLOC | |
| 1132 #define MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ | |
| 1133 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ | |
| 1134 int lrecord_type_##c_name; \ | |
| 1135 struct lrecord_implementation lrecord_##c_name = \ | |
| 1136 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ | |
| 1137 getprop, putprop, remprop, plist, size, sizer, \ | |
| 1138 lrecord_type_last_built_in_type } | |
| 1139 #else /* not MC_ALLOC */ | |
| 984 #define MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ | 1140 #define MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,dumpable,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ |
| 985 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ | 1141 DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ |
| 986 int lrecord_type_##c_name; \ | 1142 int lrecord_type_##c_name; \ |
| 987 struct lrecord_implementation lrecord_##c_name = \ | 1143 struct lrecord_implementation lrecord_##c_name = \ |
| 988 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ | 1144 { name, dumpable, marker, printer, nuker, equal, hash, desc, \ |
| 989 getprop, putprop, remprop, plist, size, sizer, \ | 1145 getprop, putprop, remprop, plist, size, sizer, \ |
| 990 lrecord_type_last_built_in_type, basic_p } | 1146 lrecord_type_last_built_in_type, basic_p } |
| 1147 #endif /* not MC_ALLOC */ | |
| 991 | 1148 |
| 992 #ifdef USE_KKCC | 1149 #ifdef USE_KKCC |
| 993 extern MODULE_API const struct memory_description *lrecord_memory_descriptions[]; | 1150 extern MODULE_API const struct memory_description *lrecord_memory_descriptions[]; |
| 994 | 1151 |
| 995 #define INIT_LRECORD_IMPLEMENTATION(type) do { \ | 1152 #define INIT_LRECORD_IMPLEMENTATION(type) do { \ |
| 1047 /* Steps to create a new object: | 1204 /* Steps to create a new object: |
| 1048 | 1205 |
| 1049 1. Declare the struct for your object in a header file somewhere. | 1206 1. Declare the struct for your object in a header file somewhere. |
| 1050 Remember that it must begin with | 1207 Remember that it must begin with |
| 1051 | 1208 |
| 1209 #ifdef MC_ALLOC | |
| 1210 struct lrecord_header header; | |
| 1211 #else | |
| 1052 struct lcrecord_header header; | 1212 struct lcrecord_header header; |
| 1213 #endif | |
| 1053 | 1214 |
| 1054 2. Put the "standard junk" (DECLARE_RECORD()/XFOO/etc.) below the | 1215 2. Put the "standard junk" (DECLARE_RECORD()/XFOO/etc.) below the |
| 1055 struct definition -- see below. | 1216 struct definition -- see below. |
| 1056 | 1217 |
| 1057 3. Add this header file to inline.c. | 1218 3. Add this header file to inline.c. |
| 1081 | 1242 |
| 1082 ------------------------------ in toolbar.h ----------------------------- | 1243 ------------------------------ in toolbar.h ----------------------------- |
| 1083 | 1244 |
| 1084 struct toolbar_button | 1245 struct toolbar_button |
| 1085 { | 1246 { |
| 1247 #ifdef MC_ALLOC | |
| 1248 struct lrecord_header header; | |
| 1249 #else | |
| 1086 struct lcrecord_header header; | 1250 struct lcrecord_header header; |
| 1251 #endif | |
| 1087 | 1252 |
| 1088 Lisp_Object next; | 1253 Lisp_Object next; |
| 1089 Lisp_Object frame; | 1254 Lisp_Object frame; |
| 1090 | 1255 |
| 1091 Lisp_Object up_glyph; | 1256 Lisp_Object up_glyph; |
| 1340 #define CHECK_NONRECORD(x, lisp_enum, predicate) do { \ | 1505 #define CHECK_NONRECORD(x, lisp_enum, predicate) do { \ |
| 1341 if (XTYPE (x) != lisp_enum) \ | 1506 if (XTYPE (x) != lisp_enum) \ |
| 1342 dead_wrong_type_argument (predicate, x); \ | 1507 dead_wrong_type_argument (predicate, x); \ |
| 1343 } while (0) | 1508 } while (0) |
| 1344 | 1509 |
| 1510 #ifndef MC_ALLOC | |
| 1345 /*-------------------------- lcrecord-list -----------------------------*/ | 1511 /*-------------------------- lcrecord-list -----------------------------*/ |
| 1346 | 1512 |
| 1347 struct lcrecord_list | 1513 struct lcrecord_list |
| 1348 { | 1514 { |
| 1349 struct lcrecord_header header; | 1515 struct lcrecord_header header; |
| 1452 MODULE_API void * | 1618 MODULE_API void * |
| 1453 alloc_automanaged_lcrecord (Bytecount size, | 1619 alloc_automanaged_lcrecord (Bytecount size, |
| 1454 const struct lrecord_implementation *); | 1620 const struct lrecord_implementation *); |
| 1455 #define alloc_lcrecord_type(type, lrecord_implementation) \ | 1621 #define alloc_lcrecord_type(type, lrecord_implementation) \ |
| 1456 ((type *) alloc_automanaged_lcrecord (sizeof (type), lrecord_implementation)) | 1622 ((type *) alloc_automanaged_lcrecord (sizeof (type), lrecord_implementation)) |
| 1623 | |
| 1457 void free_lcrecord (Lisp_Object rec); | 1624 void free_lcrecord (Lisp_Object rec); |
| 1458 | 1625 |
| 1459 | 1626 |
| 1460 /* Copy the data from one lcrecord structure into another, but don't | 1627 /* Copy the data from one lcrecord structure into another, but don't |
| 1461 overwrite the header information. */ | 1628 overwrite the header information. */ |
| 1470 #define zero_sized_lcrecord(lcr, size) \ | 1637 #define zero_sized_lcrecord(lcr, size) \ |
| 1471 memset ((Rawbyte *) (lcr) + sizeof (struct lcrecord_header), 0, \ | 1638 memset ((Rawbyte *) (lcr) + sizeof (struct lcrecord_header), 0, \ |
| 1472 (size) - sizeof (struct lcrecord_header)) | 1639 (size) - sizeof (struct lcrecord_header)) |
| 1473 | 1640 |
| 1474 #define zero_lcrecord(lcr) zero_sized_lcrecord (lcr, sizeof (*(lcr))) | 1641 #define zero_lcrecord(lcr) zero_sized_lcrecord (lcr, sizeof (*(lcr))) |
| 1642 | |
| 1643 #else /* MC_ALLOC */ | |
| 1644 | |
| 1645 /* How to allocate a lrecord: | |
| 1646 | |
| 1647 - If the size of the lrecord is fix, say it equals its size of its | |
| 1648 struct, then use alloc_lrecord_type. | |
| 1649 | |
| 1650 - If the size varies, i.e. it is not equal to the size of its | |
| 1651 struct, use alloc_lrecord and specify the amount of storage you | |
| 1652 need for the object. | |
| 1653 | |
| 1654 - Some lrecords, which are used totally internally, use the | |
| 1655 noseeum-* functions for the reason of debugging. | |
| 1656 | |
| 1657 - To free a Lisp_Object manually, use free_lrecord. */ | |
| 1658 | |
| 1659 void *alloc_lrecord (Bytecount size, | |
| 1660 const struct lrecord_implementation *); | |
| 1661 | |
| 1662 #define alloc_lrecord_type(type, lrecord_implementation) \ | |
| 1663 ((type *) alloc_lrecord (sizeof (type), lrecord_implementation)) | |
| 1664 | |
| 1665 void *noseeum_alloc_lrecord (Bytecount size, | |
| 1666 const struct lrecord_implementation *); | |
| 1667 | |
| 1668 #define noseeum_alloc_lrecord_type(type, lrecord_implementation) \ | |
| 1669 ((type *) noseeum_alloc_lrecord (sizeof (type), lrecord_implementation)) | |
| 1670 | |
| 1671 void free_lrecord (Lisp_Object rec); | |
| 1672 | |
| 1673 | |
| 1674 /* Copy the data from one lrecord structure into another, but don't | |
| 1675 overwrite the header information. */ | |
| 1676 | |
| 1677 #define copy_sized_lrecord(dst, src, size) \ | |
| 1678 memcpy ((char *) (dst) + sizeof (struct lrecord_header), \ | |
| 1679 (char *) (src) + sizeof (struct lrecord_header), \ | |
| 1680 (size) - sizeof (struct lrecord_header)) | |
| 1681 | |
| 1682 #define copy_lrecord(dst, src) copy_sized_lrecord (dst, src, sizeof (*(dst))) | |
| 1683 | |
| 1684 #define zero_sized_lrecord(lcr, size) \ | |
| 1685 memset ((char *) (lcr) + sizeof (struct lrecord_header), 0, \ | |
| 1686 (size) - sizeof (struct lrecord_header)) | |
| 1687 | |
| 1688 #define zero_lrecord(lcr) zero_sized_lrecord (lcr, sizeof (*(lcr))) | |
| 1689 | |
| 1690 #endif /* MC_ALLOC */ | |
| 1475 | 1691 |
| 1476 DECLARE_INLINE_HEADER ( | 1692 DECLARE_INLINE_HEADER ( |
| 1477 Bytecount | 1693 Bytecount |
| 1478 detagged_lisp_object_size (const struct lrecord_header *h) | 1694 detagged_lisp_object_size (const struct lrecord_header *h) |
| 1479 ) | 1695 ) |
| 1582 Used during startup to detect startup of dumped Emacs. */ | 1798 Used during startup to detect startup of dumped Emacs. */ |
| 1583 extern MODULE_API int initialized; | 1799 extern MODULE_API int initialized; |
| 1584 | 1800 |
| 1585 #ifdef PDUMP | 1801 #ifdef PDUMP |
| 1586 #include "dumper.h" | 1802 #include "dumper.h" |
| 1803 #ifdef MC_ALLOC | |
| 1804 #define DUMPEDP(adr) 0 | |
| 1805 #else /* not MC_ALLOC */ | |
| 1587 #define DUMPEDP(adr) ((((Rawbyte *) (adr)) < pdump_end) && \ | 1806 #define DUMPEDP(adr) ((((Rawbyte *) (adr)) < pdump_end) && \ |
| 1588 (((Rawbyte *) (adr)) >= pdump_start)) | 1807 (((Rawbyte *) (adr)) >= pdump_start)) |
| 1808 #endif /* not MC_ALLOC */ | |
| 1589 #else | 1809 #else |
| 1590 #define DUMPEDP(adr) 0 | 1810 #define DUMPEDP(adr) 0 |
| 1591 #endif | 1811 #endif |
| 1592 | 1812 |
| 1593 #define OBJECT_DUMPED_P(obj) DUMPEDP (XPNTR (obj)) | 1813 #define OBJECT_DUMPED_P(obj) DUMPEDP (XPNTR (obj)) |