Mercurial > hg > xemacs-beta
annotate src/unexnt.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 | 804517e16990 |
children | 04bc9d2f42c7 |
rev | line source |
---|---|
613 | 1 /* unexec for XEmacs on Windows NT. |
428 | 2 Copyright (C) 1994 Free Software Foundation, Inc. |
1204 | 3 Copyright (C) 2002 Ben Wing. |
428 | 4 |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to the Free | |
19 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
20 02111-1307, USA. | |
21 | |
22 Geoff Voelker (voelker@cs.washington.edu) 8-12-94 */ | |
23 | |
24 /* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */ | |
25 | |
814 | 26 /* This file has been Mule-ized, Ben Wing, 4-13-02. */ |
27 | |
428 | 28 /* The linkers that come with MSVC >= 4.0 merge .bss into .data and reorder |
29 * uninitialised data so that the .data section looks like: | |
30 * | |
31 * crt0 initialised data | |
32 * emacs initialised data | |
33 * <my_edata> | |
34 * library initialised data | |
35 * <start of bss part of .data> | |
36 * emacs static uninitialised data | |
37 * library static uninitialised data | |
38 * emacs global uninitialised data | |
39 * <my_ebss> | |
40 * library global uninitialised data | |
41 * | |
42 * This means that we can't use the normal my_ebss in lastfile.c trick to | |
43 * differentiate between unitialised data that belongs to emacs and | |
44 * uninitialised data that belongs to system libraries. This is bad because | |
45 * we do want to initialise the emacs data, but we don't want to initialise | |
46 * the system library data. | |
47 * | |
48 * To solve this problem using MSVC >= 5.0 we use a pragma directive to tell | |
49 * the compiler to put emacs's data (both initialised and uninitialised) in | |
50 * a separate section in the executable, and we only dump that section. This | |
51 * means that all files that define initialized data must include config.h | |
52 * to pick up the pragma. We don't try to make any part of that section | |
53 * read-only. | |
54 * | |
55 * This pragma directive isn't supported by the MSVC 4.x compiler. Instead, | |
56 * we dump crt0 initialised data and library static uninitialised data in | |
57 * addition to the emacs data. This is wrong, but we appear to be able to | |
58 * get away with it. A proper fix might involve the introduction of a static | |
59 * version of my_ebss in lastfile.c and a new firstfile.c file. jhar */ | |
60 | |
61 #include <config.h> | |
442 | 62 #include "lisp.h" |
63 | |
558 | 64 #include "sysfile.h" |
442 | 65 #include "syswindows.h" |
66 | |
428 | 67 /* From IMAGEHLP.H which is not installed by default by MSVC < 5 */ |
68 /* The IMAGEHLP.DLL library is not distributed by default with Windows95 */ | |
442 | 69 typedef PIMAGE_NT_HEADERS |
70 (__stdcall * pfnCheckSumMappedFile_t) (LPVOID BaseAddress, DWORD FileLength, | |
71 LPDWORD HeaderSum, LPDWORD CheckSum); | |
72 | |
428 | 73 |
74 #if 0 | |
75 extern BOOL ctrl_c_handler (unsigned long type); | |
76 #endif | |
77 | |
442 | 78 /* Sync with FSF Emacs 19.34.6 |
79 note: struct file_data is now defined in nt.h */ | |
428 | 80 |
81 enum { | |
82 HEAP_UNINITIALIZED = 1, | |
83 HEAP_UNLOADED, | |
84 HEAP_LOADED | |
85 }; | |
86 | |
87 /* Basically, our "initialized" flag. */ | |
88 int heap_state = HEAP_UNINITIALIZED; | |
89 | |
90 /* So we can find our heap in the file to recreate it. */ | |
91 unsigned long heap_index_in_executable = UNINIT_LONG; | |
92 | |
93 void get_section_info (file_data *p_file); | |
94 void copy_executable_and_dump_data_section (file_data *, file_data *); | |
95 void dump_bss_and_heap (file_data *p_infile, file_data *p_outfile); | |
96 | |
97 /* Cached info about the .data section in the executable. */ | |
98 PUCHAR data_start_va = UNINIT_PTR; | |
99 DWORD data_start_file = UNINIT_LONG; | |
100 DWORD data_size = UNINIT_LONG; | |
101 | |
102 /* Cached info about the .bss section in the executable. */ | |
103 PUCHAR bss_start = UNINIT_PTR; | |
104 DWORD bss_size = UNINIT_LONG; | |
105 | |
106 /* Startup code for running on NT. When we are running as the dumped | |
107 version, we need to bootstrap our heap and .bss section into our | |
108 address space before we can actually hand off control to the startup | |
109 code supplied by NT (primarily because that code relies upon malloc ()). */ | |
440 | 110 |
111 /* ********************** | |
1204 | 112 Hackers please remember, this _start() thingy is *not* called either |
113 when dumping portably, or when running from temacs! Do not put | |
440 | 114 significant XEmacs initialization here! |
115 ********************** */ | |
116 | |
1204 | 117 EXTERN_C void mainCRTStartup (void); |
118 | |
119 EXTERN_C int _start (void); | |
120 | |
121 int | |
428 | 122 _start (void) |
123 { | |
124 /* Cache system info, e.g., the NT page size. */ | |
125 cache_system_info (); | |
814 | 126 /* Set OS type, so that tchar stuff below works */ |
127 init_win32_very_early (); | |
428 | 128 |
129 /* If we're a dumped version of emacs then we need to recreate | |
130 our heap and play tricks with our .bss section. Do this before | |
131 start up. (WARNING: Do not put any code before this section | |
132 that relies upon malloc () and runs in the dumped version. It | |
133 won't work.) */ | |
134 if (heap_state == HEAP_UNLOADED) | |
135 { | |
814 | 136 Extbyte executable_path[MAX_PATH * MAX_XETCHAR_SIZE]; |
428 | 137 |
814 | 138 /* Don't use mswindows_get_module_file_name() because it uses |
139 xmalloc() */ | |
140 if (qxeGetModuleFileName (NULL, executable_path, MAX_PATH) == 0) | |
428 | 141 { |
142 exit (1); | |
143 } | |
144 | |
440 | 145 /* #### This is super-bogus. When I rename xemacs.exe, |
146 the renamed file still loads its heap from xemacs.exe --kkm */ | |
147 #if 0 | |
148 { | |
814 | 149 Extbyte *p; |
150 | |
440 | 151 /* To allow profiling, make sure executable_path names the .exe |
152 file, not the file created by the profiler */ | |
814 | 153 p = xetcsrchr (executable_path, '\\'); |
154 xetcscpy (p + 1, XETEXT (PATH_PROGNAME ".exe")); | |
440 | 155 } |
156 #endif | |
428 | 157 |
158 recreate_heap (executable_path); | |
159 heap_state = HEAP_LOADED; | |
160 } | |
161 | |
440 | 162 /* #### This is bogus, too. _fmode is set to different values |
163 when we run `xemacs' and `temacs run-emacs'. The sooner we | |
164 hit and fix all the weirdities this causes us, the better --kkm */ | |
165 #if 0 | |
428 | 166 /* The default behavior is to treat files as binary and patch up |
442 | 167 text files appropriately. */ |
428 | 168 _fmode = O_BINARY; |
440 | 169 #endif |
428 | 170 |
171 #if 0 | |
172 /* This prevents ctrl-c's in shells running while we're suspended from | |
173 having us exit. */ | |
174 SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE); | |
175 #endif | |
176 | |
177 mainCRTStartup (); | |
1204 | 178 return 0; /* not reached? */ |
428 | 179 } |
180 | |
181 /* Dump out .data and .bss sections into a new executable. */ | |
442 | 182 int |
867 | 183 unexec (Ibyte *new_name, Ibyte *old_name, unsigned int start_data, |
442 | 184 unsigned int start_bss, unsigned int entry_address) |
428 | 185 { |
186 file_data in_file, out_file; | |
867 | 187 Ibyte *out_filename = alloca_ibytes (qxestrlen (new_name) + 10); |
188 Ibyte *in_filename = alloca_ibytes (qxestrlen (old_name) + 10); | |
428 | 189 unsigned long size; |
867 | 190 Ibyte *ptr; |
442 | 191 HINSTANCE hImagehelp; |
428 | 192 |
193 /* Make sure that the input and output filenames have the | |
194 ".exe" extension...patch them up if they don't. */ | |
814 | 195 qxestrcpy (in_filename, old_name); |
196 ptr = in_filename + qxestrlen (in_filename) - 4; | |
1204 | 197 if (qxestrcmp_c (ptr, ".exe")) |
198 qxestrcat_c (in_filename, ".exe"); | |
428 | 199 |
814 | 200 qxestrcpy (out_filename, new_name); |
201 ptr = out_filename + qxestrlen (out_filename) - 4; | |
1204 | 202 if (qxestrcmp_c (ptr, ".exe")) |
203 qxestrcat_c (out_filename, ".exe"); | |
428 | 204 |
814 | 205 stdout_out ("Dumping from %s\n", in_filename); |
206 stdout_out (" to %s\n", out_filename); | |
428 | 207 |
208 /* We need to round off our heap to NT's allocation unit (64KB). */ | |
209 round_heap (get_allocation_unit ()); | |
210 | |
211 /* Open the undumped executable file. */ | |
212 if (!open_input_file (&in_file, in_filename)) | |
213 { | |
814 | 214 stdout_out ("Failed to open %s (%d)...bailing.\n", |
215 in_filename, GetLastError ()); | |
428 | 216 exit (1); |
217 } | |
218 | |
219 /* Get the interesting section info, like start and size of .bss... */ | |
220 get_section_info (&in_file); | |
221 | |
222 /* The size of the dumped executable is the size of the original | |
223 executable plus the size of the heap and the size of the .bss section. */ | |
224 heap_index_in_executable = (unsigned long) | |
814 | 225 round_to_next ((UChar_Binary *) in_file.size, get_allocation_unit ()); |
428 | 226 size = heap_index_in_executable + get_committed_heap_size () + bss_size; |
227 if (!open_output_file (&out_file, out_filename, size)) | |
228 { | |
814 | 229 stdout_out ("Failed to open %s (%d)...bailing.\n", |
230 out_filename, GetLastError ()); | |
428 | 231 exit (1); |
232 } | |
233 | |
234 /* Set the flag (before dumping). */ | |
235 heap_state = HEAP_UNLOADED; | |
236 | |
237 copy_executable_and_dump_data_section (&in_file, &out_file); | |
238 dump_bss_and_heap (&in_file, &out_file); | |
239 | |
240 /* Patch up header fields; profiler is picky about this. */ | |
812 | 241 hImagehelp = LoadLibraryA ("imagehlp.dll"); |
428 | 242 if (hImagehelp) |
243 { | |
244 PIMAGE_DOS_HEADER dos_header; | |
245 PIMAGE_NT_HEADERS nt_header; | |
442 | 246 |
428 | 247 DWORD headersum; |
248 DWORD checksum; | |
442 | 249 pfnCheckSumMappedFile_t pfnCheckSumMappedFile; |
428 | 250 |
251 dos_header = (PIMAGE_DOS_HEADER) out_file.file_base; | |
814 | 252 nt_header = (PIMAGE_NT_HEADERS) ((UChar_Binary *) dos_header + |
253 dos_header->e_lfanew); | |
428 | 254 |
255 nt_header->OptionalHeader.CheckSum = 0; | |
442 | 256 #if 0 |
257 nt_header->FileHeader.TimeDateStamp = time (NULL); | |
258 dos_header->e_cp = size / 512; | |
259 nt_header->OptionalHeader.SizeOfImage = size; | |
260 #endif | |
428 | 261 |
442 | 262 pfnCheckSumMappedFile = |
263 (pfnCheckSumMappedFile_t) GetProcAddress (hImagehelp, | |
264 "CheckSumMappedFile"); | |
428 | 265 if (pfnCheckSumMappedFile) |
266 { | |
442 | 267 #if 0 |
268 nt_header->FileHeader.TimeDateStamp = time (NULL); | |
269 #endif | |
428 | 270 pfnCheckSumMappedFile (out_file.file_base, |
271 out_file.size, | |
272 &headersum, | |
273 &checksum); | |
274 nt_header->OptionalHeader.CheckSum = checksum; | |
275 } | |
276 FreeLibrary (hImagehelp); | |
277 } | |
278 | |
279 close_file_data (&in_file); | |
280 close_file_data (&out_file); | |
281 | |
442 | 282 return 0; |
428 | 283 } |
284 | |
285 /* Routines to manipulate NT executable file sections. */ | |
286 | |
287 #ifndef DUMP_SEPARATE_SECTION | |
288 static void | |
289 get_bss_info_from_map_file (file_data *p_infile, PUCHAR *p_bss_start, | |
290 DWORD *p_bss_size) | |
291 { | |
292 int n, start, len; | |
867 | 293 Ibyte *map_filename = alloca_ibytes (qxestrlen (p_infile->name) + 10); |
814 | 294 Extbyte buffer[256]; |
428 | 295 FILE *map; |
296 | |
297 /* Overwrite the .exe extension on the executable file name with | |
298 the .map extension. */ | |
814 | 299 qxestrcpy (map_filename, p_infile->name); |
300 n = qxestrlen (map_filename) - 3; | |
301 qxestrcpy (&map_filename[n], "map"); | |
428 | 302 |
814 | 303 map = qxe_fopen (map_filename, "r"); |
428 | 304 if (!map) |
305 { | |
814 | 306 stdout_out ("Failed to open map file %s, error %d...bailing out.\n", |
307 map_filename, GetLastError ()); | |
428 | 308 exit (-1); |
309 } | |
310 | |
311 while (fgets (buffer, sizeof (buffer), map)) | |
312 { | |
313 if (!(strstr (buffer, ".bss") && strstr (buffer, "DATA"))) | |
314 continue; | |
315 n = sscanf (buffer, " %*d:%x %x", &start, &len); | |
316 if (n != 2) | |
317 { | |
814 | 318 /* printf with external data, stdout_out with internal */ |
428 | 319 printf ("Failed to scan the .bss section line:\n%s", buffer); |
320 exit (-1); | |
321 } | |
322 break; | |
323 } | |
324 *p_bss_start = (PUCHAR) start; | |
325 *p_bss_size = (DWORD) len; | |
326 } | |
327 #endif | |
328 | |
329 /* Flip through the executable and cache the info necessary for dumping. */ | |
330 static void | |
331 get_section_info (file_data *p_infile) | |
332 { | |
333 PIMAGE_DOS_HEADER dos_header; | |
334 PIMAGE_NT_HEADERS nt_header; | |
335 PIMAGE_SECTION_HEADER section, data_section; | |
814 | 336 UChar_Binary *ptr; |
428 | 337 int i; |
338 | |
339 dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; | |
340 if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) | |
341 { | |
814 | 342 stdout_out ("Unknown EXE header in %s...bailing.\n", p_infile->name); |
428 | 343 exit (1); |
344 } | |
345 nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + | |
346 dos_header->e_lfanew); | |
347 if (nt_header == NULL) | |
348 { | |
814 | 349 stdout_out ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", |
350 p_infile->name); | |
428 | 351 exit (1); |
352 } | |
353 | |
354 /* Check the NT header signature ... */ | |
355 if (nt_header->Signature != IMAGE_NT_SIGNATURE) | |
356 { | |
814 | 357 stdout_out ("Invalid IMAGE_NT_SIGNATURE 0x%x in %s...bailing.\n", |
358 nt_header->Signature, p_infile->name); | |
428 | 359 } |
360 | |
361 /* Flip through the sections for .data and .bss ... */ | |
362 section = (PIMAGE_SECTION_HEADER) IMAGE_FIRST_SECTION (nt_header); | |
363 for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) | |
364 { | |
365 #ifndef DUMP_SEPARATE_SECTION | |
1204 | 366 if (!qxestrcmp_c (section->Name, ".bss")) |
428 | 367 { |
368 extern int my_ebss; /* From lastfile.c */ | |
369 | |
814 | 370 ptr = (UChar_Binary *) nt_header->OptionalHeader.ImageBase + |
428 | 371 section->VirtualAddress; |
372 bss_start = ptr; | |
814 | 373 bss_size = (UChar_Binary*) &my_ebss - (UChar_Binary*) bss_start; |
428 | 374 } |
375 | |
1204 | 376 if (!qxestrcmp_c (section->Name, ".data")) |
428 | 377 #else |
1204 | 378 if (!qxestrcmp_c (section->Name, "xdata")) |
428 | 379 #endif |
380 { | |
814 | 381 extern Char_Binary my_edata[]; /* From lastfile.c */ |
428 | 382 |
383 /* The .data section. */ | |
384 data_section = section; | |
814 | 385 ptr = (UChar_Binary *) nt_header->OptionalHeader.ImageBase + |
428 | 386 section->VirtualAddress; |
387 data_start_va = ptr; | |
388 data_start_file = section->PointerToRawData; | |
389 | |
390 #ifndef DUMP_SEPARATE_SECTION | |
391 /* Write only the part of the section that contains emacs data. */ | |
392 data_size = my_edata - data_start_va; | |
393 #else | |
394 /* Write back the full section. */ | |
395 data_size = section->SizeOfRawData; | |
396 | |
397 /* This code doesn't know how to grow the raw size of a section. */ | |
398 if (section->SizeOfRawData < section->Misc.VirtualSize) | |
399 { | |
814 | 400 stdout_out ("The emacs data section is smaller than expected" |
401 "...bailing.\n"); | |
428 | 402 exit (1); |
403 } | |
404 #endif | |
405 } | |
406 section++; | |
407 } | |
408 | |
409 #ifndef DUMP_SEPARATE_SECTION | |
410 if (bss_start == UNINIT_PTR) | |
411 { | |
412 /* Starting with MSVC 4.0, the .bss section has been eliminated | |
413 and appended virtually to the end of the .data section. Our | |
414 only hint about where the .bss section starts in the address | |
415 comes from the SizeOfRawData field in the .data section | |
416 header. Unfortunately, this field is only approximate, as it | |
417 is a rounded number and is typically rounded just beyond the | |
418 start of the .bss section. To find the start and size of the | |
419 .bss section exactly, we have to peek into the map file. */ | |
420 extern int my_ebss; | |
421 | |
422 get_bss_info_from_map_file (p_infile, &ptr, &bss_size); | |
423 bss_start = ptr + nt_header->OptionalHeader.ImageBase | |
424 + data_section->VirtualAddress; | |
814 | 425 bss_size = (UChar_Binary *) &my_ebss - (UChar_Binary *) bss_start; |
428 | 426 } |
427 #else | |
428 bss_size = 0; | |
429 #endif | |
430 } | |
431 | |
432 | |
433 /* The dump routines. */ | |
434 | |
435 #ifdef DEBUG_XEMACS | |
814 | 436 /* printf with external data, stdout_out with internal */ |
428 | 437 #define DUMP_MSG(x) printf x |
438 #else | |
439 #define DUMP_MSG(x) | |
440 #endif | |
441 | |
442 static void | |
443 copy_executable_and_dump_data_section (file_data *p_infile, | |
444 file_data *p_outfile) | |
445 { | |
814 | 446 UChar_Binary *data_file, *data_va; |
428 | 447 unsigned long size, index; |
448 | |
449 /* Get a pointer to where the raw data should go in the executable file. */ | |
814 | 450 data_file = (UChar_Binary *) p_outfile->file_base + data_start_file; |
428 | 451 |
452 /* Get a pointer to the raw data in our address space. */ | |
453 data_va = data_start_va; | |
454 | |
455 size = (DWORD) data_file - (DWORD) p_outfile->file_base; | |
456 DUMP_MSG (("Copying executable up to data section...\n")); | |
457 DUMP_MSG (("\t0x%08x Offset in input file.\n", 0)); | |
458 DUMP_MSG (("\t0x%08x Offset in output file.\n", 0)); | |
459 DUMP_MSG (("\t0x%08x Size in bytes.\n", size)); | |
460 memcpy (p_outfile->file_base, p_infile->file_base, size); | |
461 | |
462 size = data_size; | |
463 DUMP_MSG (("Dumping data section...\n")); | |
464 DUMP_MSG (("\t0x%08x Address in process.\n", data_va)); | |
465 DUMP_MSG (("\t0x%08x Offset in output file.\n", | |
814 | 466 (UChar_Binary *) data_file - |
467 (UChar_Binary *) p_outfile->file_base)); | |
428 | 468 DUMP_MSG (("\t0x%08x Size in bytes.\n", size)); |
469 memcpy (data_file, data_va, size); | |
470 | |
471 index = (DWORD) data_file + size - (DWORD) p_outfile->file_base; | |
472 size = p_infile->size - index; | |
473 DUMP_MSG (("Copying rest of executable...\n")); | |
474 DUMP_MSG (("\t0x%08x Offset in input file.\n", index)); | |
475 DUMP_MSG (("\t0x%08x Offset in output file.\n", index)); | |
476 DUMP_MSG (("\t0x%08x Size in bytes.\n", size)); | |
814 | 477 memcpy ((UChar_Binary *) p_outfile->file_base + index, |
478 (UChar_Binary *) p_infile->file_base + index, size); | |
428 | 479 } |
480 | |
481 static void | |
482 dump_bss_and_heap (file_data *p_infile, file_data *p_outfile) | |
483 { | |
814 | 484 UChar_Binary *heap_data; |
485 unsigned long size, index; | |
428 | 486 |
814 | 487 DUMP_MSG (("Dumping heap onto end of executable...\n")); |
428 | 488 |
814 | 489 index = heap_index_in_executable; |
490 size = get_committed_heap_size (); | |
491 heap_data = get_heap_start (); | |
428 | 492 |
814 | 493 DUMP_MSG (("\t0x%08x Heap start in process.\n", heap_data)); |
494 DUMP_MSG (("\t0x%08x Heap offset in executable.\n", index)); | |
495 DUMP_MSG (("\t0x%08x Heap size in bytes.\n", size)); | |
428 | 496 |
814 | 497 memcpy ((PUCHAR) p_outfile->file_base + index, heap_data, size); |
428 | 498 |
499 #ifndef DUMP_SEPARATE_SECTION | |
814 | 500 DUMP_MSG (("Dumping bss onto end of executable...\n")); |
428 | 501 |
814 | 502 index += size; |
503 size = bss_size; | |
428 | 504 |
814 | 505 DUMP_MSG (("\t0x%08x BSS start in process.\n", bss_start)); |
506 DUMP_MSG (("\t0x%08x BSS offset in executable.\n", index)); | |
507 DUMP_MSG (("\t0x%08x BSS size in bytes.\n", size)); | |
508 memcpy ((UChar_Binary *) p_outfile->file_base + index, bss_start, size); | |
428 | 509 #endif |
510 } | |
511 | |
512 #undef DUMP_MSG | |
513 | |
514 /* Reload and remap routines. */ | |
515 | |
516 | |
517 /* Load the dumped .bss section into the .bss area of our address space. */ | |
518 /* Already done if the .bss was part of a separate emacs data section */ | |
519 void | |
814 | 520 read_in_bss (Extbyte *filename) |
428 | 521 { |
522 #ifndef DUMP_SEPARATE_SECTION | |
523 HANDLE file; | |
524 unsigned long index, n_read; | |
525 | |
814 | 526 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, |
527 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); | |
428 | 528 if (file == INVALID_HANDLE_VALUE) |
529 abort (); | |
530 | |
531 /* Seek to where the .bss section is tucked away after the heap... */ | |
532 index = heap_index_in_executable + get_committed_heap_size (); | |
533 if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF) | |
534 abort (); | |
535 | |
536 /* Ok, read in the saved .bss section and initialize all | |
537 uninitialized variables. */ | |
538 if (!ReadFile (file, bss_start, bss_size, &n_read, NULL)) | |
539 abort (); | |
540 | |
541 CloseHandle (file); | |
542 #endif | |
543 } | |
544 | |
545 /* Map the heap dumped into the executable file into our address space. */ | |
546 void | |
814 | 547 map_in_heap (Extbyte *filename) |
428 | 548 { |
549 HANDLE file; | |
550 HANDLE file_mapping; | |
551 void *file_base; | |
552 unsigned long size, upper_size, n_read; | |
553 | |
814 | 554 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, |
555 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); | |
428 | 556 if (file == INVALID_HANDLE_VALUE) |
557 abort (); | |
558 | |
559 size = GetFileSize (file, &upper_size); | |
814 | 560 file_mapping = qxeCreateFileMapping (file, NULL, PAGE_WRITECOPY, |
561 0, size, NULL); | |
428 | 562 if (!file_mapping) |
563 abort (); | |
564 | |
565 size = get_committed_heap_size (); | |
566 file_base = MapViewOfFileEx (file_mapping, FILE_MAP_COPY, 0, | |
567 heap_index_in_executable, size, | |
568 get_heap_start ()); | |
569 if (file_base != 0) | |
570 { | |
571 return; | |
572 } | |
573 | |
574 /* If we don't succeed with the mapping, then copy from the | |
575 data into the heap. */ | |
576 | |
577 CloseHandle (file_mapping); | |
578 | |
579 if (VirtualAlloc (get_heap_start (), get_committed_heap_size (), | |
580 MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE) == NULL) | |
581 abort (); | |
582 | |
583 /* Seek to the location of the heap data in the executable. */ | |
584 if (SetFilePointer (file, heap_index_in_executable, | |
585 NULL, FILE_BEGIN) == 0xFFFFFFFF) | |
586 abort (); | |
587 | |
588 /* Read in the data. */ | |
589 if (!ReadFile (file, get_heap_start (), | |
590 get_committed_heap_size (), &n_read, NULL)) | |
591 abort (); | |
592 | |
593 CloseHandle (file); | |
594 } |