Mercurial > hg > xemacs-beta
view src/unexfreebsd.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 04bc9d2f42c7 |
| children |
line wrap: on
line source
/* Code to do an unexec for FreeBSD-1.1 for a temacs linked -Bdynamic. Derived from unexnetbsd.c, which was derived from unexsunos4.c Copyright (C) 1992, 1993 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF? */ /* Created 29-Oct-92 by Harlan Sexton Tweaked 06-Aug-93 by Dean Michaels to work with sun3. Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries. Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries. */ /********************** Included .h Files **************************/ #include <config.h> #include <stdarg.h> #include <sys/param.h> #include <sys/mman.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/types.h> #include <string.h> #include <stdio.h> #include <errno.h> #include <a.out.h> #include <unistd.h> #include <ctype.h> #include <stab.h> #include <sys/dir.h> #include <link.h> #include "compiler.h" /********************** Macros *************************************/ #define SYS_ERR strerror(errno) #define MASK_UP(x,p_of_two) \ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1))) #define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1))) /********************** Typedefs and Structs ***********************/ struct translation_struct { long txtaddr; long txtoff; long dataddr; long datoff; long bssaddr; long endaddr; }; /********************** Function Prototypes/Declarations ***********/ static void unexec_error (const char *m, int use_errno, ...); static int unexec_open (char *filename, int flag, int mode); static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags); static long unexec_seek (int fd, long position); static void unexec_read (int fd, long position, char *buf, int bytes); static void unexec_write (int fd, long position, char *buf, int bytes); static void unexec_pad (int fd, int bytes); static void unexec_fstat (int fd, struct stat *statptr); static void unexec_fchmod (int fd, int mode); static long unexec_addr_to_offset (long addr, struct translation_struct *ts); static void copy_relocation_site (struct relocation_info *ri, caddr_t from_base_addr, caddr_t to_base_addr, struct translation_struct *ts); static void reset_symtab (struct nlist *start, struct nlist *end, char *strtab, long edata_value, long end_value, int shlib_image); static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab, long edata_value, long end_value, int shlib_image); int run_time_remap (char *dummy); /********************** Variables **********************************/ /* for reporting error messages from system calls */ extern int _DYNAMIC; extern char **environ; static unsigned long sbrk_of_0_at_unexec; /*******************************************************************/ static void unexec_error (const char *fmt, int use_errno, ...) { const char *err_msg = SYS_ERR; va_list args; fprintf (stderr, "unexec - "); va_start (args, use_errno); vfprintf (stderr, fmt, args); va_end (args); if (use_errno) fprintf (stderr, ": %s", err_msg); fprintf (stderr, "\n"); exit (1); return; } static int unexec_open (char *filename, int flag, int mode) { int fd; errno = 0; fd = open (filename, flag, mode); if (fd < 0) unexec_error ("Failure opening file %s", 1, filename); return fd; } static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags) { caddr_t return_val; unexec_seek (fd, 0); errno = 0; return_val = mmap (0, len, prot, flags, fd, 0); if (return_val == (caddr_t) -1) unexec_error ("Failure mmap'ing file", 1); return return_val; } static long unexec_seek (int fd, long position) { long seek_value; if (fd <= 0) unexec_error ("No file open in which to seek", 0); errno = 0; if (position < 0) seek_value = (long) lseek (fd, 0, L_INCR); else seek_value = (long) lseek (fd, position, L_SET); if (seek_value < 0) unexec_error ("Failed to do a seek to 0x%x in %s", 1, position, "unexec() output file"); return seek_value; } static void unexec_read (int fd, long position, char *buf, int bytes) { int n_read; int remains = bytes; position = unexec_seek (fd, position); if (bytes < 0) unexec_error ("Attempted read of %d bytes", 0, bytes); errno = 0; while (remains > 0) { n_read = read (fd, buf, remains); if (n_read <= 0) unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s", 1, bytes, position, "unexec() output file"); buf += n_read; remains -= n_read; } return; } static void unexec_write (int fd, long position, char *buf, int bytes) { int n_written; int remains = bytes; position = unexec_seek (fd, position); if (bytes < 0) unexec_error ("Attempted write of %d bytes in %s", 0, bytes, "unexec() output file"); errno = 0; while (remains > 0) { n_written = write (fd, buf, remains); if (n_written <= 0) unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s", 1, bytes, position, "unexec() output file"); buf += n_written; remains -= n_written; } return; } static void unexec_pad (int fd, int bytes) { if (bytes > 0) { char buf[1024]; int remaining = bytes; memset (buf, 0, sizeof (buf)); while (remaining > 0) { int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining; unexec_write (fd, -1, buf, this_write); remaining -= this_write; } } } static void unexec_fstat (int fd, struct stat *statptr) { errno = 0; if (-1 == fstat (fd, statptr)) unexec_error ("fstat() failed for descriptor %d", 1, fd); return; } static void unexec_fchmod (int fd, int mode) { errno = 0; if (-1 == fchmod (fd, mode)) unexec_error ("fchmod() failed for descriptor %d", 1, fd); return; } static long unexec_addr_to_offset (long addr, struct translation_struct *ts) { if ((addr < ts->txtaddr) || (addr >= ts->bssaddr)) return -1; else if (addr >= ts->dataddr) return ((long) ((addr - ts->dataddr) + ts->datoff)); else return ((long) ((addr - ts->txtaddr) + ts->txtoff)); } /* * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS */ static void copy_relocation_site (struct relocation_info *ri, caddr_t from_base_addr, caddr_t to_base_addr, struct translation_struct *ts) { long offset; caddr_t from, to; /* We can get relocation sites in the bss region, for objects whose contents are copied from a shared library. We don't need or want to restore these at present. */ #ifndef sparc if (ri->r_copy) return; #else /* Struct relocation_info_sparc doesn't have member r_copy. Instead, we use the address to check if this is run-time-copied. */ if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr) return; #endif offset = unexec_addr_to_offset (ri->r_address, ts); if (offset == -1) unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address, ((long *)ri)[1]); from = from_base_addr + offset; to = to_base_addr + offset; /* This stuff should be in a md_ file somewhere... */ #ifndef sparc switch (ri->r_length) { case 0: *((char *) to) = *((char *) from); break; case 1: *((short *) to) = *((short *) from); break; case 2: *((long *) to) = *((long *) from); break; default: unexec_error ("unknown reloc length %d seen during unexec()", 0, ri->r_length); break; } #else /* sparc */ switch (ri->r_type) { case RELOC_8: case RELOC_DISP8: *((char *) to) = *((char *) from); break; case RELOC_16: case RELOC_DISP16: *((short *) to) = *((short *) from); break; case RELOC_LO10: case RELOC_13: case RELOC_22: case RELOC_HI22: case RELOC_WDISP22: case RELOC_WDISP30: case RELOC_32: case RELOC_DISP32: case RELOC_GLOB_DAT: *((long *) to) = *((long *) from); break; case RELOC_JMP_SLOT: { long *target = (long *) to; long *source = (long *) from; *target = *source; target++; source++; *target = *source; target++; source++; *target = *source; } break; default: unexec_error ("unknown reloc type %d seen during unexec()", 0, ri->r_type); break; } #endif /* sparc */ } static void reset_symtab (struct nlist *start, struct nlist *end, char *strtab, long edata_value, long end_value, int shlib_image) { struct nlist *tmp = start; int found_edata = 0; int found_end = 0; while (tmp < end) { int type = tmp->n_type; if ((type == (N_UNDF | N_EXT)) && (tmp->n_value != 0)) unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!", 0); if (!(type & N_STAB)) { if (!found_edata && (type == (N_EXT | N_DATA)) && tmp->n_un.n_strx && !strcmp ("_edata", strtab + tmp->n_un.n_strx)) { tmp->n_value = edata_value; found_edata = 1; } if ((type & N_TYPE) == N_BSS) { if (!found_end && (type == (N_EXT | N_BSS)) && tmp->n_un.n_strx && !strcmp ("_end", strtab + tmp->n_un.n_strx)) { tmp->n_value = end_value; found_end = 1; } else if (type & N_EXT) tmp->n_type = N_DATA | N_EXT; else tmp->n_type = N_DATA; } /* the way things are being handled here, having sbrk() in the image is fatal for an image linked with shared lib's (although the code could be modified to support it), but this should never happen anyway */ if (shlib_image && (type == (N_EXT | N_TEXT)) && tmp->n_un.n_strx && !strcmp ("_sbrk", strtab + tmp->n_un.n_strx)) unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!", 0); } tmp++; } } static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab, long edata_value, long end_value, int shlib_image) { struct nzlist *tmp = start; int found_edata = 0; int found_end = 0; while (tmp < end) { int type = tmp->nz_type; /* * the following code breaks under FreeBSD-1.1-BETA, but everything * seems to work perfectly if it's commented out. This did not break * anything until the changes to ld.so were made. */ /* if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0)) unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0); */ if (!(type & N_STAB)) { if (!found_edata && (type == (N_EXT | N_DATA)) && !strcmp ("_edata", strtab + tmp->nz_strx)) { tmp->nz_value = edata_value; found_edata = 1; } if ((type & N_TYPE) == N_BSS) { if (!found_end && (type == (N_EXT | N_BSS)) && !strcmp ("_end", strtab + tmp->nz_strx)) { tmp->nz_value = end_value; found_end = 1; } else if (type & N_EXT) tmp->nz_type = N_DATA | N_EXT; else tmp->nz_type = N_DATA; } /* the way things are being handled here, having sbrk() in the image is fatal for an image linked with shared lib's (although the code could be modified to support it), but this should never happen anyway */ if (shlib_image && (type == (N_EXT | N_TEXT)) && !strcmp ("_sbrk", strtab + tmp->nz_strx)) unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0); } tmp++; } } extern int getpagesize (void); /* * EXPORTED FUNCTIONS */ /* this has to be a global variable to prevent the optimizers from * assuming that it can not be 0. */ static void *dynamic_addr = (void *) &_DYNAMIC; int unexec (char *new_name, char *old_name, unsigned int UNUSED (emacs_edata), unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2)) { /* ld.so data */ struct _dynamic *ld = 0; struct section_dispatch_table *ld2 = 0; /* old and new state */ int old_fd; int new_fd; caddr_t old_base_addr; caddr_t new_base_addr; struct exec old_hdr; struct exec new_hdr; struct stat old_buf; struct stat new_buf; /* some process specific "constants" */ unsigned long n_pagsiz, new_edata; long page_size = getpagesize (); caddr_t plt_end; caddr_t current_break = (caddr_t) sbrk (0); if (!page_size) unexec_error ("unexec() failed because we can't get the size of a page!", 0); /* see if this is a -Bdynamic image -- if so, find ld.so structures */ if (dynamic_addr) { ld = (struct _dynamic *) dynamic_addr; ld2 = ld->d_un.d_sdt; if (ld->d_version < LD_VERSION_BSD) unexec_error ("%s linked with obsolete version of ld -- we quit!", 0, old_name); } /* open the old and new files, figuring out how big the old one is so that we can map it in */ old_fd = unexec_open (old_name, O_RDONLY, 0); new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666); /* setup the header and the statbuf for old_fd */ unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr)); unexec_fstat (old_fd, &old_buf); /* set up some important constants */ n_pagsiz = __LDPGSZ; if (dynamic_addr) plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double)); else plt_end = (caddr_t) N_DATADDR (old_hdr); #if 0 /* never write protect the variable "environ", defined in /lib/crt0.o, and set in process.c */ mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **); /* never protect ABOVE the end of data emacs_edata specified */ mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data); #endif /* Set up the image of the old file */ old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ, MAP_FILE | MAP_PRIVATE); close (old_fd); /* set up the new exec */ new_hdr = old_hdr; new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz); new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr)); new_hdr.a_bss = 0; /* set up this variable, in case we want to reset "the break" when restarting */ sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz)); /* Write out the first approximation to the new file. The sizes of each section will be correct, but there will be a number of corrections that will need to be made. */ { long old_datoff = N_DATOFF (old_hdr); long old_dataddr = N_DATADDR (old_hdr); long new_treloff = N_RELOFF (new_hdr); long old_treloff = N_RELOFF (old_hdr); long ld_so_size = ((unsigned long) plt_end) - old_dataddr; long real_data_size = current_break - plt_end; long pad_size = MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break); /* First, write the text segment with new header -- copy everything until the start of the data segment from the old file, and then go back and write the new header. */ unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size); unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr)); /* Copy the rest of the data segment from the running image. */ unexec_write (new_fd, old_datoff + ld_so_size, plt_end, real_data_size); /* pad out the data segment */ unexec_pad (new_fd, pad_size); /* Finally, copy the symbol table information from the old file. */ unexec_write (new_fd, new_treloff, old_base_addr + old_treloff, old_buf.st_size - old_treloff); } /* Next, map in the output file so that we can jump around fixing it up. We retain the old file so that we can refer to it. */ unexec_fstat (new_fd, &new_buf); new_base_addr = unexec_mmap (new_fd, MASK_UP (new_buf.st_size, page_size), PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED); /* We need to do 2 things. First, make sure that _edata and _end (and hence, curbrk) are set to the correct values. At the same time, for neatness and to help with debugging, mark all the types of all ld.so and nm BSS symbols in the new file to be DATA, and make sure that there are no COMMON symbols in the output file, as any references to these can lose really big. Second, reset all of the ld.so "relocation sites" in the new file to have the values that appear in the old file -- the failure to do this was the biggest loser in the old version of this code. */ /* STEP 1 */ /* Reset the regular symbol table first. */ reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)), (struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) + new_hdr.a_syms), (char *) (new_base_addr + N_STROFF(new_hdr)), new_edata, new_edata, !!dynamic_addr); /* Now reset the ld.so symbol table. */ if (dynamic_addr) { struct translation_struct ts; struct relocation_info *tmp, *end; caddr_t syms, strings; /* set up the structure that we use to translate addresses in the old file into file offsets */ ts.txtaddr = N_TXTADDR (old_hdr); ts.txtoff = N_TXTOFF (old_hdr); ts.dataddr = N_DATADDR (old_hdr); ts.datoff = N_DATOFF (old_hdr); ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data; ts.endaddr = ts.bssaddr + old_hdr.a_bss; syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts); strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts); reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings, (char *) strings, new_edata, new_edata, !!dynamic_addr); /* STEP 2 */ tmp = (struct relocation_info *) (old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts)); end = (struct relocation_info *) (old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts)); while (tmp < end) { copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts); tmp++; } } /* get rid of the mmap-ed file space and make the output file executable -- then quit */ munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size)); munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size)); unexec_fchmod (new_fd, 0755); close (new_fd); return 0; } int run_time_remap (char *UNUSED (dummy)) { unsigned long current_sbrk = (unsigned long) sbrk (0); #if __FreeBSD_version < 300000 /* 2.x can work with this code */ if (sbrk_of_0_at_unexec < current_sbrk) { if (sbrk_of_0_at_unexec != 0) fprintf (stderr, "Absurd new brk addr = %lx (current = %lx)\n", sbrk_of_0_at_unexec, current_sbrk); } else #endif if (sbrk_of_0_at_unexec > current_sbrk) { errno = 0; if (brk ((caddr_t) sbrk_of_0_at_unexec)) fprintf (stderr, "failed to change brk addr to %lx: %s\n", sbrk_of_0_at_unexec, SYS_ERR); } #if 0 /* with proper COW, i don't think we really need to do this... */ { long page_size = getpagesize(); unsigned long base_addr = MASK_UP (mprotect_bottom_addr, page_size); unsigned long top_addr = MASK_DOWN (mprotect_top_addr, page_size); long len = top_addr - base_addr; if (len > 0) { errno = 0; if (mprotect ((caddr_t) base_addr, len, PROT_READ | PROT_EXEC)) fprintf (stderr, "failed to change protection on data pages: %s\n", SYS_ERR); } } #endif return 0; }
