Mercurial > hg > xemacs-beta
diff src/dumper.c @ 1204:e22b0213b713
[xemacs-hg @ 2003-01-12 11:07:58 by michaels]
modules/ChangeLog:
2002-12-16 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
remove ifdef USE_KKCC.
src/ChangeLog:
2003-01-08 Mike Sperber <mike@xemacs.org>
* console.h (CDFW_CONSOLE): Don't lead to a crash if we're dealing
with a dead window/frame/device/console.
2002-12-20 Mike Sperber <mike@xemacs.org>
* ui-gtk.c: Fix typo from Ben's patch: emacs_ffi_data is a
typedef, not a struct. emacs_gtk_object_data is a typedef, not a
struct.
* gtk-glue.c (gdk_event_to_emacs_event): Fix typos from Ben's
patch: le -> emacs_event + rearrange the code.
* event-gtk.c (gtk_event_to_emacs_event): Fix typos from Ben's
patch: ..._UNDERLYING_GDK_EVENT -> ..._GDK_EVENT, ev -> key_event.
* device-gtk.c: Fix typo from Ben's patch: x_keysym_map_hash_table
-> x_keysym_map_hashtable.
2002-12-19 Mike Sperber <mike@xemacs.org>
* menubar-x.c (set_frame_menubar): Initialize protect_me field of
popup_data.
2002-12-16 Ben Wing <ben@xemacs.org>
Major cleanup of KKCC, etc.
KKCC, pdump-related:
-- descriptions are written for all objects. this required some
changes in the format of some objects, e.g. extents, popup-data,
coding system, lstream, lcrecord-list.
-- KKCC now handles weakness in markers, hash tables, elsewhere
correctly (formerly, you'd eventually get a stack overflow due
to endlessly expanding markers).
-- textual changes: lrecord_description -> memory_description,
struct_description -> sized_memory_description.
-- extensive comment describing descriptions and pdump.
-- redo XD_UNION so it works inline and change its format to provide
sufficient info for pdump. implement XD_UNION in pdump. also add
XD_UNION_DYNAMIC_SIZE, which works like XD_UNION except for when
auto-computing structure sizes.
-- add support for XD_INDIRECT in description offsets (used by
extents).
-- add support for "description maps", allowing for indirect
descriptions that are retrieved from an object at run-time. this
generalizes XD_CODING_SYSTEM_END, XD_SPECIFIER_END, etc., which
have now been eliminated.
-- add a fifth field "flags" to memory_description, to support flags
that can be specified for this particular line. Currently defined
flags are XD_FLAG_NO_KKCC (KKCC should ignore this entry; useful
for the weakness above in markers, etc.), XD_FLAG_NO_PDUMP (pdump
should ignore this entry), XD_FLAG_UNION_DEFAULT_ENTRY (in
union maps, this specifies a "default" entry for all remaining
values), and XD_FLAG_FREE_LISP_OBJECT (for use with lcrecord-lists).
-- clean up the kkcc-itis in events, so that the differences
between event data as separate objects and as a union are now
minimized to a small number of places. with the new XD_UNION, we
no longer need event data as separate objects, so this code is no
longer ifdef USE_KKCC, but instead ifdef EVENT_DATA_AS_OBJECTS,
not used by default. make sure that we explicitly free the
separate event data objects when no longer in use, to maintain the
invariant the event processing causes no consing.
-- also remove other USE_KKCC ifdefs when not necessary.
-- allow for KKCC compilation under MS Windows.
-- fix README.kkcc.
-- dump_add_root_object -> dump_add_root_lisp_object.
-- implement dump_add_root_block and use this to handle
dump_add_opaque.
-- factor out some code duplicated in kkcc and pdump.
Other allocation/object-related:
-- change various *slots.h so MARKED_SLOT() call no longer
includes semicolon.
-- free_marker() takes a Lisp_Object not a direct pointer.
-- make bit vectors lcrecords, like vectors, and eliminate code
that essentially duplicated the lcrecord handling.
-- additional asserts in FREE_FIXED_TYPE, formerly duplicated in
the various callers of this.
-- all lcrecord allocation functions now zero out the returned
lcrecords. unnecessary calls to zero_lcrecord removed. add long
comment describing these functions.
-- extract out process and coding system slots, like for buffers,
frames, etc.
-- lcrecords now set the type of items sitting on the free list to
lcrecord_type_free.
-- changes to the way that gap arrays are allocated, for kkcc's
benefit -- now, one single memory block with a stretchy array on
the end, instead of a separate block holding the array.
Error-checking-related:
-- now can compile with C++ under MS Windows. clean up compile errors
discovered that way. (a few were real problems)
-- add C++ error-checking code to verify problems with mismatched
GCPRO/UNGCPRO. (there were a few in the kkcc code.) add long
comment about how to catch insufficient GCPRO (yes, it's possible
using C++).
-- add debug_p4(), a simple object printer, when debug_print()
doesn't work.
-- add dp() and db() as short synonyms of debug_print(),
debug_backtrace().
-- `print' tries EXTREMELY hard to avoid core dumping when printing
when crashing or from debug_print(), and tries as hard as it
reasonably can in other situations.
-- Correct the message output upon crashing to be more up-to-date.
Event-related:
-- document event-matches-key-specifier-p better.
-- generalize the dispatch queues formerly duplicated in the
various event implementations. add event methods to drain pending
events. generalize and clean up QUIT handling, removing
event-specific quit processing. allow arbitrary keystrokes, not
just ASCII, to be the QUIT char. among other things, this should
fix some longstanding bugs in X quit handling. long comment
describing the various event queues.
-- implement delaying of XFlush() if there are pending expose events.
SOMEONE PLEASE TRY THIS OUT.
-- Fix `xemacs -batch -l dunnet' under Cygwin. Try to fix under
MS Windows but not quite there yet.
Other:
-- class -> class_ and no more C++ games with this item.
new -> new_ in the lwlib code, so far not elsewhere.
-- use `struct htentry' not `struct hentry' in elhash.c to avoid
debugger confusion with hash.c.
-- new macros ALIST_LOOP_3, ALIST_LOOP_4.
* README.kkcc:
* alloc.c:
* alloc.c (deadbeef_memory):
* alloc.c (allocate_lisp_storage):
* alloc.c (copy_lisp_object):
* alloc.c (ALLOCATE_FIXED_TYPE_1):
* alloc.c (FREE_FIXED_TYPE):
* alloc.c (make_vector_internal):
* alloc.c (make_bit_vector_internal):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (struct string_chars_block):
* alloc.c (mark_lcrecord_list):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (alloc_automanaged_lcrecord):
* alloc.c (staticpro_1):
* alloc.c (staticpro):
* alloc.c (lispdesc_indirect_count_1):
* alloc.c (lispdesc_indirect_description_1):
* alloc.c (lispdesc_one_description_line_size):
* alloc.c (lispdesc_structure_size):
* alloc.c (mark_object_maybe_checking_free):
* alloc.c (mark_with_description):
* alloc.c (mark_struct_contents):
* alloc.c (mark_object):
* alloc.c (tick_lcrecord_stats):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (compact_string_chars):
* alloc.c (gc_sweep):
* alloc.c (garbage_collect_1):
* alloc.c (Fgarbage_collect):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c:
* buffer.c (mark_buffer):
* buffer.c (MARKED_SLOT):
* buffer.c (cleanup_buffer_undo_lists):
* buffer.c (Fget_file_buffer):
* buffer.h (MARKED_SLOT):
* bufslots.h:
* bytecode.c:
* callint.c:
* casetab.c:
* chartab.c:
* chartab.c (symbol_to_char_table_type):
* cmdloop.c:
* cmdloop.c (Fcommand_loop_1):
* config.h.in (new):
* conslots.h:
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h:
* console-impl.h (struct console):
* console-impl.h (MARKED_SLOT):
* console-impl.h (CONSOLE_QUIT_EVENT):
* console-msw-impl.h (XM_BUMPQUEUE):
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.h:
* console-stream-impl.h:
* console-stream-impl.h (struct stream_console):
* console-stream.c:
* console-stream.c (stream_init_console):
* console-stream.h:
* console-tty.c:
* console-tty.h:
* console-x.h:
* console.c:
* console.c (mark_console):
* console.c (MARKED_SLOT):
* console.c (allocate_console):
* console.c (get_console_variant):
* console.c (create_console):
* console.c (delete_console_internal):
* console.c (Fset_input_mode):
* console.c (Fcurrent_input_mode):
* console.c (common_init_complex_vars_of_console):
* console.h:
* console.h (console_variant):
* console.h (device_metrics):
* data.c:
* data.c (Faref):
* data.c (Faset):
* data.c (decode_weak_list_type):
* database.c:
* debug.c (xemacs_debug_loop):
* debug.c (FROB):
* debug.c (Fadd_debug_class_to_check):
* debug.c (Fdelete_debug_class_to_check):
* debug.c (Fset_debug_classes_to_check):
* debug.c (Fset_debug_class_types_to_check):
* debug.c (Fdebug_types_being_checked):
* debug.h (DASSERT):
* device-gtk.c:
* device-impl.h (struct device):
* device-impl.h (MARKED_SLOT):
* device-msw.c:
* device-x.c:
* device-x.c (x_init_device_class):
* device-x.c (x_comp_visual_info):
* device-x.c (x_try_best_visual_class):
* device-x.c (x_init_device):
* device-x.c (construct_name_list):
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_display_visual_class):
* device.c:
* device.c (MARKED_SLOT):
* device.c (allocate_device):
* device.c (Fmake_device):
* device.c (delete_device_internal):
* device.c (Fset_device_class):
* device.h:
* devslots.h:
* devslots.h (MARKED_SLOT):
* dialog-msw.c:
* dired-msw.c (mswindows_ls_sort_fcn):
* dired-msw.c (mswindows_get_files):
* dired-msw.c (mswindows_format_file):
* doprnt.c (parse_doprnt_spec):
* dumper.c:
* dumper.c (struct):
* dumper.c (dump_add_root_block):
* dumper.c (dump_add_root_struct_ptr):
* dumper.c (dump_add_root_lisp_object):
* dumper.c (pdump_struct_list_elt):
* dumper.c (pdump_get_entry_list):
* dumper.c (pdump_backtrace):
* dumper.c (pdump_bump_depth):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_register_object):
* dumper.c (pdump_register_struct_contents):
* dumper.c (pdump_register_struct):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_dump_data):
* dumper.c (pdump_reloc_one):
* dumper.c (pdump_allocate_offset):
* dumper.c (pdump_scan_by_alignment):
* dumper.c (pdump_dump_root_blocks):
* dumper.c (pdump_dump_rtables):
* dumper.c (pdump_dump_root_lisp_objects):
* dumper.c (pdump):
* dumper.c (pdump_load_finish):
* dumper.c (pdump_file_get):
* dumper.c (pdump_resource_get):
* dumper.c (pdump_load):
* editfns.c (save_excursion_restore):
* editfns.c (user_login_name):
* editfns.c (save_restriction_restore):
* elhash.c:
* elhash.c (htentry):
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (HTENTRY_CLEAR_P):
* elhash.c (LINEAR_PROBING_LOOP):
* elhash.c (check_hash_table_invariants):
* elhash.c (mark_hash_table):
* elhash.c (hash_table_equal):
* elhash.c (print_hash_table_data):
* elhash.c (free_hentries):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (decode_hash_table_weakness):
* elhash.c (decode_hash_table_test):
* elhash.c (Fcopy_hash_table):
* elhash.c (resize_hash_table):
* elhash.c (pdump_reorganize_hash_table):
* elhash.c (find_htentry):
* elhash.c (Fgethash):
* elhash.c (Fputhash):
* elhash.c (remhash_1):
* elhash.c (Fremhash):
* elhash.c (Fclrhash):
* elhash.c (copy_compress_hentries):
* elhash.c (elisp_maphash_unsafe):
* elhash.c (finish_marking_weak_hash_tables):
* elhash.c (prune_weak_hash_tables):
* elhash.h:
* emacs.c:
* emacs.c (main_1):
* emacs.c (main):
* emacs.c (shut_down_emacs):
* emodules.h (dump_add_root_lisp_object):
* eval.c:
* eval.c (unwind_to_catch):
* eval.c (maybe_signal_error_1):
* eval.c (maybe_signal_continuable_error_1):
* eval.c (maybe_signal_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (maybe_signal_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (maybe_signal_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (maybe_syntax_error):
* eval.c (maybe_sferror):
* eval.c (maybe_invalid_argument):
* eval.c (maybe_invalid_constant):
* eval.c (maybe_invalid_operation):
* eval.c (maybe_invalid_change):
* eval.c (maybe_invalid_state):
* eval.c (Feval):
* eval.c (call_trapping_problems):
* eval.c (call_with_suspended_errors):
* eval.c (warn_when_safe_lispobj):
* eval.c (warn_when_safe):
* eval.c (vars_of_eval):
* event-Xt.c:
* event-Xt.c (maybe_define_x_key_as_self_inserting_character):
* event-Xt.c (x_to_emacs_keysym):
* event-Xt.c (x_event_to_emacs_event):
* event-Xt.c (emacs_Xt_enqueue_focus_event):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (emacs_Xt_compare_magic_event):
* event-Xt.c (emacs_Xt_hash_magic_event):
* event-Xt.c (emacs_Xt_handle_magic_event):
* event-Xt.c (Xt_timeout_to_emacs_event):
* event-Xt.c (Xt_process_to_emacs_event):
* event-Xt.c (signal_special_Xt_user_event):
* event-Xt.c (emacs_Xt_next_event):
* event-Xt.c (emacs_Xt_event_handler):
* event-Xt.c (emacs_Xt_drain_queue):
* event-Xt.c (emacs_Xt_event_pending_p):
* event-Xt.c (check_if_pending_expose_event):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-Xt.c (vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (IS_MODIFIER_KEY):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (emacs_gtk_compare_magic_event):
* event-gtk.c (emacs_gtk_hash_magic_event):
* event-gtk.c (emacs_gtk_handle_magic_event):
* event-gtk.c (gtk_to_emacs_keysym):
* event-gtk.c (gtk_timeout_to_emacs_event):
* event-gtk.c (gtk_process_to_emacs_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (signal_special_gtk_user_event):
* event-gtk.c (emacs_gtk_next_event):
* event-gtk.c (gtk_event_to_emacs_event):
* event-gtk.c (generic_event_handler):
* event-gtk.c (emacs_shell_event_handler):
* event-gtk.c (emacs_gtk_drain_queue):
* event-gtk.c (emacs_gtk_event_pending_p):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-gtk.c (vars_of_event_gtk):
* event-msw.c:
* event-msw.c (struct winsock_stream):
* event-msw.c (winsock_reader):
* event-msw.c (winsock_writer):
* event-msw.c (mswindows_enqueue_dispatch_event):
* event-msw.c (mswindows_enqueue_misc_user_event):
* event-msw.c (mswindows_enqueue_magic_event):
* event-msw.c (mswindows_enqueue_process_event):
* event-msw.c (mswindows_enqueue_mouse_button_event):
* event-msw.c (mswindows_enqueue_keypress_event):
* event-msw.c (mswindows_dequeue_dispatch_event):
* event-msw.c (emacs_mswindows_drain_queue):
* event-msw.c (mswindows_need_event_in_modal_loop):
* event-msw.c (mswindows_need_event):
* event-msw.c (mswindows_wm_timer_callback):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (remove_timeout_mapper):
* event-msw.c (emacs_mswindows_remove_timeout):
* event-msw.c (emacs_mswindows_event_pending_p):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-msw.c (emacs_mswindows_compare_magic_event):
* event-msw.c (emacs_mswindows_hash_magic_event):
* event-msw.c (emacs_mswindows_handle_magic_event):
* event-msw.c (emacs_mswindows_select_console):
* event-msw.c (emacs_mswindows_unselect_console):
* event-msw.c (reinit_vars_of_event_mswindows):
* event-msw.c (vars_of_event_mswindows):
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (reset_command_builder_event_chain):
* event-stream.c (allocate_command_builder):
* event-stream.c (copy_command_builder):
* event-stream.c (command_builder_append_event):
* event-stream.c (event_stream_event_pending_p):
* event-stream.c (event_stream_force_event_pending):
* event-stream.c (maybe_read_quit_event):
* event-stream.c (event_stream_drain_queue):
* event-stream.c (remove_quit_p_event):
* event-stream.c (event_stream_quit_p):
* event-stream.c (echo_key_event):
* event-stream.c (maybe_kbd_translate):
* event-stream.c (execute_help_form):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (enqueue_dispatch_event):
* event-stream.c (enqueue_magic_eval_event):
* event-stream.c (Fenqueue_eval_event):
* event-stream.c (enqueue_misc_user_event):
* event-stream.c (enqueue_misc_user_event_pos):
* event-stream.c (next_event_internal):
* event-stream.c (Fnext_event):
* event-stream.c (Faccept_process_output):
* event-stream.c (execute_internal_event):
* event-stream.c (munge_keymap_translate):
* event-stream.c (command_builder_find_leaf_no_mule_processing):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* event-stream.c (is_scrollbar_event):
* event-stream.c (execute_command_event):
* event-stream.c (Fdispatch_event):
* event-stream.c (Fread_key_sequence):
* event-stream.c (dribble_out_event):
* event-stream.c (vars_of_event_stream):
* event-tty.c (tty_timeout_to_emacs_event):
* event-tty.c (emacs_tty_next_event):
* event-tty.c (emacs_tty_drain_queue):
* event-tty.c (reinit_vars_of_event_tty):
* event-unixoid.c:
* event-unixoid.c (find_tty_or_stream_console_from_fd):
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (drain_tty_devices):
* event-unixoid.c (poll_fds_for_input):
* events.c:
* events.c (deinitialize_event):
* events.c (zero_event):
* events.c (mark_event):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* events.c (event_hash):
* events.c (Fmake_event):
* events.c (Fdeallocate_event):
* events.c (Fcopy_event):
* events.c (map_event_chain_remove):
* events.c (character_to_event):
* events.c (event_to_character):
* events.c (Fevent_to_character):
* events.c (format_event_object):
* events.c (upshift_event):
* events.c (downshift_event):
* events.c (event_upshifted_p):
* events.c (Fevent_live_p):
* events.c (Fevent_type):
* events.c (Fevent_timestamp):
* events.c (CHECK_EVENT_TYPE):
* events.c (CHECK_EVENT_TYPE2):
* events.c (CHECK_EVENT_TYPE3):
* events.c (Fevent_key):
* events.c (Fevent_button):
* events.c (Fevent_modifier_bits):
* events.c (event_x_y_pixel_internal):
* events.c (event_pixel_translation):
* events.c (Fevent_process):
* events.c (Fevent_function):
* events.c (Fevent_object):
* events.c (Fevent_properties):
* events.c (syms_of_events):
* events.c (vars_of_events):
* events.h:
* events.h (struct event_stream):
* events.h (struct Lisp_Key_Data):
* events.h (KEY_DATA_KEYSYM):
* events.h (EVENT_KEY_KEYSYM):
* events.h (struct Lisp_Button_Data):
* events.h (EVENT_BUTTON_BUTTON):
* events.h (struct Lisp_Motion_Data):
* events.h (EVENT_MOTION_X):
* events.h (struct Lisp_Process_Data):
* events.h (EVENT_PROCESS_PROCESS):
* events.h (struct Lisp_Timeout_Data):
* events.h (EVENT_TIMEOUT_INTERVAL_ID):
* events.h (struct Lisp_Eval_Data):
* events.h (EVENT_EVAL_FUNCTION):
* events.h (struct Lisp_Misc_User_Data):
* events.h (EVENT_MISC_USER_FUNCTION):
* events.h (struct Lisp_Magic_Eval_Data):
* events.h (EVENT_MAGIC_EVAL_INTERNAL_FUNCTION):
* events.h (struct Lisp_Magic_Data):
* events.h (EVENT_MAGIC_UNDERLYING):
* events.h (EVENT_MAGIC_GDK_EVENT):
* events.h (struct Lisp_Event):
* events.h (XEVENT_CHANNEL):
* events.h (SET_EVENT_TIMESTAMP_ZERO):
* events.h (SET_EVENT_CHANNEL):
* events.h (SET_EVENT_NEXT):
* events.h (XSET_EVENT_TYPE):
* events.h (struct command_builder):
* extents.c:
* extents.c (gap_array_adjust_markers):
* extents.c (gap_array_recompute_derived_values):
* extents.c (gap_array_move_gap):
* extents.c (gap_array_make_gap):
* extents.c (gap_array_insert_els):
* extents.c (gap_array_delete_els):
* extents.c (gap_array_make_marker):
* extents.c (gap_array_delete_marker):
* extents.c (gap_array_move_marker):
* extents.c (make_gap_array):
* extents.c (free_gap_array):
* extents.c (extent_list_num_els):
* extents.c (extent_list_insert):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (decode_extent_at_flag):
* extents.c (verify_extent_mapper):
* extents.c (symbol_to_glyph_layout):
* extents.c (syms_of_extents):
* faces.c:
* file-coding.c:
* file-coding.c (struct_detector_category_description =):
* file-coding.c (detector_category_dynarr_description_1):
* file-coding.c (struct_detector_description =):
* file-coding.c (detector_dynarr_description_1):
* file-coding.c (MARKED_SLOT):
* file-coding.c (mark_coding_system):
* file-coding.c (coding_system_extra_description_map):
* file-coding.c (coding_system_description):
* file-coding.c (allocate_coding_system):
* file-coding.c (symbol_to_eol_type):
* file-coding.c (Fcoding_system_aliasee):
* file-coding.c (set_coding_stream_coding_system):
* file-coding.c (struct convert_eol_coding_system):
* file-coding.c (struct undecided_coding_system):
* file-coding.c (undecided_mark_coding_stream):
* file-coding.c (coding_category_symbol_to_id):
* file-coding.c (struct gzip_coding_system):
* file-coding.c (coding_system_type_create):
* file-coding.h:
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (CODING_SYSTEM_SLOT_DECLARATION):
* file-coding.h (coding_system_variant):
* file-coding.h (struct coding_system_methods):
* file-coding.h (DEFINE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (struct coding_stream):
* fileio.c (Fsubstitute_in_file_name):
* floatfns.c:
* fns.c:
* fns.c (base64_encode_1):
* frame-gtk.c:
* frame-gtk.c (Fgtk_start_drag_internal):
* frame-impl.h (struct frame):
* frame-impl.h (MARKED_SLOT):
* frame-msw.c:
* frame-x.c:
* frame-x.c (Fcde_start_drag_internal):
* frame-x.c (Foffix_start_drag_internal):
* frame.c:
* frame.c (MARKED_SLOT):
* frame.c (allocate_frame_core):
* frame.c (delete_frame_internal):
* frame.c (Fmouse_position_as_motion_event):
* frameslots.h:
* frameslots.h (MARKED_SLOT_ARRAY):
* free-hook.c:
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-x.c:
* glyphs-x.c (convert_EImage_to_XImage):
* glyphs.c:
* glyphs.c (process_image_string_instantiator):
* glyphs.c (mark_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (unmap_subwindow):
* glyphs.c (map_subwindow):
* glyphs.c (syms_of_glyphs):
* glyphs.c (specifier_type_create_image):
* glyphs.h:
* glyphs.h (struct text_image_instance):
* glyphs.h (struct Lisp_Image_Instance):
* gmalloc.c:
* gmalloc.c ("C"):
* gpmevent.c (Freceive_gpm_event):
* gpmevent.c (gpm_next_event_cb):
* gpmevent.c (vars_of_gpmevent):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.c (gtk_xemacs_class_init):
* gui-msw.c:
* gui-msw.c (mswindows_handle_gui_wm_command):
* gui-msw.c (mswindows_translate_menu_or_dialog_item):
* gui-x.c:
* gui-x.c (mark_popup_data):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (gcpro_popup_callbacks):
* gui-x.c (ungcpro_popup_callbacks):
* gui-x.c (free_popup_widget_value_tree):
* gui-x.c (popup_selection_callback):
* gui-x.h:
* gui-x.h (struct popup_data):
* gui.c:
* gui.c (allocate_gui_item):
* gutter.c (decode_gutter_position):
* hash.c (NULL_ENTRY):
* indent.c (vmotion_1):
* indent.c (vmotion_pixels):
* input-method-motif.c (res):
* input-method-xlib.c (IMInstantiateCallback):
* input-method-xlib.c (XIM_init_device):
* input-method-xlib.c (res):
* intl-encap-win32.c:
* intl-encap-win32.c (qxeSHGetDataFromIDList):
* intl-win32.c:
* intl-win32.c (mswindows_multibyte_cp_type):
* intl-win32.c (struct mswindows_multibyte_coding_system):
* keymap.c:
* keymap.c (make_key_description):
* keymap.c (keymap_store):
* keymap.c (get_keyelt):
* keymap.c (keymap_lookup_1):
* keymap.c (define_key_parser):
* keymap.c (key_desc_list_to_event):
* keymap.c (event_matches_key_specifier_p):
* keymap.c (meta_prefix_char_p):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fdefine_key):
* keymap.c (struct raw_lookup_key_mapper_closure):
* keymap.c (raw_lookup_key):
* keymap.c (raw_lookup_key_mapper):
* keymap.c (lookup_keys):
* keymap.c (lookup_events):
* keymap.c (Flookup_key):
* keymap.c (struct map_keymap_unsorted_closure):
* keymap.c (map_keymap_unsorted_mapper):
* keymap.c (map_keymap_sorted):
* keymap.c (map_keymap_mapper):
* keymap.c (map_keymap):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (Faccessible_keymaps):
* keymap.c (Fsingle_key_description):
* keymap.c (raw_keys_to_keys):
* keymap.c (format_raw_keys):
* keymap.c (where_is_recursive_mapper):
* keymap.c (where_is_internal):
* keymap.c (describe_map_mapper_shadow_search):
* keymap.c (keymap_lookup_inherited_mapper):
* keymap.c (describe_map_mapper):
* keymap.h (event_matches_key_specifier_p):
* lisp.h:
* lisp.h (this):
* lisp.h (RETURN_NOT_REACHED):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (UNGCPRO_1):
* lisp.h (NUNGCPRO):
* lisp.h (NNUNGCPRO):
* lisp.h (DECLARE_INLINE_HEADER):
* lrecord.h:
* lrecord.h (struct lrecord_header):
* lrecord.h (struct lcrecord_header):
* lrecord.h (lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (RECORD_DUMPABLE):
* lrecord.h (memory_description_type):
* lrecord.h (data_description_entry_flags):
* lrecord.h (struct memory_description):
* lrecord.h (struct sized_memory_description):
* lrecord.h (XD_INDIRECT):
* lrecord.h (XD_IS_INDIRECT):
* lrecord.h (XD_DYNARR_DESC):
* lrecord.h (DEFINE_BASIC_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION):
* lrecord.h (alloc_lcrecord_type):
* lstream.c:
* lstream.c (Lstream_new):
* lstream.c (lisp_buffer_marker):
* lstream.h:
* lstream.h (lstream_implementation):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION_WITH_DATA):
* marker.c:
* marker.c (copy_marker_1):
* mem-limits.h:
* menubar-gtk.c:
* menubar-gtk.c (gtk_popup_menu):
* menubar-msw.c:
* menubar-msw.c (mswindows_popup_menu):
* menubar-x.c (make_dummy_xbutton_event):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (menu_accelerator_safe_compare):
* menubar-x.c (menu_accelerator_safe_mod_compare):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (Fcharset_property):
* mule-coding.c:
* mule-coding.c (ccs_description_1):
* mule-coding.c (ccs_description =):
* mule-coding.c (ccsd_description_1):
* mule-coding.c (ccsd_description =):
* nt.c (getpwnam):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_is_executable):
* nt.c (read_unc_volume):
* nt.c (mswindows_access):
* nt.c (mswindows_link):
* nt.c (mswindows_fstat):
* nt.c (mswindows_stat):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty.c:
* objects-x.c (allocate_nearest_color):
* objects.c:
* objects.c (Fmake_color_instance):
* objects.c (Fmake_font_instance):
* objects.c (font_instantiate):
* opaque.c:
* opaque.c (make_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early):
* print.c:
* print.c (printing_badness):
* print.c (printing_major_badness):
* print.c (print_internal):
* print.c (debug_p4):
* print.c (dp):
* print.c (debug_backtrace):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-unix.c:
* process-unix.c (struct unix_process_data):
* process-unix.c (get_internet_address):
* process-unix.c (unix_alloc_process_data):
* process-unix.c (unix_create_process):
* process-unix.c (try_to_initialize_subtty):
* process-unix.c (unix_kill_child_process):
* process-unix.c (process_type_create_unix):
* process.c:
* process.c (mark_process):
* process.c (MARKED_SLOT):
* process.c (make_process_internal):
* process.c (Fprocess_tty_name):
* process.c (decode_signal):
* process.h:
* procimpl.h:
* procimpl.h (struct process_methods):
* procimpl.h (struct Lisp_Process):
* rangetab.c:
* realpath.c (readlink_and_correct_case):
* redisplay-x.c (x_window_output_end):
* redisplay-x.c (x_redraw_exposed_area):
* redisplay-x.c (x_clear_frame):
* redisplay.c:
* redisplay.h:
* redisplay.h (struct rune_dglyph):
* redisplay.h (struct rune):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* specifier.c:
* specifier.c (specifier_empty_extra_description_1):
* specifier.c (make_specifier_internal):
* specifier.c (decode_locale_type):
* specifier.c (decode_how_to_add_specification):
* specifier.h:
* specifier.h (struct specifier_methods):
* specifier.h (DEFINE_SPECIFIER_TYPE_WITH_DATA):
* specifier.h (INITIALIZE_SPECIFIER_TYPE_WITH_DATA):
* symbols.c:
* symbols.c (Fsetplist):
* symbols.c (default_value):
* symbols.c (decode_magic_handler_type):
* symbols.c (handler_type_from_function_symbol):
* symbols.c (Fdefvaralias):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symsinit.h:
* sysdep.c (sys_subshell):
* sysdep.c (tty_init_sys_modes_on_device):
* syswindows.h:
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* text.c (reinit_eistring_early):
* text.c (init_eistring_once_early):
* text.c (reinit_vars_of_text):
* text.h:
* text.h (INC_IBYTEPTR_FMT):
* text.h (DEC_IBYTEPTR_FMT):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* tooltalk.c:
* ui-gtk.c:
* unexnt.c:
* unexnt.c (_start):
* unexnt.c (unexec):
* unexnt.c (get_section_info):
* unicode.c:
* unicode.c (vars_of_unicode):
* window.c:
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (update_mirror_internal):
* winslots.h:
| author | michaels |
|---|---|
| date | Sun, 12 Jan 2003 11:08:22 +0000 |
| parents | c925bacdda60 |
| children | 1b0339b048ce |
line wrap: on
line diff
--- a/src/dumper.c Sun Jan 12 11:04:30 2003 +0000 +++ b/src/dumper.c Sun Jan 12 11:08:22 2003 +0000 @@ -30,9 +30,9 @@ #include "specifier.h" #include "file-coding.h" #include "elhash.h" +#include "lstream.h" #include "sysfile.h" #include "console-stream.h" -#include "dumper.h" #ifdef WIN32_NATIVE #include "syswindows.h" @@ -46,17 +46,18 @@ { const void *varaddress; Bytecount size; -} pdump_opaque; + const struct memory_description *desc; +} pdump_root_block; typedef struct { - Dynarr_declare (pdump_opaque); -} pdump_opaque_dynarr; + Dynarr_declare (pdump_root_block); +} pdump_root_block_dynarr; typedef struct { void **ptraddress; - const struct struct_description *desc; + const struct sized_memory_description *desc; } pdump_root_struct_ptr; typedef struct @@ -76,22 +77,24 @@ char * value; } pdump_static_pointer; -static pdump_opaque_dynarr *pdump_opaques; +static pdump_root_block_dynarr *pdump_root_blocks; static pdump_root_struct_ptr_dynarr *pdump_root_struct_ptrs; -static Lisp_Object_ptr_dynarr *pdump_root_objects; +static Lisp_Object_ptr_dynarr *pdump_root_lisp_objects; static Lisp_Object_ptr_dynarr *pdump_weak_object_chains; -/* Mark SIZE bytes at non-heap address VARADDRESS for dumping as is, - without any bit-twiddling. */ +/* Mark SIZE bytes at non-heap address VARADDRESS for dumping, described + by DESC. */ void -dump_add_opaque (const void *varaddress, Bytecount size) +dump_add_root_block (const void *varaddress, Bytecount size, + const struct memory_description *desc) { - pdump_opaque info; + pdump_root_block info; info.varaddress = varaddress; info.size = size; - if (pdump_opaques == NULL) - pdump_opaques = Dynarr_new (pdump_opaque); - Dynarr_add (pdump_opaques, info); + info.desc = desc; + if (pdump_root_blocks == NULL) + pdump_root_blocks = Dynarr_new (pdump_root_block); + Dynarr_add (pdump_root_blocks, info); } /* Mark the struct described by DESC and pointed to by the pointer at @@ -99,7 +102,7 @@ All the objects reachable from this pointer will also be dumped. */ void dump_add_root_struct_ptr (void *ptraddress, - const struct struct_description *desc) + const struct sized_memory_description *desc) { pdump_root_struct_ptr info; info.ptraddress = (void **) ptraddress; @@ -112,11 +115,11 @@ /* Mark the Lisp_Object at non-heap address VARADDRESS for dumping. All the objects reachable from this var will also be dumped. */ void -dump_add_root_object (Lisp_Object *varaddress) +dump_add_root_lisp_object (Lisp_Object *varaddress) { - if (pdump_root_objects == NULL) - pdump_root_objects = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); - Dynarr_add (pdump_root_objects, varaddress); + if (pdump_root_lisp_objects == NULL) + pdump_root_lisp_objects = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); + Dynarr_add (pdump_root_lisp_objects, varaddress); } /* Mark the list pointed to by the Lisp_Object at VARADDRESS for dumping. */ @@ -158,7 +161,7 @@ typedef struct { - const struct lrecord_description *desc; + const struct memory_description *desc; int count; } pdump_reloc_table; @@ -189,12 +192,13 @@ } -/* The structure of the file +/* The structure of the dump file looks like this: 0 - header - dumped objects - stab_offset - nb_root_struct_ptrs*pair(void *, adr) - for pointers to structures - - nb_opaques*pair(void *, size) for raw bits to restore + stab_offset - nb_root_struct_ptrs*struct(void *, adr) + for global pointers to structures + - nb_root_blocks*struct(void *, size, info) for global + objects to restore - relocation table - root lisp object address/value couples with the count preceding the list @@ -211,7 +215,7 @@ EMACS_UINT stab_offset; EMACS_UINT reloc_address; int nb_root_struct_ptrs; - int nb_opaques; + int nb_root_blocks; } pdump_header; char *pdump_start; @@ -260,7 +264,7 @@ typedef struct pdump_struct_list_elt { pdump_entry_list list; - const struct struct_description *sdesc; + const struct memory_description *desc; } pdump_struct_list_elt; typedef struct @@ -350,11 +354,11 @@ } static pdump_entry_list * -pdump_get_entry_list (const struct struct_description *sdesc) +pdump_get_entry_list (const struct memory_description *desc) { int i; for (i=0; i<pdump_struct_table.count; i++) - if (pdump_struct_table.list[i].sdesc == sdesc) + if (pdump_struct_table.list[i].desc == desc) return &pdump_struct_table.list[i].list; if (pdump_struct_table.size <= pdump_struct_table.count) @@ -370,7 +374,7 @@ pdump_struct_table.list[pdump_struct_table.count].list.first = 0; pdump_struct_table.list[pdump_struct_table.count].list.align = ALIGNOF (max_align_t); pdump_struct_table.list[pdump_struct_table.count].list.count = 0; - pdump_struct_table.list[pdump_struct_table.count].sdesc = sdesc; + pdump_struct_table.list[pdump_struct_table.count].desc = desc; return &pdump_struct_table.list[pdump_struct_table.count++].list; } @@ -382,14 +386,14 @@ int offset; } backtrace[65536]; -static int depth; +static int pdump_depth; -static void +void pdump_backtrace (void) { int i; stderr_out ("pdump backtrace :\n"); - for (i = 0; i < depth; i++) + for (i = 0; i < pdump_depth; i++) { if (!backtrace[i].obj) stderr_out (" - ind. (%d, %d)\n", @@ -398,86 +402,60 @@ else { stderr_out (" - %s (%d, %d)\n", - LHEADER_IMPLEMENTATION (backtrace[i].obj)->name, - backtrace[i].position, - backtrace[i].offset); + LHEADER_IMPLEMENTATION (backtrace[i].obj)->name, + backtrace[i].position, + backtrace[i].offset); } } } +static void +pdump_bump_depth (void) +{ + int me = pdump_depth++; + if (me > 65536) + { + stderr_out ("Backtrace overflow, loop ?\n"); + abort (); + } + backtrace[me].obj = 0; + backtrace[me].position = 0; + backtrace[me].offset = 0; +} + static void pdump_register_object (Lisp_Object obj); static void pdump_register_struct_contents (const void *data, - const struct struct_description * + const struct sized_memory_description * sdesc, int count); static void pdump_register_struct (const void *data, - const struct struct_description *sdesc, + const struct sized_memory_description *sdesc, int count); -static EMACS_INT -pdump_get_indirect_count (EMACS_INT code, - const struct lrecord_description *idesc, - const void *idata) -{ - EMACS_INT count; - const void *irdata; - - int line = XD_INDIRECT_VAL (code); - int delta = XD_INDIRECT_DELTA (code); - - irdata = ((char *)idata) + idesc[line].offset; - switch (idesc[line].type) - { - case XD_BYTECOUNT: - count = *(Bytecount *)irdata; - break; - case XD_ELEMCOUNT: - count = *(Elemcount *)irdata; - break; - case XD_HASHCODE: - count = *(Hashcode *)irdata; - break; - case XD_INT: - count = *(int *)irdata; - break; - case XD_LONG: - count = *(long *)irdata; - break; - default: - stderr_out ("Unsupported count type : %d (line = %d, code=%ld)\n", - idesc[line].type, line, (long)code); - pdump_backtrace (); - count = 0; /* warning suppression */ - abort (); - } - count += delta; - return count; -} - static void -pdump_register_sub (const void *data, const struct lrecord_description *desc, int me) +pdump_register_sub (const void *data, const struct memory_description *desc) { int pos; + int me = pdump_depth - 1; - restart: for (pos = 0; desc[pos].type != XD_END; pos++) { - const void *rdata = (const char *)data + desc[pos].offset; + const struct memory_description *desc1 = &desc[pos]; + EMACS_INT offset = lispdesc_indirect_count (desc1->offset, desc, + data); + const void *rdata = (const char *) data + offset; backtrace[me].position = pos; - backtrace[me].offset = desc[pos].offset; + backtrace[me].offset = offset; + + union_switcheroo: - switch (desc[pos].type) + /* If the flag says don't dump, then don't dump. */ + if ((desc1->flags) & XD_FLAG_NO_PDUMP) + continue; + + switch (desc1->type) { - case XD_SPECIFIER_END: - pos = 0; - desc = ((const Lisp_Specifier *)data)->methods->extra_description; - goto restart; - case XD_CODING_SYSTEM_END: - pos = 0; - desc = - ((const Lisp_Coding_System *)data)->methods->extra_description; - goto restart; case XD_BYTECOUNT: case XD_ELEMCOUNT: case XD_HASHCODE: @@ -488,9 +466,8 @@ break; case XD_OPAQUE_DATA_PTR: { - EMACS_INT count = desc[pos].data1; - if (XD_IS_INDIRECT (count)) - count = pdump_get_indirect_count (count, desc, data); + EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc, + data); pdump_add_entry (&pdump_opaque_data_list, *(void **)rdata, count, 1); @@ -498,78 +475,80 @@ } case XD_C_STRING: { - const char *str = *(const char **)rdata; + const char *str = * (const char **) rdata; if (str) - pdump_add_entry (&pdump_opaque_data_list, str, strlen (str)+1, 1); + pdump_add_entry (&pdump_opaque_data_list, str, strlen (str) + 1, + 1); break; } case XD_DOC_STRING: { - const char *str = *(const char **)rdata; - if ((EMACS_INT)str > 0) - pdump_add_entry (&pdump_opaque_data_list, str, strlen (str)+1, 1); + const char *str = * (const char **) rdata; + if ((EMACS_INT) str > 0) + pdump_add_entry (&pdump_opaque_data_list, str, strlen (str) + 1, + 1); break; } case XD_LISP_OBJECT: { - const Lisp_Object *pobj = (const Lisp_Object *)rdata; + const Lisp_Object *pobj = (const Lisp_Object *) rdata; - assert (desc[pos].data1 == 0); + assert (desc1->data1 == 0); - backtrace[me].offset = (const char *)pobj - (const char *)data; + backtrace[me].offset = (const char *) pobj - (const char *) data; pdump_register_object (*pobj); break; } case XD_LISP_OBJECT_ARRAY: { int i; - EMACS_INT count = desc[pos].data1; - if (XD_IS_INDIRECT (count)) - count = pdump_get_indirect_count (count, desc, data); + EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc, + data); for (i = 0; i < count; i++) { - const Lisp_Object *pobj = ((const Lisp_Object *)rdata) + i; + const Lisp_Object *pobj = ((const Lisp_Object *) rdata) + i; Lisp_Object dobj = *pobj; - backtrace[me].offset = (const char *)pobj - (const char *)data; + backtrace[me].offset = + (const char *) pobj - (const char *) data; pdump_register_object (dobj); } break; } case XD_STRUCT_PTR: { - EMACS_INT count = desc[pos].data1; - const struct struct_description *sdesc = desc[pos].data2; + EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc, + data); + const struct sized_memory_description *sdesc = + lispdesc_indirect_description (data, desc1->data2); const char *dobj = *(const char **)rdata; if (dobj) - { - if (XD_IS_INDIRECT (count)) - count = pdump_get_indirect_count (count, desc, data); - - pdump_register_struct (dobj, sdesc, count); - } + pdump_register_struct (dobj, sdesc, count); break; } case XD_STRUCT_ARRAY: { - EMACS_INT count = desc[pos].data1; - const struct struct_description *sdesc = desc[pos].data2; - - if (XD_IS_INDIRECT (count)) - count = pdump_get_indirect_count (count, desc, data); + EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc, + data); + const struct sized_memory_description *sdesc = + lispdesc_indirect_description (data, desc1->data2); pdump_register_struct_contents (rdata, sdesc, count); break; } case XD_UNION: - abort (); /* #### IMPLEMENT ME! NEEDED FOR UNICODE SUPPORT */ + case XD_UNION_DYNAMIC_SIZE: + desc1 = lispdesc_process_xd_union (desc1, desc, data); + if (desc1) + goto union_switcheroo; + break; default: - stderr_out ("Unsupported dump type : %d\n", desc[pos].type); + stderr_out ("Unsupported dump type : %d\n", desc1->type); pdump_backtrace (); abort (); - }; + } } } @@ -591,31 +570,15 @@ imp = LHEADER_IMPLEMENTATION (objh); -#ifdef USE_KKCC if (imp->description - && RECORD_DUMPABLE(objh)) -#else /* not USE_KKCC */ - if (imp->description) -#endif /* not USE_KKCC */ + && RECORD_DUMPABLE (objh)) { - int me = depth++; - if (me > 65536) - { - stderr_out ("Backtrace overflow, loop ?\n"); - abort (); - } - backtrace[me].obj = objh; - backtrace[me].position = 0; - backtrace[me].offset = 0; - + pdump_bump_depth (); + backtrace[pdump_depth - 1].obj = objh; pdump_add_entry (pdump_object_table + objh->type, - objh, - imp->static_size ? - imp->static_size : - imp->size_in_bytes_method (objh), - 1); - pdump_register_sub (objh, imp->description, me); - --depth; + objh, detagged_lisp_object_size (objh), 1); + pdump_register_sub (objh, imp->description); + --pdump_depth; } else { @@ -625,144 +588,6 @@ } } -/* Return the size of the memory block (NOT necessarily a structure!) - described by SDESC and pointed to by OBJ. If SDESC records an - explicit size (i.e. non-zero), it is simply returned; otherwise, - the size is calculated by the maximum offset and the size of the - object at that offset, rounded up to the maximum alignment. In - this case, we may need the object, for example when retrieving an - "indirect count" of an inlined array (the count is not constant, - but is specified by one of the elements of the memory block). (It - is generally not a problem if we return an overly large size -- we - will simply end up reserving more space than necessary; but if the - size is too small we could be in serious trouble, in particular - with nested inlined structures, where there may be alignment - padding in the middle of a block. #### In fact there is an (at - least theoretical) problem with an overly large size -- we may - trigger a protection fault when reading from invalid memory. We - need to handle this -- perhaps in a stupid but dependable way, - i.e. by trapping SIGSEGV and SIGBUS.) */ - -static Bytecount -pdump_structure_size (const void *obj, const struct struct_description *sdesc) -{ - int max_offset = -1; - int max_offset_pos = -1; - int size_at_max = 0; - int pos; - const struct lrecord_description *desc; - void *rdata; - - if (sdesc->size) - return sdesc->size; - - desc = sdesc->description; - - for (pos = 0; desc[pos].type != XD_END; pos++) - { - if (desc[pos].offset == max_offset) - { - stderr_out ("Two relocatable elements at same offset?\n"); - abort (); - } - else if (desc[pos].offset > max_offset) - { - max_offset = desc[pos].offset; - max_offset_pos = pos; - } - } - - if (max_offset_pos < 0) - return 0; - - pos = max_offset_pos; - rdata = (char *) obj + desc[pos].offset; - - switch (desc[pos].type) - { - case XD_LISP_OBJECT_ARRAY: - { - EMACS_INT val = desc[pos].data1; - if (XD_IS_INDIRECT (val)) - val = pdump_get_indirect_count (val, desc, obj); - size_at_max = val * sizeof (Lisp_Object); - break; - } - case XD_LISP_OBJECT: - case XD_LO_LINK: - size_at_max = sizeof (Lisp_Object); - break; - case XD_OPAQUE_PTR: - size_at_max = sizeof (void *); - break; - case XD_STRUCT_PTR: - { - EMACS_INT val = desc[pos].data1; - if (XD_IS_INDIRECT (val)) - val = pdump_get_indirect_count (val, desc, obj); - size_at_max = val * sizeof (void *); - break; - } - break; - case XD_STRUCT_ARRAY: - { - EMACS_INT val = desc[pos].data1; - - if (XD_IS_INDIRECT (val)) - val = pdump_get_indirect_count (val, desc, obj); - - size_at_max = val * pdump_structure_size (rdata, desc[pos].data2); - break; - } - break; - case XD_OPAQUE_DATA_PTR: - size_at_max = sizeof (void *); - break; - case XD_UNION: - abort (); /* #### IMPLEMENT ME! NEEDED FOR UNICODE - SUPPORT */ - break; - case XD_C_STRING: - size_at_max = sizeof (void *); - break; - case XD_DOC_STRING: - size_at_max = sizeof (void *); - break; - case XD_INT_RESET: - size_at_max = sizeof (int); - break; - case XD_BYTECOUNT: - size_at_max = sizeof (Bytecount); - break; - case XD_ELEMCOUNT: - size_at_max = sizeof (Elemcount); - break; - case XD_HASHCODE: - size_at_max = sizeof (Hashcode); - break; - case XD_INT: - size_at_max = sizeof (int); - break; - case XD_LONG: - size_at_max = sizeof (long); - break; - case XD_SPECIFIER_END: - case XD_CODING_SYSTEM_END: - stderr_out - ("Should not be seeing XD_SPECIFIER_END or\n" - "XD_CODING_SYSTEM_END outside of struct Lisp_Specifier\n" - "and struct Lisp_Coding_System.\n"); - abort (); - default: - stderr_out ("Unsupported dump type : %d\n", desc[pos].type); - abort (); - } - - /* We have no way of knowing the required alignment for this structure, - so just max it maximally aligned. */ - return MAX_ALIGN_SIZE (max_offset + size_at_max); -} - /* Register the referenced objects in the array of COUNT objects of located at DATA; each object is described by SDESC. "Object" here simply means any block of memory; it need not actually be a C @@ -776,32 +601,20 @@ static void pdump_register_struct_contents (const void *data, - const struct struct_description *sdesc, + const struct sized_memory_description *sdesc, int count) { - int me = depth++; int i; Bytecount elsize; - if (me>65536) - { - stderr_out ("Backtrace overflow, loop ?\n"); - abort (); - } - backtrace[me].obj = 0; - backtrace[me].position = 0; - backtrace[me].offset = 0; - - elsize = pdump_structure_size (data, sdesc); - + pdump_bump_depth (); + elsize = lispdesc_structure_size (data, sdesc); for (i = 0; i < count; i++) { - pdump_register_sub (((char *) data) + elsize * i, - sdesc->description, - me); + pdump_register_sub (((char *) data) + elsize * i, sdesc->description); } - --depth; + --pdump_depth; } /* Register the array of COUNT objects of located at DATA; each object is @@ -814,47 +627,47 @@ static void pdump_register_struct (const void *data, - const struct struct_description *sdesc, + const struct sized_memory_description *sdesc, int count) { if (data && !pdump_get_entry (data)) { - pdump_add_entry (pdump_get_entry_list (sdesc), data, - pdump_structure_size (data, sdesc), count); + pdump_add_entry (pdump_get_entry_list (sdesc->description), data, + lispdesc_structure_size (data, sdesc), count); pdump_register_struct_contents (data, sdesc, count); } } -/* Store the already-calculated new pointer offsets for all pointers - in the COUNT contiguous blocks of memory, each described by DESC - and of size SIZE, whose original is located at ORIG_DATA and the - modifiable copy at DATA. +/* Store the already-calculated new pointer offsets for all pointers in the + COUNT contiguous blocks of memory, each described by DESC and of size + SIZE, whose original is located at ORIG_DATA and the modifiable copy at + DATA. We examine the description to figure out where the pointers are, + and then look up the replacement values using pdump_get_entry(). - This is done just before writing the modified block of memory to - the dump file. The new pointer offsets have been carefully - calculated so that the data being pointed gets written at that - offset in the dump file. That way, the dump file is a correct - memory image except perhaps for a constant that needs to be added - to all pointers. (#### In fact, we SHOULD be starting up a dumped - XEmacs, seeing where the dumped file gets loaded into memory, and - then rewriting the dumped file after relocating all the pointers - relative to this memory location. That way, if the file gets - loaded again at the same location, which will be common, we don't - have to do any relocating, which is both faster at startup and + This is done just before writing the modified block of memory to the + dump file. The new pointer offsets have been carefully calculated so + that the data being pointed gets written at that offset in the dump + file. That way, the dump file is a correct memory image except perhaps + for a constant that needs to be added to all pointers. (#### In fact, we + SHOULD be starting up a dumped XEmacs, seeing where the dumped file gets + loaded into memory, and then rewriting the dumped file after relocating + all the pointers relative to this memory location. That way, if the + file gets loaded again at the same location, which will be common, we + don't have to do any relocating, which is both faster at startup and allows the read-only part of the dumped data to be shared read-only between different invocations of XEmacs.) #### Do we distinguish between read-only and writable dumped data? Should we? It's tricky because the dumped data, once loaded again, - cannot really be free()d or garbage collected since it's all stored - in one contiguous block of data with no malloc() headers, and we - don't keep track of the pointers used internally in malloc() and - the Lisp allocator to track allocated blocks of memory. */ + cannot really be free()d or garbage collected since it's all stored in + one contiguous block of data with no malloc() headers, and we don't keep + track of the pointers used internally in malloc() and the Lisp allocator + to track allocated blocks of memory. */ static void pdump_store_new_pointer_offsets (int count, void *data, const void *orig_data, - const struct lrecord_description *desc, + const struct memory_description *desc, int size) { int pos, i; @@ -863,22 +676,22 @@ { /* CUR points to the beginning of each block in the new data. */ char *cur = ((char *)data) + i*size; - restart: /* Scan each line of the description for relocatable pointers */ for (pos = 0; desc[pos].type != XD_END; pos++) { /* RDATA points to the beginning of each element in the new data. */ - void *rdata = cur + desc[pos].offset; - switch (desc[pos].type) + const struct memory_description *desc1 = &desc[pos]; + /* #### Change ORIG_DATA to DATA. See below. */ + void *rdata = cur + lispdesc_indirect_count (desc1->offset, desc, + orig_data); + union_switcheroo: + + /* If the flag says don't dump, then don't dump. */ + if ((desc1->flags) & XD_FLAG_NO_PDUMP) + continue; + + switch (desc1->type) { - case XD_SPECIFIER_END: - desc = ((const Lisp_Specifier *)(orig_data))-> - methods->extra_description; - goto restart; - case XD_CODING_SYSTEM_END: - desc = ((const Lisp_Coding_System *)(orig_data))-> - methods->extra_description; - goto restart; case XD_BYTECOUNT: case XD_ELEMCOUNT: case XD_HASHCODE: @@ -887,9 +700,8 @@ break; case XD_INT_RESET: { - EMACS_INT val = desc[pos].data1; - if (XD_IS_INDIRECT (val)) - val = pdump_get_indirect_count (val, desc, orig_data); + EMACS_INT val = lispdesc_indirect_count (desc1->data1, desc, + orig_data); * (int *) rdata = val; break; } @@ -914,12 +726,23 @@ chain will always be a referenced object.) */ Lisp_Object obj = * (Lisp_Object *) rdata; pdump_entry_list_elt *elt1; + /* #### Figure out how to handle indirect offsets here. + #### In general, when computing indirect counts, do we + really need to use the orig_data pointer? Why not just + use the new stuff? + + No, we don't usually need orig_data. We only need it + when fetching pointers out of the data, not integers. + This currently occurs only with description maps. We + should change the other places to DATA to emphasize + this. */ + assert (!XD_IS_INDIRECT (desc1->offset)); for (;;) { elt1 = pdump_get_entry (XRECORD_LHEADER (obj)); if (elt1) break; - obj = * (Lisp_Object *) (desc[pos].offset + + obj = * (Lisp_Object *) (desc1->offset + (char *)(XRECORD_LHEADER (obj))); } * (EMACS_INT *) rdata = elt1->save_offset; @@ -929,7 +752,7 @@ { Lisp_Object *pobj = (Lisp_Object *) rdata; - assert (desc[pos].data1 == 0); + assert (desc1->data1 == 0); if (POINTER_TYPE_P (XTYPE (*pobj)) && XRECORD_LHEADER (*pobj)) * (EMACS_INT *) pobj = @@ -938,10 +761,9 @@ } case XD_LISP_OBJECT_ARRAY: { - EMACS_INT num = desc[pos].data1; + EMACS_INT num = lispdesc_indirect_count (desc1->data1, desc, + orig_data); int j; - if (XD_IS_INDIRECT (num)) - num = pdump_get_indirect_count (num, desc, orig_data); for (j = 0; j < num; j++) { @@ -963,25 +785,29 @@ } case XD_STRUCT_ARRAY: { - EMACS_INT num = desc[pos].data1; - if (XD_IS_INDIRECT (num)) - num = pdump_get_indirect_count (num, desc, orig_data); + EMACS_INT num = lispdesc_indirect_count (desc1->data1, desc, + orig_data); + const struct sized_memory_description *sdesc = + lispdesc_indirect_description (orig_data, desc1->data2); pdump_store_new_pointer_offsets (num, rdata, ((char *) rdata - (char *) data) + (char *) orig_data, - desc[pos].data2->description, - pdump_structure_size + sdesc->description, + lispdesc_structure_size (((char *) rdata - (char *) data) + (char *) orig_data, - desc[pos].data2)); + sdesc)); break; } case XD_UNION: - abort (); /* #### IMPLEMENT ME! NEEDED FOR UNICODE - SUPPORT */ + case XD_UNION_DYNAMIC_SIZE: + desc1 = lispdesc_process_xd_union (desc1, desc, orig_data); + if (desc1) + goto union_switcheroo; + break; default: - stderr_out ("Unsupported dump type : %d\n", desc[pos].type); + stderr_out ("Unsupported dump type : %d\n", desc1->type); abort (); } } @@ -997,7 +823,7 @@ static void pdump_dump_data (pdump_entry_list_elt *elt, - const struct lrecord_description *desc) + const struct memory_description *desc) { Bytecount size = elt->size; int count = elt->count; @@ -1013,32 +839,33 @@ } /* Relocate a single memory block at DATA, described by DESC, from its - assumed load location to its actual one by adding DELTA to all - pointers in the block. Does not recursively relocate any other - memory blocks pointed to. (We already have a list of all memory - blocks in the dump file.) */ + assumed load location to its actual one by adding DELTA to all pointers + in the block. Does not recursively relocate any other memory blocks + pointed to. (We already have a list of all memory blocks in the dump + file.) This is used once the dump data has been loaded back in, both + for blocks sitting in the dumped data and in global data objects whose + contents have been restored from the dumped data. */ static void pdump_reloc_one (void *data, EMACS_INT delta, - const struct lrecord_description *desc) + const struct memory_description *desc) { int pos; - restart: for (pos = 0; desc[pos].type != XD_END; pos++) { - void *rdata = (char *)data + desc[pos].offset; - switch (desc[pos].type) + const struct memory_description *desc1 = &desc[pos]; + void *rdata = (char *) data + lispdesc_indirect_count (desc1->offset, + desc, data); + + union_switcheroo: + + /* If the flag says don't dump, then don't dump. */ + if ((desc1->flags) & XD_FLAG_NO_PDUMP) + continue; + + switch (desc1->type) { - case XD_SPECIFIER_END: - pos = 0; - desc = ((const Lisp_Specifier *)data)->methods->extra_description; - goto restart; - case XD_CODING_SYSTEM_END: - pos = 0; - desc = - ((const Lisp_Coding_System *)data)->methods->extra_description; - goto restart; case XD_BYTECOUNT: case XD_ELEMCOUNT: case XD_HASHCODE: @@ -1060,7 +887,7 @@ { Lisp_Object *pobj = (Lisp_Object *) rdata; - assert (desc[pos].data1 == 0); + assert (desc1->data1 == 0); if (POINTER_TYPE_P (XTYPE (*pobj)) && ! EQ (*pobj, Qnull_pointer)) @@ -1070,10 +897,9 @@ } case XD_LISP_OBJECT_ARRAY: { - EMACS_INT num = desc[pos].data1; + EMACS_INT num = lispdesc_indirect_count (desc1->data1, desc, + data); int j; - if (XD_IS_INDIRECT (num)) - num = pdump_get_indirect_count (num, desc, data); for (j=0; j<num; j++) { @@ -1094,13 +920,13 @@ } case XD_STRUCT_ARRAY: { - EMACS_INT num = desc[pos].data1; + EMACS_INT num = lispdesc_indirect_count (desc1->data1, desc, + data); int j; - const struct struct_description *sdesc = desc[pos].data2; - Bytecount size = pdump_structure_size (rdata, sdesc); + const struct sized_memory_description *sdesc = + lispdesc_indirect_description (data, desc1->data2); + Bytecount size = lispdesc_structure_size (rdata, sdesc); - if (XD_IS_INDIRECT (num)) - num = pdump_get_indirect_count (num, desc, data); /* Note: We are recursing over data in the block itself */ for (j = 0; j < num; j++) pdump_reloc_one ((char *) rdata + j * size, delta, @@ -1108,19 +934,23 @@ break; } + case XD_UNION: + case XD_UNION_DYNAMIC_SIZE: + desc1 = lispdesc_process_xd_union (desc1, desc, data); + if (desc1) + goto union_switcheroo; + break; - case XD_UNION: - abort (); /* #### IMPLEMENT ME! NEEDED FOR UNICODE SUPPORT */ default: - stderr_out ("Unsupported dump type : %d\n", desc[pos].type); + stderr_out ("Unsupported dump type : %d\n", desc1->type); abort (); - }; + } } } static void pdump_allocate_offset (pdump_entry_list_elt *elt, - const struct lrecord_description *desc) + const struct memory_description *desc) { Bytecount size = elt->count * elt->size; elt->save_offset = cur_offset; @@ -1131,7 +961,7 @@ static void pdump_scan_by_alignment (void (*f)(pdump_entry_list_elt *, - const struct lrecord_description *)) + const struct memory_description *)) { int align; @@ -1150,7 +980,7 @@ pdump_struct_list_elt list = pdump_struct_table.list[i]; if (list.list.align == align) for (elt = list.list.first; elt; elt = elt->next) - f (elt, list.sdesc->description); + f (elt, list.desc); } for (elt = pdump_opaque_data_list.first; elt; elt = elt->next) @@ -1175,13 +1005,13 @@ } static void -pdump_dump_opaques (void) +pdump_dump_root_blocks (void) { int i; - for (i = 0; i < Dynarr_length (pdump_opaques); i++) + for (i = 0; i < Dynarr_length (pdump_root_blocks); i++) { - pdump_opaque *info = Dynarr_atp (pdump_opaques, i); - PDUMP_WRITE_ALIGNED (pdump_opaque, *info); + pdump_root_block *info = Dynarr_atp (pdump_root_blocks, i); + PDUMP_WRITE_ALIGNED (pdump_root_block, *info); retry_fwrite (info->varaddress, info->size, 1, pdump_out); } } @@ -1216,7 +1046,7 @@ for (i=0; i<pdump_struct_table.count; i++) { elt = pdump_struct_table.list[i].list.first; - rt.desc = pdump_struct_table.list[i].sdesc->description; + rt.desc = pdump_struct_table.list[i].desc; rt.count = pdump_struct_table.list[i].list.count; PDUMP_WRITE_ALIGNED (pdump_reloc_table, rt); while (elt) @@ -1237,19 +1067,19 @@ } static void -pdump_dump_root_objects (void) +pdump_dump_root_lisp_objects (void) { - Elemcount count = (Dynarr_length (pdump_root_objects) + + Elemcount count = (Dynarr_length (pdump_root_lisp_objects) + Dynarr_length (pdump_weak_object_chains)); Elemcount i; PDUMP_WRITE_ALIGNED (Elemcount, count); PDUMP_ALIGN_OUTPUT (pdump_static_Lisp_Object); - for (i = 0; i < Dynarr_length (pdump_root_objects); i++) + for (i = 0; i < Dynarr_length (pdump_root_lisp_objects); i++) { pdump_static_Lisp_Object obj; - obj.address = Dynarr_at (pdump_root_objects, i); + obj.address = Dynarr_at (pdump_root_lisp_objects, i); obj.value = * obj.address; if (POINTER_TYPE_P (XTYPE (obj.value))) @@ -1270,7 +1100,7 @@ for (;;) { - const struct lrecord_description *desc; + const struct memory_description *desc; int pos; elt = pdump_get_entry (XRECORD_LHEADER (obj.value)); if (elt) @@ -1279,7 +1109,11 @@ for (pos = 0; desc[pos].type != XD_LO_LINK; pos++) assert (desc[pos].type != XD_END); - obj.value = *(Lisp_Object *)(desc[pos].offset + (char *)(XRECORD_LHEADER (obj.value))); + /* #### Figure out how to handle indirect offsets here. */ + assert (!XD_IS_INDIRECT (desc[pos].offset)); + obj.value = + * (Lisp_Object *) (desc[pos].offset + + (char *) (XRECORD_LHEADER (obj.value))); } obj.value = wrap_pointer_1 ((void *) elt->save_offset); @@ -1295,6 +1129,8 @@ int none; pdump_header header; + in_pdump = 1; + pdump_object_table = xnew_array (pdump_entry_list, lrecord_type_count); pdump_alert_undump_object = xnew_array (int, lrecord_type_count); @@ -1312,7 +1148,8 @@ t_device = Vterminal_device; Vterminal_device = Qnil; dump_add_opaque (&lrecord_implementations_table, - lrecord_type_count * sizeof (lrecord_implementations_table[0])); + lrecord_type_count * + sizeof (lrecord_implementations_table[0])); dump_add_opaque (&lrecord_markers, lrecord_type_count * sizeof (lrecord_markers[0])); @@ -1331,10 +1168,10 @@ pdump_opaque_data_list.first = 0; pdump_opaque_data_list.align = ALIGNOF (max_align_t); pdump_opaque_data_list.count = 0; - depth = 0; + pdump_depth = 0; - for (i=0; i<Dynarr_length (pdump_root_objects); i++) - pdump_register_object (* Dynarr_at (pdump_root_objects, i)); + for (i = 0; i < Dynarr_length (pdump_root_lisp_objects); i++) + pdump_register_object (* Dynarr_at (pdump_root_lisp_objects, i)); none = 1; for (i=0; i<lrecord_type_count; i++) @@ -1343,10 +1180,14 @@ if (none) printf ("Undumpable types list :\n"); none = 0; - printf (" - %s (%d)\n", lrecord_implementations_table[i]->name, pdump_alert_undump_object[i]); + printf (" - %s (%d)\n", lrecord_implementations_table[i]->name, + pdump_alert_undump_object[i]); } if (!none) - return; + { + in_pdump = 0; + return; + } for (i=0; i<Dynarr_length (pdump_root_struct_ptrs); i++) { @@ -1358,7 +1199,7 @@ header.id = dump_id; header.reloc_address = 0; header.nb_root_struct_ptrs = Dynarr_length (pdump_root_struct_ptrs); - header.nb_opaques = Dynarr_length (pdump_opaques); + header.nb_root_blocks = Dynarr_length (pdump_root_blocks); cur_offset = MAX_ALIGN_SIZE (sizeof (header)); max_size = 0; @@ -1386,9 +1227,9 @@ fseek (pdump_out, header.stab_offset, SEEK_SET); pdump_dump_root_struct_ptrs (); - pdump_dump_opaques (); + pdump_dump_root_blocks (); pdump_dump_rtables (); - pdump_dump_root_objects (); + pdump_dump_root_lisp_objects (); retry_fclose (pdump_out); retry_close (pdump_fd); @@ -1400,6 +1241,7 @@ Vterminal_console = t_console; Vterminal_frame = t_frame; Vterminal_device = t_device; + in_pdump = 0; } static int @@ -1420,30 +1262,32 @@ char *p; EMACS_INT delta; EMACS_INT count; - pdump_header *header = (pdump_header *)pdump_start; + pdump_header *header = (pdump_header *) pdump_start; pdump_end = pdump_start + pdump_length; - delta = ((EMACS_INT)pdump_start) - header->reloc_address; + delta = ((EMACS_INT) pdump_start) - header->reloc_address; p = pdump_start + header->stab_offset; /* Put back the pdump_root_struct_ptrs */ p = (char *) ALIGN_PTR (p, pdump_static_pointer); - for (i=0; i<header->nb_root_struct_ptrs; i++) + for (i = 0; i < header->nb_root_struct_ptrs; i++) { pdump_static_pointer ptr = PDUMP_READ (p, pdump_static_pointer); (* ptr.address) = ptr.value + delta; } - /* Put back the pdump_opaques */ - for (i=0; i<header->nb_opaques; i++) + /* Put back the pdump_root_blocks and relocate */ + for (i = 0; i < header->nb_root_blocks; i++) { - pdump_opaque info = PDUMP_READ_ALIGNED (p, pdump_opaque); - memcpy ((void*)info.varaddress, p, info.size); + pdump_root_block info = PDUMP_READ_ALIGNED (p, pdump_root_block); + memcpy ((void *) info.varaddress, p, info.size); + if (info.desc) + pdump_reloc_one ((void *) info.varaddress, delta, info.desc); p += info.size; } - /* Do the relocations */ + /* Relocate the heap objects */ pdump_rt_list = p; count = 2; for (;;) @@ -1452,19 +1296,19 @@ p = (char *) ALIGN_PTR (p, char *); if (rt.desc) { - char **reloc = (char **)p; - for (i=0; i < rt.count; i++) + char **reloc = (char **) p; + for (i = 0; i < rt.count; i++) { reloc[i] += delta; pdump_reloc_one (reloc[i], delta, rt.desc); } p += rt.count * sizeof (char *); - } else - if (!(--count)) - break; + } + else if (!(--count)) + break; } - /* Put the pdump_root_objects variables in place */ + /* Put the pdump_root_lisp_objects variables in place */ i = PDUMP_READ_ALIGNED (p, Elemcount); p = (char *) ALIGN_PTR (p, pdump_static_Lisp_Object); while (i--) @@ -1488,11 +1332,12 @@ break; if (rt.desc == hash_table_description) { - for (i=0; i < rt.count; i++) + for (i = 0; i < rt.count; i++) pdump_reorganize_hash_table (PDUMP_READ (p, Lisp_Object)); break; - } else - p += sizeof (Lisp_Object) * rt.count; + } + else + p += sizeof (Lisp_Object) * rt.count; } return 1; @@ -1532,11 +1377,11 @@ if (pdump_hMap == INVALID_HANDLE_VALUE) return 0; - pdump_start = MapViewOfFile (pdump_hMap, - FILE_MAP_COPY, /* Copy on write */ - 0, /* Start at zero */ - 0, - 0); /* Map all of it */ + pdump_start = (char *) MapViewOfFile (pdump_hMap, + FILE_MAP_COPY, /* Copy on write */ + 0, /* Start at zero */ + 0, + 0); /* Map all of it */ pdump_free = pdump_file_unmap; return 1; } @@ -1571,11 +1416,11 @@ return 0; /* Found it, use the data in the resource */ - hResLoad = LoadResource (NULL, hRes); + hResLoad = (HRSRC) LoadResource (NULL, hRes); if (hResLoad == NULL) return 0; - pdump_start = LockResource (hResLoad); + pdump_start = (char *) LockResource (hResLoad); if (pdump_start == NULL) return 0; @@ -1696,6 +1541,7 @@ Extbyte *w; const Extbyte *dir, *p; + in_pdump = 1; dir = argv0; if (dir[0] == '-') { @@ -1753,6 +1599,7 @@ if (pdump_file_try (exe_path)) { pdump_load_finish (); + in_pdump = 0; return 1; } @@ -1762,11 +1609,13 @@ if (pdump_load_check ()) { pdump_load_finish (); + in_pdump = 0; return 1; } pdump_free (); } #endif + in_pdump = 0; return 0; }