Mercurial > hg > xemacs-beta
annotate src/charset.h @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 3d8143fc88e1 |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 771 | 1 /* Header for charsets. |
| 2 Copyright (C) 1992, 1995 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 4 Copyright (C) 2001, 2002 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Mule 2.3. Not in FSF. */ | |
| 24 | |
| 25 /* Rewritten by Ben Wing <ben@xemacs.org>. */ | |
| 26 | |
| 27 #ifndef INCLUDED_charset_h_ | |
| 28 #define INCLUDED_charset_h_ | |
| 29 | |
| 30 | |
| 31 | |
| 32 #ifndef MULE | |
| 33 | |
| 34 /************************************************************************/ | |
| 35 /* fake charset defs */ | |
| 36 /************************************************************************/ | |
| 37 | |
| 38 /* used when MULE is not defined, so that Charset-type stuff can still | |
| 39 be done */ | |
| 40 | |
| 41 #define Vcharset_ascii Qnil | |
| 42 | |
| 867 | 43 #define ichar_charset(ch) Vcharset_ascii |
| 44 #define ichar_leading_byte(ch) LEADING_BYTE_ASCII | |
| 45 #define ichar_len(ch) 1 | |
| 46 #define ichar_len_fmt(ch, fmt) 1 | |
| 771 | 47 #define LEADING_BYTE_ASCII 0x80 |
| 48 #define NUM_LEADING_BYTES 1 | |
| 49 #define MIN_LEADING_BYTE 0x80 | |
| 50 #define CHARSETP(cs) 1 | |
| 826 | 51 #define charset_by_leading_byte(lb) Vcharset_ascii |
| 771 | 52 #define XCHARSET_LEADING_BYTE(cs) LEADING_BYTE_ASCII |
| 53 #define XCHARSET_GRAPHIC(cs) -1 | |
| 54 #define XCHARSET_COLUMNS(cs) 1 | |
| 55 #define XCHARSET_DIMENSION(cs) 1 | |
| 867 | 56 #define BREAKUP_ICHAR(ch, charset, byte1, byte2) do { \ |
| 771 | 57 (charset) = Vcharset_ascii; \ |
| 58 (byte1) = (ch); \ | |
| 59 (byte2) = 0; \ | |
| 60 } while (0) | |
| 61 | |
| 62 #else /* MULE */ | |
| 63 | |
| 64 | |
| 65 /************************************************************************/ | |
| 66 /* Definition of leading bytes */ | |
| 67 /************************************************************************/ | |
| 68 | |
| 69 #define MIN_LEADING_BYTE 0x7F | |
| 70 | |
| 71 /** The following are for 1-byte characters in an official charset. **/ | |
| 72 enum LEADING_BYTE_OFFICIAL_1 | |
| 73 { | |
| 74 MIN_LEADING_BYTE_OFFICIAL_1 = 0x80, | |
| 75 /* LEADING_BYTE_LATIN_ISO8859_1 *MUST* be equal to | |
| 76 MIN_LEADING_BYTE_OFFICIAL_1. */ | |
| 77 LEADING_BYTE_LATIN_ISO8859_1 = /* 0x80 Right half of ISO 8859-1 */ | |
| 78 MIN_LEADING_BYTE_OFFICIAL_1, | |
| 79 LEADING_BYTE_LATIN_ISO8859_2, /* 0x81 Right half of ISO 8859-2 */ | |
| 80 LEADING_BYTE_LATIN_ISO8859_3, /* 0x82 Right half of ISO 8859-3 */ | |
| 81 LEADING_BYTE_LATIN_ISO8859_4, /* 0x83 Right half of ISO 8859-4 */ | |
| 82 LEADING_BYTE_THAI_TIS620, /* 0x84 TIS620-2533 */ | |
| 83 LEADING_BYTE_GREEK_ISO8859_7, /* 0x85 Right half of ISO 8859-7 */ | |
| 84 LEADING_BYTE_ARABIC_ISO8859_6, /* 0x86 Right half of ISO 8859-6 */ | |
| 85 LEADING_BYTE_HEBREW_ISO8859_8, /* 0x87 Right half of ISO 8859-8 */ | |
| 86 LEADING_BYTE_KATAKANA_JISX0201, /* 0x88 Right half of JIS X0201-1976 */ | |
| 87 LEADING_BYTE_LATIN_JISX0201, /* 0x89 Left half of JIS X0201-1976 */ | |
| 88 LEADING_BYTE_CYRILLIC_ISO8859_5,/* 0x8A Right half of ISO 8859-5 */ | |
| 89 LEADING_BYTE_LATIN_ISO8859_9, /* 0x8B Right half of ISO 8859-9 */ | |
| 90 LEADING_BYTE_LATIN_ISO8859_15, /* 0x8C Right half of ISO 8859-15 */ | |
| 91 #ifdef ENABLE_COMPOSITE_CHARS | |
| 92 LEADING_BYTE_COMPOSITE, /* 0x8D For a composite character */ | |
| 93 MAX_LEADING_BYTE_OFFICIAL_1 = | |
| 94 LEADING_BYTE_COMPOSITE - 1, | |
| 95 #else | |
| 96 /* Does not need to be the last entry, but simplifies things */ | |
| 97 LEADING_BYTE_COMPOSITE_REPLACEMENT, /* 0x8D Replaces ESC 0 - ESC 4 in a | |
| 98 buffer */ | |
| 99 MAX_LEADING_BYTE_OFFICIAL_1 = | |
| 100 LEADING_BYTE_COMPOSITE_REPLACEMENT, | |
| 101 #endif | |
| 102 /* 0x8E Unused */ | |
| 103 }; | |
| 104 | |
| 105 /* These next 2 + LEADING_BYTE_COMPOSITE need special treatment in a string | |
| 106 and/or character */ | |
| 107 | |
| 108 #define LEADING_BYTE_ASCII 0x7F /* Not used except in arrays | |
| 109 indexed by leading byte */ | |
| 110 #define LEADING_BYTE_CONTROL_1 0x8F /* represent normal 80-9F */ | |
| 111 | |
| 112 /** The following are for 2-byte characters in an official charset. **/ | |
| 113 enum LEADING_BYTE_OFFICIAL_2 | |
| 114 { | |
| 115 MIN_LEADING_BYTE_OFFICIAL_2 = 0x90, | |
| 116 LEADING_BYTE_JAPANESE_JISX0208_1978 = | |
| 117 MIN_LEADING_BYTE_OFFICIAL_2, /* 0x90 Japanese JIS X0208-1978 */ | |
| 118 LEADING_BYTE_CHINESE_GB2312, /* 0x91 Chinese Hanzi GB2312-1980 */ | |
| 119 LEADING_BYTE_JAPANESE_JISX0208, /* 0x92 Japanese JIS X0208-1983 */ | |
| 120 LEADING_BYTE_KOREAN_KSC5601, /* 0x93 Hangul KS C5601-1987 */ | |
| 121 LEADING_BYTE_JAPANESE_JISX0212, /* 0x94 Japanese JIS X0212-1990 */ | |
| 122 LEADING_BYTE_CHINESE_CNS11643_1, /* 0x95 Chinese CNS11643 Set 1 */ | |
| 123 LEADING_BYTE_CHINESE_CNS11643_2, /* 0x96 Chinese CNS11643 Set 2 */ | |
| 124 LEADING_BYTE_CHINESE_BIG5_1, /* 0x97 Big5 Level 1 */ | |
| 125 LEADING_BYTE_CHINESE_BIG5_2, /* 0x98 Big5 Level 2 */ | |
| 126 MAX_LEADING_BYTE_OFFICIAL_2 = | |
| 127 LEADING_BYTE_CHINESE_BIG5_2, | |
| 128 | |
| 129 /* 0x99 unused */ | |
| 130 /* 0x9A unused */ | |
| 131 /* 0x9B unused */ | |
| 132 /* 0x9C unused */ | |
| 133 /* 0x9D unused */ | |
| 134 }; | |
| 135 | |
| 136 | |
| 137 /** The following are for 1- and 2-byte characters in a private charset. **/ | |
| 138 | |
| 139 #define PRE_LEADING_BYTE_PRIVATE_1 0x9E /* 1-byte char-set */ | |
| 140 #define PRE_LEADING_BYTE_PRIVATE_2 0x9F /* 2-byte char-set */ | |
| 141 | |
| 142 #define MIN_LEADING_BYTE_PRIVATE_1 0xA0 | |
| 143 #define MAX_LEADING_BYTE_PRIVATE_1 0xEF | |
| 144 #define MIN_LEADING_BYTE_PRIVATE_2 0xF0 | |
| 145 #define MAX_LEADING_BYTE_PRIVATE_2 0xFF | |
| 146 | |
| 147 #define NUM_LEADING_BYTES 129 | |
| 148 | |
| 149 | |
| 150 /************************************************************************/ | |
| 151 /* Operations on leading bytes */ | |
| 152 /************************************************************************/ | |
| 153 | |
| 154 /* Is this leading byte for a private charset? */ | |
| 155 | |
| 826 | 156 #define leading_byte_private_p(lb) ((lb) >= MIN_LEADING_BYTE_PRIVATE_1) |
| 771 | 157 |
| 158 /* Is this a prefix for a private leading byte? */ | |
| 159 | |
| 826 | 160 DECLARE_INLINE_HEADER ( |
| 161 int | |
| 867 | 162 leading_byte_prefix_p (Ibyte lb) |
| 826 | 163 ) |
| 771 | 164 { |
| 165 return (lb == PRE_LEADING_BYTE_PRIVATE_1 || | |
| 166 lb == PRE_LEADING_BYTE_PRIVATE_2); | |
| 167 } | |
| 168 | |
| 169 /* Given a private leading byte, return the leading byte prefix stored | |
| 170 in a string. */ | |
| 171 | |
| 826 | 172 #define private_leading_byte_prefix(lb) \ |
| 771 | 173 ((unsigned int) (lb) < MIN_LEADING_BYTE_PRIVATE_2 ? \ |
| 174 PRE_LEADING_BYTE_PRIVATE_1 : \ | |
| 175 PRE_LEADING_BYTE_PRIVATE_2) | |
| 176 | |
| 177 | |
| 178 /************************************************************************/ | |
| 179 /* Information about a particular character set */ | |
| 180 /************************************************************************/ | |
| 181 | |
| 182 struct Lisp_Charset | |
| 183 { | |
| 2720 | 184 #ifdef MC_ALLOC |
| 185 struct lrecord_header header; | |
| 186 #else /* MC_ALLOC */ | |
| 771 | 187 struct lcrecord_header header; |
| 2720 | 188 #endif /* MC_ALLOC */ |
| 771 | 189 |
| 190 int id; | |
| 191 Lisp_Object name; | |
| 192 Lisp_Object doc_string; | |
| 193 Lisp_Object registry; | |
| 194 Lisp_Object short_name; | |
| 195 Lisp_Object long_name; | |
| 196 | |
| 197 Lisp_Object reverse_direction_charset; | |
| 198 | |
| 199 Lisp_Object ccl_program; | |
| 200 | |
| 2367 | 201 /* Unicode translation tables. See unicode.c for the format of these |
| 202 tables, and discussion of how they are initialized. | |
| 203 */ | |
| 771 | 204 void *to_unicode_table; |
| 205 void *from_unicode_table; | |
| 206 int from_unicode_levels; | |
| 207 | |
| 2367 | 208 /* Final byte of this character set in ISO2022 designating escape |
| 209 sequence */ | |
| 867 | 210 Ibyte final; |
| 771 | 211 |
| 212 /* Number of bytes (1 - 4) required in the internal representation | |
| 213 for characters in this character set. This is *not* the | |
| 214 same as the dimension of the character set). */ | |
| 215 int rep_bytes; | |
| 216 | |
| 217 /* Number of columns a character in this charset takes up, on TTY | |
| 218 devices. Not used for X devices. */ | |
| 219 int columns; | |
| 220 | |
| 221 /* Direction of this character set */ | |
| 222 int direction; | |
| 223 | |
| 224 /* Type of this character set (94, 96, 94x94, 96x96) */ | |
| 225 int type; | |
| 226 | |
| 227 /* Number of bytes used in encoding of this character set (1 or 2) */ | |
| 228 int dimension; | |
| 229 | |
| 230 /* Number of chars in each dimension (usually 94 or 96) */ | |
| 231 int chars; | |
| 232 | |
| 233 /* Which half of font to be used to display this character set */ | |
| 234 int graphic; | |
| 235 | |
| 236 /* If set, this is a "temporary" charset created when we encounter | |
| 237 an unknown final. This is so that we can successfully compile | |
| 238 and load such files. We allow a real charset to be created on top | |
| 239 of this temporary charset. */ | |
| 240 unsigned int temporary :1; | |
| 241 }; | |
| 242 typedef struct Lisp_Charset Lisp_Charset; | |
| 243 | |
| 244 DECLARE_LRECORD (charset, Lisp_Charset); | |
| 245 #define XCHARSET(x) XRECORD (x, charset, Lisp_Charset) | |
| 246 #define wrap_charset(p) wrap_record (p, charset) | |
| 247 #define CHARSETP(x) RECORDP (x, charset) | |
| 248 #define CHECK_CHARSET(x) CHECK_RECORD (x, charset) | |
| 249 #define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset) | |
| 250 | |
| 251 #define CHARSET_TYPE_94 0 /* This charset includes 94 characters. */ | |
| 252 #define CHARSET_TYPE_96 1 /* This charset includes 96 characters. */ | |
| 253 #define CHARSET_TYPE_94X94 2 /* This charset includes 94x94 characters. */ | |
| 254 #define CHARSET_TYPE_96X96 3 /* This charset includes 96x96 characters. */ | |
| 255 | |
| 256 #define CHARSET_LEFT_TO_RIGHT 0 | |
| 257 #define CHARSET_RIGHT_TO_LEFT 1 | |
| 258 | |
| 259 /* Leading byte and id have been regrouped. -- OG */ | |
| 260 #define CHARSET_ID(cs) ((cs)->id) | |
| 867 | 261 #define CHARSET_LEADING_BYTE(cs) ((Ibyte) CHARSET_ID (cs)) |
| 771 | 262 #define CHARSET_NAME(cs) ((cs)->name) |
| 263 #define CHARSET_SHORT_NAME(cs) ((cs)->short_name) | |
| 264 #define CHARSET_LONG_NAME(cs) ((cs)->long_name) | |
| 265 #define CHARSET_REP_BYTES(cs) ((cs)->rep_bytes) | |
| 266 #define CHARSET_COLUMNS(cs) ((cs)->columns) | |
| 267 #define CHARSET_GRAPHIC(cs) ((cs)->graphic) | |
| 268 #define CHARSET_TYPE(cs) ((cs)->type) | |
| 269 #define CHARSET_DIRECTION(cs) ((cs)->direction) | |
| 270 #define CHARSET_FINAL(cs) ((cs)->final) | |
| 271 #define CHARSET_DOC_STRING(cs) ((cs)->doc_string) | |
| 272 #define CHARSET_REGISTRY(cs) ((cs)->registry) | |
| 273 #define CHARSET_CCL_PROGRAM(cs) ((cs)->ccl_program) | |
| 274 #define CHARSET_DIMENSION(cs) ((cs)->dimension) | |
| 275 #define CHARSET_CHARS(cs) ((cs)->chars) | |
| 276 #define CHARSET_REVERSE_DIRECTION_CHARSET(cs) ((cs)->reverse_direction_charset) | |
| 277 #define CHARSET_TO_UNICODE_TABLE(cs) ((cs)->to_unicode_table) | |
| 278 #define CHARSET_FROM_UNICODE_TABLE(cs) ((cs)->from_unicode_table) | |
| 279 #define CHARSET_FROM_UNICODE_LEVELS(cs) ((cs)->from_unicode_levels) | |
| 280 | |
| 281 | |
| 826 | 282 #define CHARSET_PRIVATE_P(cs) leading_byte_private_p (CHARSET_LEADING_BYTE (cs)) |
| 771 | 283 |
| 284 #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) | |
| 285 #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) | |
| 286 #define XCHARSET_SHORT_NAME(cs) CHARSET_SHORT_NAME (XCHARSET (cs)) | |
| 287 #define XCHARSET_LONG_NAME(cs) CHARSET_LONG_NAME (XCHARSET (cs)) | |
| 288 #define XCHARSET_REP_BYTES(cs) CHARSET_REP_BYTES (XCHARSET (cs)) | |
| 289 #define XCHARSET_COLUMNS(cs) CHARSET_COLUMNS (XCHARSET (cs)) | |
| 290 #define XCHARSET_GRAPHIC(cs) CHARSET_GRAPHIC (XCHARSET (cs)) | |
| 291 #define XCHARSET_TYPE(cs) CHARSET_TYPE (XCHARSET (cs)) | |
| 292 #define XCHARSET_DIRECTION(cs) CHARSET_DIRECTION (XCHARSET (cs)) | |
| 293 #define XCHARSET_FINAL(cs) CHARSET_FINAL (XCHARSET (cs)) | |
| 294 #define XCHARSET_DOC_STRING(cs) CHARSET_DOC_STRING (XCHARSET (cs)) | |
| 295 #define XCHARSET_REGISTRY(cs) CHARSET_REGISTRY (XCHARSET (cs)) | |
| 296 #define XCHARSET_LEADING_BYTE(cs) CHARSET_LEADING_BYTE (XCHARSET (cs)) | |
| 297 #define XCHARSET_CCL_PROGRAM(cs) CHARSET_CCL_PROGRAM (XCHARSET (cs)) | |
| 298 #define XCHARSET_DIMENSION(cs) CHARSET_DIMENSION (XCHARSET (cs)) | |
| 299 #define XCHARSET_CHARS(cs) CHARSET_CHARS (XCHARSET (cs)) | |
| 300 #define XCHARSET_PRIVATE_P(cs) CHARSET_PRIVATE_P (XCHARSET (cs)) | |
| 301 #define XCHARSET_REVERSE_DIRECTION_CHARSET(cs) \ | |
| 302 CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs)) | |
| 303 #define XCHARSET_TO_UNICODE_TABLE(cs) \ | |
| 304 CHARSET_TO_UNICODE_TABLE (XCHARSET (cs)) | |
| 305 #define XCHARSET_FROM_UNICODE_TABLE(cs) \ | |
| 306 CHARSET_FROM_UNICODE_TABLE (XCHARSET (cs)) | |
| 307 #define XCHARSET_FROM_UNICODE_LEVELS(cs) \ | |
| 308 CHARSET_FROM_UNICODE_LEVELS (XCHARSET (cs)) | |
| 309 | |
| 310 struct charset_lookup | |
| 311 { | |
| 312 /* Table of charsets indexed by leading byte. */ | |
| 313 Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES]; | |
| 314 | |
| 315 /* Table of charsets indexed by type/final-byte/direction. */ | |
| 316 Lisp_Object charset_by_attributes[4][128][2]; | |
| 867 | 317 Ibyte next_allocated_1_byte_leading_byte; |
| 318 Ibyte next_allocated_2_byte_leading_byte; | |
| 771 | 319 }; |
| 320 | |
| 1111 | 321 extern struct charset_lookup *chlook; |
| 322 | |
| 826 | 323 DECLARE_INLINE_HEADER ( |
| 324 Lisp_Object | |
| 325 charset_by_leading_byte (int lb) | |
| 326 ) | |
| 771 | 327 { |
| 800 | 328 #ifdef ERROR_CHECK_TEXT |
| 771 | 329 /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the |
| 330 following unless we introduce `tem'. */ | |
| 331 int tem = lb; | |
| 800 | 332 text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); |
| 771 | 333 #endif |
| 334 return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE]; | |
| 335 } | |
| 336 | |
| 826 | 337 DECLARE_INLINE_HEADER ( |
| 338 Lisp_Object | |
| 339 charset_by_attributes (int type, int final, int dir) | |
| 340 ) | |
| 771 | 341 { |
| 342 type_checking_assert (type < countof (chlook->charset_by_attributes) && | |
| 343 final < countof (chlook->charset_by_attributes[0]) && | |
| 344 dir < countof (chlook->charset_by_attributes[0][0])); | |
| 345 return chlook->charset_by_attributes[type][final][dir]; | |
| 346 } | |
| 347 | |
| 348 | |
| 349 /************************************************************************/ | |
| 350 /* Dealing with characters */ | |
| 351 /************************************************************************/ | |
| 352 | |
| 353 /* The bit fields of character are divided into 3 parts: | |
| 354 FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ | |
| 355 | |
| 867 | 356 #define ICHAR_FIELD1_MASK (0x1F << 14) |
| 357 #define ICHAR_FIELD2_MASK (0x7F << 7) | |
| 358 #define ICHAR_FIELD3_MASK 0x7F | |
| 771 | 359 |
| 360 /* Macros to access each field of a character code of C. */ | |
| 361 | |
| 867 | 362 #define ichar_field1(c) (((c) & ICHAR_FIELD1_MASK) >> 14) |
| 363 #define ichar_field2(c) (((c) & ICHAR_FIELD2_MASK) >> 7) | |
| 364 #define ichar_field3(c) ((c) & ICHAR_FIELD3_MASK) | |
| 771 | 365 |
| 366 /* Field 1, if non-zero, usually holds a leading byte for a | |
| 367 dimension-2 charset. Field 2, if non-zero, usually holds a leading | |
| 368 byte for a dimension-1 charset. */ | |
| 369 | |
| 370 /* Converting between field values and leading bytes. */ | |
| 371 | |
| 372 #define FIELD2_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_1 - 1) | |
| 373 #define FIELD2_TO_PRIVATE_LEADING_BYTE 0x80 | |
| 374 | |
| 375 #define FIELD1_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_2 - 1) | |
| 376 #define FIELD1_TO_PRIVATE_LEADING_BYTE 0xE1 | |
| 377 | |
| 378 /* Minimum and maximum allowed values for the fields. */ | |
| 379 | |
| 867 | 380 #define MIN_ICHAR_FIELD2_OFFICIAL \ |
| 771 | 381 (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) |
| 867 | 382 #define MAX_ICHAR_FIELD2_OFFICIAL \ |
| 771 | 383 (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) |
| 384 | |
| 867 | 385 #define MIN_ICHAR_FIELD1_OFFICIAL \ |
| 771 | 386 (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) |
| 867 | 387 #define MAX_ICHAR_FIELD1_OFFICIAL \ |
| 771 | 388 (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) |
| 389 | |
| 867 | 390 #define MIN_ICHAR_FIELD2_PRIVATE \ |
| 771 | 391 (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) |
| 867 | 392 #define MAX_ICHAR_FIELD2_PRIVATE \ |
| 771 | 393 (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) |
| 394 | |
| 867 | 395 #define MIN_ICHAR_FIELD1_PRIVATE \ |
| 771 | 396 (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) |
| 867 | 397 #define MAX_ICHAR_FIELD1_PRIVATE \ |
| 771 | 398 (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) |
| 399 | |
| 400 /* Minimum character code of each <type> character. */ | |
| 401 | |
| 867 | 402 #define MIN_CHAR_OFFICIAL_TYPE9N (MIN_ICHAR_FIELD2_OFFICIAL << 7) |
| 403 #define MIN_CHAR_PRIVATE_TYPE9N (MIN_ICHAR_FIELD2_PRIVATE << 7) | |
| 404 #define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_ICHAR_FIELD1_OFFICIAL << 14) | |
| 405 #define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_ICHAR_FIELD1_PRIVATE << 14) | |
| 771 | 406 #define MIN_CHAR_COMPOSITION (0x1F << 14) |
| 407 | |
| 408 /* Leading byte of a character. | |
| 409 | |
| 410 NOTE: This takes advantage of the fact that | |
| 411 FIELD2_TO_OFFICIAL_LEADING_BYTE and | |
| 412 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. | |
| 413 */ | |
| 414 | |
| 826 | 415 DECLARE_INLINE_HEADER ( |
| 867 | 416 Ibyte |
| 417 ichar_leading_byte (Ichar c) | |
| 826 | 418 ) |
| 771 | 419 { |
| 867 | 420 if (ichar_ascii_p (c)) |
| 771 | 421 return LEADING_BYTE_ASCII; |
| 422 else if (c < 0xA0) | |
| 423 return LEADING_BYTE_CONTROL_1; | |
| 424 else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) | |
| 867 | 425 return ichar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; |
| 771 | 426 else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) |
| 867 | 427 return ichar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; |
| 771 | 428 else if (c < MIN_CHAR_COMPOSITION) |
| 867 | 429 return ichar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; |
| 771 | 430 else |
| 431 { | |
| 432 #ifdef ENABLE_COMPOSITE_CHARS | |
| 433 return LEADING_BYTE_COMPOSITE; | |
| 434 #else | |
| 2500 | 435 ABORT(); |
| 771 | 436 return 0; |
| 437 #endif /* ENABLE_COMPOSITE_CHARS */ | |
| 438 } | |
| 439 } | |
| 440 | |
| 826 | 441 DECLARE_INLINE_HEADER ( |
| 442 Bytecount | |
| 867 | 443 ichar_len (Ichar c) |
| 826 | 444 ) |
| 445 { | |
| 867 | 446 if (ichar_ascii_p (c)) |
| 826 | 447 return 1; |
| 448 else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) | |
| 449 return 2; | |
| 450 else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) | |
| 451 return 3; /* dimension-2 official or dimension-1 private */ | |
| 452 else if (c < MIN_CHAR_COMPOSITION) | |
| 453 return 4; | |
| 454 else | |
| 455 { | |
| 456 #ifdef ENABLE_COMPOSITE_CHARS | |
| 457 #error Not yet implemented | |
| 458 #else | |
| 2500 | 459 ABORT(); |
| 826 | 460 return 0; |
| 461 #endif /* ENABLE_COMPOSITE_CHARS */ | |
| 462 } | |
| 463 } | |
| 464 | |
| 465 DECLARE_INLINE_HEADER ( | |
| 466 Bytecount | |
| 867 | 467 ichar_len_fmt (Ichar c, Internal_Format fmt) |
| 826 | 468 ) |
| 469 { | |
| 470 switch (fmt) | |
| 471 { | |
| 472 case FORMAT_DEFAULT: | |
| 867 | 473 return ichar_len (c); |
| 826 | 474 case FORMAT_16_BIT_FIXED: |
| 475 return 2; | |
| 476 case FORMAT_32_BIT_FIXED: | |
| 477 return 4; | |
| 478 default: | |
| 479 text_checking_assert (fmt == FORMAT_8_BIT_FIXED); | |
| 480 return 1; | |
| 481 } | |
| 482 } | |
| 483 | |
| 867 | 484 #define ichar_charset(c) charset_by_leading_byte (ichar_leading_byte (c)) |
| 771 | 485 |
| 486 /* Return a character whose charset is CHARSET and position-codes are C1 | |
| 487 and C2. TYPE9N character ignores C2. (For typical charsets, i.e. not | |
| 488 ASCII, Control-1 or Composite, C1 and C2 will be in the range of 32 to | |
| 489 127 or 33 to 126. See `make-char'.) | |
| 490 | |
| 491 NOTE: This takes advantage of the fact that | |
| 492 FIELD2_TO_OFFICIAL_LEADING_BYTE and | |
| 493 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. | |
| 494 */ | |
| 495 | |
| 826 | 496 DECLARE_INLINE_HEADER ( |
| 867 | 497 Ichar |
| 498 make_ichar (Lisp_Object charset, int c1, int c2) | |
| 826 | 499 ) |
| 771 | 500 { |
| 867 | 501 Ichar retval; |
| 771 | 502 if (EQ (charset, Vcharset_ascii)) |
| 826 | 503 retval = c1; |
| 771 | 504 else if (EQ (charset, Vcharset_control_1)) |
| 826 | 505 retval = c1 | 0x80; |
| 771 | 506 #ifdef ENABLE_COMPOSITE_CHARS |
| 507 else if (EQ (charset, Vcharset_composite)) | |
| 826 | 508 retval = (0x1F << 14) | ((c1) << 7) | (c2); |
| 771 | 509 #endif |
| 510 else if (XCHARSET_DIMENSION (charset) == 1) | |
| 826 | 511 retval = ((XCHARSET_LEADING_BYTE (charset) - |
| 512 FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (c1); | |
| 771 | 513 else if (!XCHARSET_PRIVATE_P (charset)) |
| 826 | 514 retval = ((XCHARSET_LEADING_BYTE (charset) - |
| 515 FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); | |
| 771 | 516 else |
| 826 | 517 retval = ((XCHARSET_LEADING_BYTE (charset) - |
| 518 FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); | |
| 867 | 519 text_checking_assert (valid_ichar_p (retval)); |
| 826 | 520 return retval; |
| 771 | 521 } |
| 522 | |
| 867 | 523 /* BREAKUP_ICHAR_1_UNSAFE assumes that the charset has already been |
| 771 | 524 calculated, and just computes c1 and c2. |
| 525 | |
| 867 | 526 BREAKUP_ICHAR also computes and stores the charset. */ |
| 771 | 527 |
| 867 | 528 #define BREAKUP_ICHAR_1_UNSAFE(c, charset, c1, c2) \ |
| 771 | 529 XCHARSET_DIMENSION (charset) == 1 \ |
| 867 | 530 ? ((c1) = ichar_field3 (c), (c2) = 0) \ |
| 531 : ((c1) = ichar_field2 (c), \ | |
| 532 (c2) = ichar_field3 (c)) | |
| 771 | 533 |
| 826 | 534 DECLARE_INLINE_HEADER ( |
| 535 void | |
| 867 | 536 breakup_ichar_1 (Ichar c, Lisp_Object *charset, int *c1, int *c2) |
| 826 | 537 ) |
| 771 | 538 { |
| 867 | 539 text_checking_assert (valid_ichar_p (c)); |
| 540 *charset = ichar_charset (c); | |
| 541 BREAKUP_ICHAR_1_UNSAFE (c, *charset, *c1, *c2); | |
| 771 | 542 } |
| 543 | |
| 867 | 544 /* BREAKUP_ICHAR separates an Ichar into its components. The charset of |
| 771 | 545 character C is set to CHARSET, and the position-codes of C are set to C1 |
| 546 and C2. C2 of TYPE9N character is 0. */ | |
| 547 | |
| 867 | 548 #define BREAKUP_ICHAR(c, charset, c1, c2) \ |
| 549 breakup_ichar_1 (c, &(charset), &(c1), &(c2)) | |
| 771 | 550 |
| 788 | 551 void get_charset_limits (Lisp_Object charset, int *low, int *high); |
| 867 | 552 int ichar_to_unicode (Ichar chr); |
| 788 | 553 |
| 771 | 554 #endif /* MULE */ |
| 555 | |
| 556 #endif /* INCLUDED_charset_h_ */ |