Mercurial > hg > xemacs-beta
annotate src/symeval.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 | 543769b89fed |
| children | 520c08f04735 |
| rev | line source |
|---|---|
| 428 | 1 /* Definitions of symbol-value forwarding for XEmacs Lisp interpreter. |
| 2 Copyright (C) 1985, 1986, 1987, 1992, 1993 Free Software Foundation, Inc. | |
| 793 | 3 Copyright (C) 2000, 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Fsymbol_value checks whether XSYMBOL (sym)->value is one of these, | |
| 25 * and does weird magic stuff if so */ | |
| 26 | |
| 440 | 27 #ifndef INCLUDED_symeval_h_ |
| 28 #define INCLUDED_symeval_h_ | |
| 428 | 29 |
| 1743 | 30 BEGIN_C_DECLS |
| 1650 | 31 |
| 428 | 32 enum symbol_value_type |
| 33 { | |
| 34 /* The following tags use the 'symbol_value_forward' structure | |
| 35 and are strictly for variables DEFVARed on the C level. */ | |
| 458 | 36 SYMVAL_FIXNUM_FORWARD, /* Forward C "Fixnum", really "EMACS_INT" */ |
| 428 | 37 SYMVAL_CONST_FIXNUM_FORWARD, /* Same, but can't be set */ |
| 38 SYMVAL_BOOLEAN_FORWARD, /* Forward C boolean ("int") */ | |
| 39 SYMVAL_CONST_BOOLEAN_FORWARD, /* Same, but can't be set */ | |
| 40 SYMVAL_OBJECT_FORWARD, /* Forward C Lisp_Object */ | |
| 41 SYMVAL_CONST_OBJECT_FORWARD, /* Same, but can't be set */ | |
| 42 SYMVAL_CONST_SPECIFIER_FORWARD, /* Same, can't be set, but gives a | |
| 43 different message when attempting to | |
| 44 set that says "use set-specifier" */ | |
| 45 SYMVAL_DEFAULT_BUFFER_FORWARD, /* Forward Lisp_Object into Vbuffer_defaults */ | |
| 46 SYMVAL_CURRENT_BUFFER_FORWARD, /* Forward Lisp_Object into current_buffer */ | |
| 47 SYMVAL_CONST_CURRENT_BUFFER_FORWARD, /* Forward Lisp_Object into | |
| 48 current_buffer, can't be set */ | |
| 49 SYMVAL_DEFAULT_CONSOLE_FORWARD, /* Forward Lisp_Object into | |
| 50 Vconsole_defaults */ | |
| 51 SYMVAL_SELECTED_CONSOLE_FORWARD, /* Forward Lisp_Object into | |
| 52 Vselected_console */ | |
| 53 SYMVAL_CONST_SELECTED_CONSOLE_FORWARD, /* Forward Lisp_Object into | |
| 54 Vselected_console, | |
| 55 can't be set */ | |
| 56 SYMVAL_UNBOUND_MARKER, /* Only Qunbound actually has this tag */ | |
| 57 | |
| 58 /* The following tags use the 'symbol_value_buffer_local' structure */ | |
| 59 SYMVAL_BUFFER_LOCAL, /* make-variable-buffer-local */ | |
| 60 SYMVAL_SOME_BUFFER_LOCAL, /* make-local-variable */ | |
| 61 | |
| 62 /* The following tag uses the 'symbol_value_lisp_magic' structure */ | |
| 63 SYMVAL_LISP_MAGIC, /* Forward to lisp callbacks */ | |
| 64 | |
| 65 /* The following tag uses the 'symbol_value_varalias' structure */ | |
| 66 SYMVAL_VARALIAS /* defvaralias */ | |
| 67 | |
| 68 #if 0 | |
| 69 /* NYI */ | |
| 70 SYMVAL_CONSTANT_SYMBOL, /* Self-evaluating symbol */ | |
| 71 /* NYI */ | |
| 72 #endif | |
| 73 }; | |
| 74 | |
| 458 | 75 /* Underlying C type used to implement DEFVAR_INT */ |
| 76 typedef EMACS_INT Fixnum; | |
| 77 | |
| 428 | 78 struct symbol_value_magic |
| 79 { | |
| 2720 | 80 #ifdef MC_ALLOC |
| 81 struct lrecord_header header; | |
| 82 #else /* MC_ALLOC */ | |
| 428 | 83 struct lcrecord_header lcheader; |
| 2720 | 84 #endif /* MC_ALLOC */ |
| 442 | 85 void *value; |
| 428 | 86 enum symbol_value_type type; |
| 87 }; | |
| 442 | 88 #define SYMBOL_VALUE_MAGIC_P(x) \ |
| 89 (LRECORDP (x) && \ | |
| 90 XRECORD_LHEADER (x)->type <= lrecord_type_max_symbol_value_magic) | |
| 428 | 91 #define XSYMBOL_VALUE_MAGIC_TYPE(v) \ |
| 92 (((struct symbol_value_magic *) XPNTR (v))->type) | |
| 793 | 93 #define wrap_symbol_value_magic(p) wrap_pointer_1 (p) |
| 428 | 94 void print_symbol_value_magic (Lisp_Object, Lisp_Object, int); |
| 95 | |
| 96 /********** The various different symbol-value-magic types ***********/ | |
| 97 | |
| 98 /* 1. symbol-value-forward */ | |
| 99 | |
| 100 /* This type of symbol-value-magic is used for variables declared | |
| 101 DEFVAR_LISP, DEFVAR_INT, DEFVAR_BOOL, DEFVAR_BUFFER_LOCAL, | |
| 102 DEFVAR_BUFFER_DEFAULTS, DEFVAR_SPECIFIER, and for Qunbound. | |
| 103 | |
| 104 Note that some of these types of variables can be made buffer-local. | |
| 105 Then, the symbol's value field contains a symbol-value-buffer-local, | |
| 106 whose CURRENT-VALUE field then contains a symbol-value-forward. | |
| 107 */ | |
| 108 | |
| 109 struct symbol_value_forward | |
| 110 { | |
| 111 struct symbol_value_magic magic; | |
| 112 | |
| 113 /* `magicfun' is a function controlling the magic behavior of this | |
| 114 forward variable. | |
| 115 | |
| 116 SYM is the symbol being operated on (read, set, etc.); | |
| 117 | |
| 118 VAL is either the value to set or the value to be returned. | |
| 119 | |
| 120 IN_OBJECT is the buffer or console that the value is read in | |
| 121 or set in. A value of Qnil means that the current buffer | |
| 122 and possibly other buffers are being set. (This value will | |
| 123 never be passed for built-in buffer-local or console-local | |
| 124 variables such as `truncate-lines'.) (Currently, a value of | |
| 125 Qnil is always passed for DEFVAR_INT, DEFVAR_LISP, and | |
| 126 DEFVAR_BOOL variables; the code isn't smart enough to figure | |
| 127 out what buffers besides the current buffer are being | |
| 128 affected. Because the magic function is called | |
| 129 before the value is changed, it's not that easy | |
| 130 to determine which buffers are getting changed. | |
| 131 #### If this information is important, let me know | |
| 132 and I will look into providing it.) (Remember also | |
| 133 that the only console-local variables currently existing | |
| 134 are built-in ones, because others can't be created.) | |
| 135 | |
| 136 FLAGS gives more information about the operation being performed. | |
| 137 | |
| 138 The return value indicates what the magic function actually did. | |
| 139 | |
| 140 Currently FLAGS and the return value are not used. This | |
| 141 function is only called when the value of a forward variable | |
| 142 is about to be changed. Note that this can occur explicitly | |
| 143 through a call to `set', `setq', `set-default', or `setq-default', | |
| 144 or implicitly by the current buffer being changed. */ | |
| 145 int (*magicfun) (Lisp_Object sym, Lisp_Object *val, Lisp_Object in_object, | |
| 146 int flags); | |
| 147 }; | |
| 148 DECLARE_LRECORD (symbol_value_forward, struct symbol_value_forward); | |
| 149 #define XSYMBOL_VALUE_FORWARD(x) \ | |
| 150 XRECORD (x, symbol_value_forward, struct symbol_value_forward) | |
| 442 | 151 #define symbol_value_forward_forward(m) ((void *)((m)->magic.value)) |
| 428 | 152 #define symbol_value_forward_magicfun(m) ((m)->magicfun) |
| 153 | |
| 154 /* 2. symbol-value-buffer-local */ | |
| 155 | |
| 156 struct symbol_value_buffer_local | |
| 157 { | |
| 158 struct symbol_value_magic magic; | |
| 159 /* Used in a symbol value cell when the symbol's value is per-buffer. | |
| 160 | |
| 161 The type of the symbol-value-magic will be either | |
| 162 SYMVAL_BUFFER_LOCAL (i.e. `make-variable-buffer-local' was called) | |
| 163 or SYMVAL_SOME_BUFFER_LOCAL (i.e. `make-local-variable' was called). | |
| 164 The only difference between the two is that when setting the | |
| 165 former kind of variable, an implicit `make-local-variable' is | |
| 166 called. | |
| 167 | |
| 168 A buffer-local variable logically has | |
| 169 | |
| 170 -- a default value | |
| 171 -- local values in some buffers | |
| 172 | |
| 173 The primary place where the local values are stored is in each | |
| 174 buffer's local_var_alist slot. | |
| 175 | |
| 176 In the simplest implementation, all that this structure needs to | |
| 177 keep track of is the default value; to retrieve the value in | |
| 178 a buffer, look in that buffer's local_var_alist, and use the | |
| 179 default value if there is no local value. To implement | |
| 180 `make-local-variable' in a buffer, look in the buffer's | |
| 181 local_var_alist, and if no element exists for this symbol, | |
| 182 add one, copying the value from the default value. When setting | |
| 183 the value in a buffer, look in the buffer's local_var_alist, and set | |
| 184 the value in that list if an element exists for this symbol; | |
| 185 otherwise, set the default. (Remember that SYMVAL_BUFFER_LOCAL | |
| 186 variables implicitly call `make-local-variable' first, so when | |
| 187 setting a value, there will always be an entry in the buffer's | |
| 188 local_var_alist to set.) | |
| 189 | |
| 190 However, this operation is potentially slow. To speed it up, | |
| 191 we cache the value in one buffer in this structure. | |
| 192 | |
| 193 NOTE: This is *not* a write-through cache. I.e. when setting | |
| 194 the value in the buffer that is cached, we *only* change the | |
| 195 cache and don't write the value through to either the buffer's | |
| 196 local_var_alist or the default value. Therefore, when retrieving | |
| 197 a value in a buffer, you must *always* look in the cache to see if | |
| 198 it refers to that buffer. | |
| 199 | |
| 200 The cache consists of | |
| 201 | |
| 202 -- a buffer, or nil if the cache has not been set up | |
| 203 -- the value in that buffer | |
| 204 -- the element (a cons) from the buffer's local_var_alist, or | |
| 205 nil if there is no local value in the buffer | |
| 206 | |
| 207 These slots are called CURRENT-BUFFER, CURRENT-VALUE, and | |
| 208 CURRENT-ALIST-ELEMENT, respectively. | |
| 209 | |
| 210 If we want to examine or set the value in BUFFER and CURRENT-BUFFER | |
| 211 equals BUFFER, we just examine or set CURRENT-VALUE. Otherwise, | |
| 212 we store CURRENT-VALUE value into CURRENT-ALIST-ELEMENT (or maybe | |
| 213 into DEFAULT-VALUE), then find the appropriate alist element for | |
| 214 BUFFER and set up CURRENT-ALIST-ELEMENT. Then we set CURRENT-VALUE | |
| 215 out of that element (or maybe out of DEFAULT-VALUE), and store | |
| 216 BUFFER into CURRENT-BUFFER. | |
| 217 | |
| 218 If we are setting the variable and the current buffer does not have | |
| 219 an alist entry for this variable, an alist entry is created. | |
| 220 | |
| 221 Note that CURRENT-BUFFER's local_var_alist value for this variable | |
| 222 might be out-of-date (the correct value is stored in CURRENT-VALUE). | |
| 223 Similarly, if CURRENT-BUFFER sees the default value, then | |
| 224 DEFAULT-VALUE might be out-of-date. | |
| 225 | |
| 226 Note that CURRENT-VALUE (but not DEFAULT-VALUE) can be a | |
| 227 forwarding pointer. Each time it is examined or set, | |
| 228 forwarding must be done. | |
| 229 */ | |
| 230 Lisp_Object default_value; | |
| 231 Lisp_Object current_value; | |
| 232 Lisp_Object current_buffer; | |
| 233 Lisp_Object current_alist_element; | |
| 234 }; | |
| 235 DECLARE_LRECORD (symbol_value_buffer_local, struct symbol_value_buffer_local); | |
| 236 #define XSYMBOL_VALUE_BUFFER_LOCAL(x) \ | |
| 237 XRECORD (x, symbol_value_buffer_local, struct symbol_value_buffer_local) | |
| 238 #define SYMBOL_VALUE_BUFFER_LOCAL_P(x) RECORDP (x, symbol_value_buffer_local) | |
| 239 | |
| 240 /* 3. symbol-value-lisp-magic */ | |
| 241 | |
| 242 enum lisp_magic_handler | |
| 243 { | |
| 244 MAGIC_HANDLER_GET_VALUE, | |
| 245 MAGIC_HANDLER_SET_VALUE, | |
| 246 MAGIC_HANDLER_BOUND_PREDICATE, | |
| 247 MAGIC_HANDLER_MAKE_UNBOUND, | |
| 248 MAGIC_HANDLER_LOCAL_PREDICATE, | |
| 249 MAGIC_HANDLER_MAKE_LOCAL, | |
| 250 MAGIC_HANDLER_MAX | |
| 251 }; | |
| 252 | |
| 253 struct symbol_value_lisp_magic | |
| 254 { | |
| 255 struct symbol_value_magic magic; | |
| 256 Lisp_Object handler[MAGIC_HANDLER_MAX]; | |
| 257 Lisp_Object harg[MAGIC_HANDLER_MAX]; | |
| 258 Lisp_Object shadowed; | |
| 259 }; | |
| 260 DECLARE_LRECORD (symbol_value_lisp_magic, struct symbol_value_lisp_magic); | |
| 261 #define XSYMBOL_VALUE_LISP_MAGIC(x) \ | |
| 262 XRECORD (x, symbol_value_lisp_magic, struct symbol_value_lisp_magic) | |
| 263 #define SYMBOL_VALUE_LISP_MAGIC_P(x) RECORDP (x, symbol_value_lisp_magic) | |
| 264 | |
| 265 /* 4. symbol-value-varalias */ | |
| 266 | |
| 267 struct symbol_value_varalias | |
| 268 { | |
| 269 struct symbol_value_magic magic; | |
| 270 Lisp_Object aliasee; | |
| 271 Lisp_Object shadowed; | |
| 272 }; | |
| 273 DECLARE_LRECORD (symbol_value_varalias, struct symbol_value_varalias); | |
| 274 #define XSYMBOL_VALUE_VARALIAS(x) \ | |
| 275 XRECORD (x, symbol_value_varalias, struct symbol_value_varalias) | |
| 276 #define SYMBOL_VALUE_VARALIAS_P(x) RECORDP (x, symbol_value_varalias) | |
| 277 #define symbol_value_varalias_aliasee(m) ((m)->aliasee) | |
| 278 #define symbol_value_varalias_shadowed(m) ((m)->shadowed) | |
| 279 | |
| 280 /* To define a Lisp primitive function using a C function `Fname', do this: | |
| 281 DEFUN ("name, Fname, ...); // at top level in foo.c | |
| 282 DEFSUBR (Fname); // in syms_of_foo(); | |
| 283 */ | |
| 2720 | 284 #ifdef MC_ALLOC |
| 285 MODULE_API void defsubr (Lisp_Subr *); | |
| 286 #define DEFSUBR_MC_ALLOC(Fname) \ | |
| 287 struct Lisp_Subr *S##Fname= (struct Lisp_Subr *) \ | |
| 288 mc_alloc (sizeof (struct Lisp_Subr)); \ | |
| 289 set_lheader_implementation (&S##Fname->lheader, &lrecord_subr); \ | |
| 290 \ | |
| 291 S##Fname->min_args = MC_ALLOC_S##Fname.min_args; \ | |
| 292 S##Fname->max_args = MC_ALLOC_S##Fname.max_args; \ | |
| 293 S##Fname->prompt = MC_ALLOC_S##Fname.prompt; \ | |
| 294 S##Fname->doc = MC_ALLOC_S##Fname.doc; \ | |
| 295 S##Fname->name = MC_ALLOC_S##Fname.name; \ | |
| 296 S##Fname->subr_fn = MC_ALLOC_S##Fname.subr_fn; \ | |
| 297 MARK_LRECORD_AS_LISP_READONLY (S##Fname); | |
| 298 | |
| 299 | |
| 300 #define DEFSUBR(Fname) \ | |
| 301 do { \ | |
| 302 DEFSUBR_MC_ALLOC (Fname); \ | |
| 303 defsubr (S##Fname); \ | |
| 304 } while (0) | |
| 305 | |
| 306 /* To define a Lisp primitive macro using a C function `Fname', do this: | |
| 307 DEFUN ("name, Fname, ...); // at top level in foo.c | |
| 308 DEFSUBR_MACRO (Fname); // in syms_of_foo(); | |
| 309 */ | |
| 310 MODULE_API void defsubr_macro (Lisp_Subr *); | |
| 311 #define DEFSUBR_MACRO(Fname) \ | |
| 312 do { \ | |
| 313 DEFSUBR_MC_ALLOC (Fname); \ | |
| 314 defsubr_macro (S##Fname); \ | |
| 315 } while (0) | |
| 316 | |
| 317 #else /* not MC_ALLOC */ | |
| 318 /* To define a Lisp primitive function using a C function `Fname', do this: | |
| 319 DEFUN ("name, Fname, ...); // at top level in foo.c | |
| 320 DEFSUBR (Fname); // in syms_of_foo(); | |
| 321 */ | |
| 1632 | 322 MODULE_API void defsubr (Lisp_Subr *); |
| 428 | 323 #define DEFSUBR(Fname) defsubr (&S##Fname) |
| 324 | |
| 325 /* To define a Lisp primitive macro using a C function `Fname', do this: | |
| 326 DEFUN ("name, Fname, ...); // at top level in foo.c | |
| 327 DEFSUBR_MACRO (Fname); // in syms_of_foo(); | |
| 328 */ | |
| 1632 | 329 MODULE_API void defsubr_macro (Lisp_Subr *); |
| 428 | 330 #define DEFSUBR_MACRO(Fname) defsubr_macro (&S##Fname) |
| 2720 | 331 #endif /* not MC_ALLOC */ |
| 428 | 332 |
| 1632 | 333 MODULE_API void defsymbol_massage_name (Lisp_Object *location, |
| 334 const char *name); | |
| 335 MODULE_API void defsymbol_massage_name_nodump (Lisp_Object *location, | |
| 336 const char *name); | |
| 337 MODULE_API void defsymbol_massage_multiword_predicate (Lisp_Object *location, | |
| 338 const char *name); | |
| 339 MODULE_API void | |
| 340 defsymbol_massage_multiword_predicate_nodump (Lisp_Object *location, | |
| 341 const char *name); | |
| 342 MODULE_API void defsymbol (Lisp_Object *location, const char *name); | |
| 343 MODULE_API void defsymbol_nodump (Lisp_Object *location, const char *name); | |
| 442 | 344 |
| 563 | 345 /* Defining symbols: |
| 346 | |
| 347 (1) A standard symbol is defined with DEFSYMBOL. That means that | |
| 348 the symbol's print name can be derived from the symbol's variable | |
| 349 name by removing the initial Q and replacing underscores with hyphens. | |
| 350 (2) A keyword symbol is defined with DEFKEYWORD. That means that | |
| 351 the symbol's print name can be derived from the symbol's variable | |
| 352 name by removing the initial Q and replacing underscores with hyphens, | |
| 353 except that the initial underscore, which comes directly after the Q, | |
| 354 is replaced by a colon. | |
| 355 (3) DEFSYMBOL_MULTIWORD_PREDICATE is used for the predicates that are | |
| 356 associated with a particular type of Lisp Object. Because of the | |
| 357 limitations of C macros, they're always given a predicate symbol | |
| 358 whose C name simply appends `p' to the type name, modulo hyphen/ | |
| 359 underscore conversion. Properly, however, the Lisp name should have | |
| 360 `-p' if there is more than one word in the type name. | |
| 361 DEFSYMBOL_MULTIWORD_PREDICATE is for these weird symbols -- the | |
| 362 C name as supplied to the macro should end with a `p' with no | |
| 363 underscore before it, and the macro will insert a hyphen there in | |
| 364 the Lisp name. | |
| 365 (4) In case you have some weird symbol where the equivalence between | |
| 366 the C and Lisp names is more complicated (e.g. the Lisp symbol has | |
| 367 non-alphabetic, non-numeric characters in it), you can just call | |
| 368 defsymbol() (the lowercase version) directly. | |
| 369 */ | |
| 370 | |
| 442 | 371 #define DEFSYMBOL(name) defsymbol_massage_name (&name, #name) |
| 372 #define DEFSYMBOL_NO_DUMP(name) defsymbol_massage_name_nodump (&name, #name) | |
| 373 #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ | |
| 374 defsymbol_massage_multiword_predicate (&name, #name) | |
| 375 #define DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP(name) \ | |
| 376 defsymbol_massage_multiword_predicate_nodump (&name, #name) | |
| 428 | 377 |
| 1632 | 378 MODULE_API void defkeyword (Lisp_Object *location, const char *name); |
| 379 MODULE_API void defkeyword_massage_name (Lisp_Object *location, | |
| 380 const char *name); | |
| 442 | 381 #define DEFKEYWORD(name) defkeyword_massage_name (&name, #name) |
| 428 | 382 |
| 1632 | 383 MODULE_API void deferror (Lisp_Object *symbol, const char *name, |
| 384 const char *message, Lisp_Object inherits_from); | |
| 385 MODULE_API void deferror_massage_name (Lisp_Object *symbol, const char *name, | |
| 386 const char *message, | |
| 387 Lisp_Object inherits_from); | |
| 388 MODULE_API void deferror_massage_name_and_message (Lisp_Object *symbol, | |
| 389 const char *name, | |
| 390 Lisp_Object inherits_from); | |
| 442 | 391 #define DEFERROR(name, message, inherits_from) \ |
| 392 deferror_massage_name (&name, #name, message, inherits_from) | |
| 393 /* In this case, the error message is the same as the name, modulo some | |
| 394 prettifying */ | |
| 395 #define DEFERROR_STANDARD(name, inherits_from) \ | |
| 396 deferror_massage_name_and_message (&name, #name, inherits_from) | |
| 428 | 397 |
| 398 /* Macros we use to define forwarded Lisp variables. | |
| 399 These are used in the syms_of_FILENAME functions. */ | |
| 400 | |
| 1632 | 401 MODULE_API void defvar_magic (const char *symbol_name, |
| 402 const struct symbol_value_forward *magic); | |
| 428 | 403 |
| 2720 | 404 #ifdef MC_ALLOC |
| 405 #define DEFVAR_SYMVAL_FWD(lname, c_location, forward_type, magic_fun) \ | |
| 406 do \ | |
| 407 { \ | |
| 408 struct symbol_value_forward *I_hate_C = \ | |
| 409 alloc_lrecord_type (struct symbol_value_forward, \ | |
| 410 &lrecord_symbol_value_forward); \ | |
| 411 /* mcpro ((Lisp_Object) I_hate_C);*/ \ | |
| 412 \ | |
| 413 MARK_LRECORD_AS_LISP_READONLY (I_hate_C); \ | |
| 414 \ | |
| 415 I_hate_C->magic.value = c_location; \ | |
| 416 I_hate_C->magic.type = forward_type; \ | |
| 417 I_hate_C->magicfun = magic_fun; \ | |
| 418 \ | |
| 419 defvar_magic ((lname), I_hate_C); \ | |
| 420 } while (0) | |
| 421 #else /* not MC_ALLOC */ | |
| 771 | 422 #define DEFVAR_SYMVAL_FWD(lname, c_location, forward_type, magicfun) \ |
| 423 do \ | |
| 424 { \ | |
| 425 static const struct symbol_value_forward I_hate_C = \ | |
| 426 { /* struct symbol_value_forward */ \ | |
| 427 { /* struct symbol_value_magic */ \ | |
| 428 { /* struct lcrecord_header */ \ | |
| 429 { /* struct lrecord_header */ \ | |
| 430 lrecord_type_symbol_value_forward, /* lrecord_type_index */ \ | |
| 431 1, /* mark bit */ \ | |
| 432 1, /* c_readonly bit */ \ | |
| 1111 | 433 1, /* lisp_readonly bit */ \ |
| 434 0 /* unused */ \ | |
| 771 | 435 }, \ |
| 436 0, /* next */ \ | |
| 437 0, /* uid */ \ | |
| 438 0 /* free */ \ | |
| 439 }, \ | |
| 440 c_location, \ | |
| 441 forward_type \ | |
| 442 }, \ | |
| 443 magicfun \ | |
| 444 }; \ | |
| 445 defvar_magic ((lname), &I_hate_C); \ | |
| 428 | 446 } while (0) |
| 2720 | 447 #endif /* not MC_ALLOC */ |
| 771 | 448 #define DEFVAR_SYMVAL_FWD_INT(lname, c_location, forward_type, magicfun) \ |
| 449 do \ | |
| 450 { \ | |
| 451 DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun); \ | |
| 452 dump_add_opaque_int (c_location); \ | |
| 458 | 453 } while (0) |
| 454 | |
| 771 | 455 #define DEFVAR_SYMVAL_FWD_FIXNUM(lname, c_location, forward_type, magicfun) \ |
| 456 do \ | |
| 457 { \ | |
| 458 DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun); \ | |
| 459 dump_add_opaque_fixnum (c_location); \ | |
| 442 | 460 } while (0) |
| 461 | |
| 771 | 462 #define DEFVAR_SYMVAL_FWD_OBJECT(lname, c_location, forward_type, magicfun) \ |
| 463 do \ | |
| 464 { \ | |
| 465 DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun); \ | |
| 466 { \ | |
| 467 Lisp_Object *DSF_location = c_location; /* Type check */ \ | |
| 468 staticpro (DSF_location); \ | |
| 469 if (EQ (*DSF_location, Qnull_pointer)) *DSF_location = Qnil; \ | |
| 470 } \ | |
| 428 | 471 } while (0) |
| 472 | |
| 473 #define DEFVAR_LISP(lname, c_location) \ | |
| 474 DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_OBJECT_FORWARD, 0) | |
| 475 #define DEFVAR_CONST_LISP(lname, c_location) \ | |
| 476 DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_CONST_OBJECT_FORWARD, 0) | |
| 477 #define DEFVAR_SPECIFIER(lname, c_location) \ | |
| 478 DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_CONST_SPECIFIER_FORWARD, 0) | |
| 479 #define DEFVAR_INT(lname, c_location) \ | |
| 458 | 480 DEFVAR_SYMVAL_FWD_FIXNUM (lname, c_location, SYMVAL_FIXNUM_FORWARD, 0) |
| 428 | 481 #define DEFVAR_CONST_INT(lname, c_location) \ |
| 458 | 482 DEFVAR_SYMVAL_FWD_FIXNUM (lname, c_location, SYMVAL_CONST_FIXNUM_FORWARD, 0) |
| 428 | 483 #define DEFVAR_BOOL(lname, c_location) \ |
| 442 | 484 DEFVAR_SYMVAL_FWD_INT (lname, c_location, SYMVAL_BOOLEAN_FORWARD, 0) |
| 428 | 485 #define DEFVAR_CONST_BOOL(lname, c_location) \ |
| 442 | 486 DEFVAR_SYMVAL_FWD_INT (lname, c_location, SYMVAL_CONST_BOOLEAN_FORWARD, 0) |
| 428 | 487 #define DEFVAR_LISP_MAGIC(lname, c_location, magicfun) \ |
| 440 | 488 DEFVAR_SYMVAL_FWD_OBJECT (lname, c_location, SYMVAL_OBJECT_FORWARD, magicfun) |
| 428 | 489 #define DEFVAR_INT_MAGIC(lname, c_location, magicfun) \ |
| 458 | 490 DEFVAR_SYMVAL_FWD_FIXNUM (lname, c_location, SYMVAL_FIXNUM_FORWARD, magicfun) |
| 428 | 491 #define DEFVAR_BOOL_MAGIC(lname, c_location, magicfun) \ |
| 442 | 492 DEFVAR_SYMVAL_FWD_INT (lname, c_location, SYMVAL_BOOLEAN_FORWARD, magicfun) |
| 428 | 493 |
| 446 | 494 void flush_all_buffer_local_cache (void); |
| 495 | |
| 1743 | 496 END_C_DECLS |
| 1650 | 497 |
| 440 | 498 #endif /* INCLUDED_symeval_h_ */ |