a9429e29f5
gcc/ada: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * gcc-interface/utils.c (init_gnat_to_gnu): Use typed GC allocation. (init_dummy_type): Likewise. (gnat_pushlevel): Likewise. * gcc-interface/trans.c (Attribute_to_gnu): Likewise. (Subprogram_Body_to_gnu): Likewise. (Compilation_Unit_to_gnu): Likewise. (start_stmt_group): Likewise. (extract_encoding): Likewise. (decode_name): Likewise. * gcc-interface/misc.c (gnat_printable_name): Likewise. * gcc-interface/decl.c (annotate_value): Likewise. * gcc-interface/ada-tree.h (struct lang_type): Add variable_size GTY option. (struct lang_decl): Likewise. (SET_TYPE_LANG_SPECIFIC): Use typed GC allocation. (SET_DECL_LANG_SPECIFIC): Likewise. gcc/c-family: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * c-pragma.c (push_alignment): Use typed GC allocation. (handle_pragma_push_options): Likewise. * c-common.c (parse_optimize_options): Likewise. * c-common.h (struct sorted_fields_type): Add variable_size GTY option. gcc/cp: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * typeck2.c (abstract_virtuals_error): Likewise. * pt.c (maybe_process_partial_specialization): Likewise. (register_specialization): Likewise. (add_pending_template): Likewise. (lookup_template_class): Likewise. (push_tinst_level): Likewise. * parser.c (cp_lexer_new_main): Likewise. (cp_lexer_new_from_tokens): Likewise. (cp_token_cache_new): Likewise. (cp_parser_context_new): Likewise. (cp_parser_new): Likewise. (cp_parser_nested_name_specifier_opt): Likewise. (cp_parser_template_id): Likewise. * name-lookup.c (binding_entry_make): Likewise. (binding_table_construct): Likewise. (binding_table_new): Likewise. (cxx_binding_make): Likewise. (pushdecl_maybe_friend): Likewise. (begin_scope): Likewise. (push_to_top_level): Likewise. * lex.c (init_reswords): Likewise. (retrofit_lang_decl): Likewise. (cxx_dup_lang_specific_decl): Likewise. (copy_lang_type): Likewise. (cxx_make_type): Likewise. * decl.c (make_label_decl): Likewise. (check_goto): Likewise. (start_preparsed_function): Likewise. (save_function_data): Likewise. * cp-tree.h (TYPE_SET_PTRMEMFUNC_TYPE): Likewise. * cp-objcp-common.c (decl_shadowed_for_var_insert): Likewise. * class.c (finish_struct_1): Likewise. * cp-tree.h (struct lang_type): Add variable_size GTY option. (struct lang_decl): Likewise. * parser.c (cp_parser_new): Update comment to not reference ggc_alloc. gcc/fortran: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * trans-types.c (gfc_get_nodesc_array_type): Use typed GC allocation. (gfc_get_array_type_bounds): Likewise. * trans-decl.c (gfc_allocate_lang_decl): Likewise. (gfc_find_module): Likewise. * f95-lang.c (pushlevel): Likewise. * trans.h (struct lang_type): Add variable_size GTY option. (struct lang_decl): Likewise. gcc/java: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * jcf-reader.c (jcf_parse_constant_pool): Use typed GC allocation. * jcf-parse.c (java_parse_file): Likewise. (process_zip_dir): Likewise. * java-tree.h (MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC): Likewise. (MAYBE_CREATE_TYPE_TYPE_LANG_SPECIFIC): Likewise. * expr.c (add_type_assertion): Likewise. * decl.c (make_binding_level): Likewise. (java_dup_lang_specific_decl): Likewise. * constants.c (set_constant_entry): Likewise. (cpool_for_class): Likewise. * class.c (add_method_1): Likewise. (java_treetreehash_new): Likewise. * java-tree.h (struct lang_type): Add variable_size GTY option. (struct lang_decl): Likewise. * jch.h (struct cpool_entry): Likewise. * java-tree.h (java_treetreehash_create): Remove parameter ggc. * except.c (prepare_eh_table_type): Update java_treetreehash_create call. * class.c (add_method_1): Update java_treetreehash_create call. (java_treetreehash_create): Remove parameter gc. Use htab_create_ggc. gcc/lto: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * lto.c (lto_read_in_decl_state): Use typed GC allocation. (lto_file_read): Likewise. (new_partition): Likewise. (read_cgraph_and_symbols): Likewise. gcc/objc: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * objc-act.h (ALLOC_OBJC_TYPE_LANG_SPECIFIC): Use typed GC allocation. * objc-act.c (objc_volatilize_decl): Likewise. (objc_build_string_object): Likewise. (hash_init): Likewise. (hash_enter): Likewise. (hash_add_attr): Likewise. (add_class): Likewise. (start_class): Likewise. gcc/objcp: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * objcp-decl.h (ALLOC_OBJC_TYPE_LANG_SPECIFIC): Use typed GC allocation. gcc: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * doc/tm.texi (Per-Function Data): Do not reference ggc_alloc. * doc/gty.texi (GTY Options): Document typed GC allocation and variable_size GTY option. * ggc-internal.h: New. * ggc.h: Update copyright year. (digit_string): Move to stringpool.c. (ggc_mark_stringpool, ggc_purge_stringpool, ggc_mark_roots) (gt_pch_save_stringpool, gt_pch_fixup_stringpool) (gt_pach_restore_stringpool, gt_pch_p_S, gt_pch_note_object) (init_ggc_pch, ggc_pch_count_object, ggc_pch_total_size) (ggc_pch_this_base, ggc_pch_alloc_object, ggc_pch_prepare_write) (ggc_pch_write_object, ggc_pch_finish, ggc_pch_read) (ggc_force_collect, ggc_get_size, ggc_statistics) (ggc_print_common_statistics): Move to ggc-internal.h. (digit_vector, new_ggc_zone, destroy_ggc_zone, ggc_alloc_stat) (ggc_alloc, ggc_alloc_cleared, ggc_realloc, ggc_calloc, GGC_NEW) (GGC_CNEW, GGC_NEWVEC, GGC_CNEWVEC, GGC_NEWVAR, ggc_alloc_rtvec) (ggc_alloc_tree, gt_pch_save, ggc_min_expand_heuristic) (ggc_min_heapsize_heuristic, ggc_alloc_zone) (ggc_alloc_zone_pass_stat): Remove. (ggc_internal_alloc_stat, ggc_internal_alloc) (ggc_internal_cleared_alloc_stat): New. (GGC_RESIZEVEC, GGC_RESIZEVAR): Redefine. (ggc_internal_vec_alloc_stat) (ggc_internal_cleared_vec_alloc_stat) (ggc_internal_vec_alloc_stat, ggc_internal_cleared_vec_alloc) (ggc_alloc_atomic_stat, ggc_alloc_atomic) (ggc_alloc_cleared_atomic, ggc_cleared_alloc_htab_ignore_args) (ggc_cleared_alloc_ptr_array_two_args): New. (htab_create_ggc, splay_tree_new_ggc): Redefine. (ggc_splay_alloc): Change the type of the first argument to enum gt_types_enum. (ggc_alloc_string): Make macro. (ggc_alloc_string_stat): New. (ggc_strdup): Redefine. (rtl_zone, tree_zone, tree_id_zone): Declare unconditionally. (ggc_alloc_rtvec_sized): New. (ggc_alloc_zone_stat): Rename to ggc_internal_alloc_zone_stat. (ggc_internal_alloc_zone_pass_stat, ggc_internal_alloc_zone_stat) (ggc_internal_cleared_alloc_zone_stat) (ggc_internal_zone_alloc_stat) (ggc_internal_zone_cleared_alloc_stat) (ggc_internal_zone_vec_alloc_stat) (ggc_alloc_zone_rtx_def_stat) (ggc_alloc_zone_tree_node_stat) (ggc_alloc_zone_cleared_tree_node_stat) (ggc_alloc_cleared_gimple_statement_d_stat): New. * ggc-common.c: Include ggc-internal.h. (ggc_internal_cleared_alloc_stat): Rename from ggc_alloc_cleared_stat. (ggc_realloc_stat): Use ggc_internal_alloc_stat. (ggc_calloc): Remove. (ggc_cleared_alloc_htab_ignore_args): New. (ggc_cleared_alloc_ptr_array_two_args): New. (ggc_splay_alloc): Add obj_type parameter. (init_ggc_heuristics): Formatting fixes. * ggc-none.c: Update copyright year. (ggc_alloc_stat): Rename to ggc_alloc_stat. (ggc_alloc_cleared_stat): Rename to ggc_internal_cleared_alloc_stat. (struct alloc_zone, rtl_zone, tree_zone, tree_id_zone): New. * ggc-page.c: Update copyright year. Include ggc-internal.h. Remove references to ggc_alloc in comments. (ggc_alloc_typed_stat): Call ggc_internal_alloc_stat. (ggc_alloc_stat): Rename to ggc_internal_alloc_stat. (new_ggc_zone, destroy_ggc_zone): Remove. (struct alloc_zone, rtl_zone, tree_zone, tree_id_zone): New. * ggc-zone.c: Include ggc-internal.h. Remove references to ggc_alloc in comments. (ggc_alloc_zone_stat): ggc_internal_alloc_zone_stat. (ggc_internal_alloc_zone_pass_stat): New. (ggc_internal_cleared_alloc_zone_stat): New. (ggc_alloc_typed_stat): Use ggc_internal_alloc_zone_pass_stat. (ggc_alloc_stat): Rename ggc_internal_alloc_stat. (new_ggc_zone, destroy_ggc_zone): Remove. * stringpool.c: Update copyright year. Include ggc-internal.h (digit_vector): Make static. (digit_string): Moved from ggc.h. (stringpool_ggc_alloc): Use ggc_alloc_atomic. (ggc_alloc_string): Rename to ggc_alloc_string_stat. * Makefile.in (GGC_INTERNAL_H): New. (ggc_common.o, ggc-page.o, ggc-zone.o, stringpool.o): Add $(GGC_INTERNAL_H) to dependencies. * gentype.c: Update copyright year. (walk_type): Accept variable_size GTY option. (USED_BY_TYPED_GC_P): New macro. (write_enum_defn): Use USED_BY_TYPED_GC_P. Do not output whitespace at the end of strings. (get_type_specifier, variable_size_p): New functions. (alloc_quantity, alloc_zone): New enums. (write_typed_alloc_def): New function. (write_typed_struct_alloc_def): Likewise. (write_typed_typed_typedef_alloc_def): Likewise. (write_typed_alloc_defns): Likewise. (output_typename, write_splay_tree_allocator_def): Likewise. (write_splay_tree_allocators): Likewise. (main): Call write_typed_alloc_defns and write_splay_tree_allocators. * lto-streamer.h (lto_file_decl_data_ptr): New. * passes.c (order): Define using cgraph_node_ptr. * strinpool.c (struct string_pool_data): Declare nested_ptr using ht_identifier_ptr. * gimple.h (union gimple_statement_d): Likewise. * rtl.h (struct rtx_def): Likewise. (struct rtvec_def): Likewise. * tree.h (union tree_node): Likewise. * tree-ssa-operands.h (struct ssa_operand_memory_d): Likewise. * cfgloop.c (record_loop_exits): Use htab_create_ggc. * tree-scalar-evolution.c (scev_initialize): Likewise. * alias.c (record_alias_subset): Update splay_tree_new_ggc call. * dwarf2asm.c (dw2_force_const_mem): Likewise. * omp-low.c (lower_omp_critical): Likewise. * bitmap.h (struct bitmap_head_def): Update comment to not reference ggc_alloc. * config/pa/pa.c (get_deferred_label): Use GGC_RESIZEVEC. * ira.c (fix_reg_equiv_init): Use GGC_RESIZEVEC. * ipa-prop.c (duplicate_ggc_array): Rename to duplicate_ipa_jump_func_array. Use typed GC allocation. (ipa_edge_duplication_hook): Call duplicate_ipa_jump_func_array. * gimple.c (gimple_alloc_stat): Use ggc_alloc_cleared_gimple_statement_d_stat. * varasm.c (create_block_symbol): Use ggc_alloc_zone_rtx_def. * tree.c (make_node_stat): Use ggc_alloc_zone_cleared_tree_node_stat. (make_tree_vec_stat): Likewise. (build_vl_exp_stat): Likewise. (copy_node_stat): Use ggc_alloc_zone_tree_node_stat. (make_tree_binfo_stat): Likewise. (tree_cons_stat): Likewise. * rtl.c (rtx_alloc_stat): Use ggc_alloc_zone_rtx_def_stat. (shallow_copy_rtx_stat): Likewise. (make_node_stat): Likewise. * lto-symtab.c: Fix comment. * tree-cfg.c (create_bb): Update comment to not reference ggc_alloc_cleared. * tree-ssa-structalias.c (struct heapvar_for_stmt): Fix param_is value. * varpool.c (varpool_node): Use typed GC allocation. (varpool_extra_name_alias): Likewise. * varasm.c (emutls_decl): Likewise. (get_unnamed_section): Likewise. (get_noswitch_section): Likewise. (get_section): Likewise. (get_block_for_section): Likewise. (build_constant_desc): Likewise. (create_constant_pool): Likewise. (force_const_mem): Likewise. * tree.c (build_vl_exp_stat): Likewise. (build_real): Likewise. (build_string): Likewise. (decl_debug_expr_insert): Likewise. (decl_value_expr_insert): Likewise. (type_hash_add): Likewise. (build_omp_clause): Likewise. * tree-ssanames.c (duplicate_ssa_name_ptr_info): Likewise. * tree-ssa.c (init_tree_ssa): Likewise. * tree-ssa-structalias.c (heapvar_insert): Likewise. * tree-ssa-operands.c (ssa_operand_alloc): Likewise. * tree-ssa-loop-niter.c (record_estimate): Likewise. * tree-ssa-alias.c (get_ptr_info): Likewise. * tree-scalar-evolution.c (new_scev_info_str): Likewise. * tree-phinodes.c (allocate_phi_node): Likewise. * tree-iterator.c (tsi_link_before): Likewise. (tsi_link_after): Likewise. * tree-eh.c (add_stmt_to_eh_lp_fn): Likewise. * tree-dfa.c (create_var_ann): Likewise. * tree-cfg.c (create_bb): Likewise. * toplev.c (alloc_for_identifier_to_locale): Likewise. (general_init): Likewise. * stringpool.c (stringpool_ggc_alloc): Likewise. (gt_pch_save_stringpool): Likewise. * sese.c (if_region_set_false_region): Likewise. * passes.c (do_per_function_toporder): Likewise. * optabs.c (set_optab_libfunc): Likewise. (set_conv_libfunc): Likewise. * lto-symtab.c (lto_symtab_register_decl): Likewise. * lto-streamer-in.c (lto_input_eh_catch_list): Likewise. (input_eh_region): Likewise. (input_eh_lp): Likewise. (make_new_block): Likewise. (unpack_ts_real_cst_value_fields): Likewise. * lto-section-in.c (lto_new_in_decl_state): Likewise. * lto-cgraph.c (input_node_opt_summary): Likewise. * loop-init.c (loop_optimizer_init): Likewise. * lambda.h (lambda_vector_new): Likewise. * lambda-code.c (replace_uses_equiv_to_x_with_y): Likewise. * ira.c (update_equiv_regs): Likewise. * ipa.c (cgraph_node_set_new): Likewise. (cgraph_node_set_add): Likewise. (varpool_node_set_new): Likewise. (varpool_node_set_add): Likewise. * ipa-prop.c (ipa_compute_jump_functions_for_edge): Likewise. (duplicate_ipa_jump_func_array): Likewise. (ipa_read_node_info): Likewise. * ipa-cp.c (ipcp_create_replace_map): Likewise. * integrate.c (get_hard_reg_initial_val): Likewise. * gimple.c (gimple_alloc_stat): Likewise. (gimple_build_omp_for): Likewise. (gimple_seq_alloc): Likewise. (gimple_copy): Likewise. * gimple-iterator.c (gsi_insert_before_without_update): Likewise. (gsi_insert_after_without_update): Likewise. * function.c (add_frame_space): Likewise. (insert_temp_slot_address): Likewise. (assign_stack_temp_for_type): Likewise. (allocate_struct_function): Likewise. (types_used_by_var_decl_insert): Likewise. * except.c (init_eh_for_function): Likewise. (gen_eh_region): Likewise. (gen_eh_region_catch): Likewise. (gen_eh_landing_pad): Likewise. (add_call_site): Likewise. * emit-rtl.c (get_mem_attrs): Likewise. (get_reg_attrs): Likewise. (start_sequence): Likewise. (init_emit): Likewise. * dwarf2out.c (new_cfi): Likewise. (queue_reg_save): Likewise. (dwarf2out_frame_init): Likewise. (new_loc_descr): Likewise. (find_AT_string): Likewise. (new_die): Likewise. (add_var_loc_to_decl): Likewise. (clone_die): Likewise. (clone_as_declaration): Likewise. (break_out_comdat_types): Likewise. (new_loc_list): Likewise. (loc_descriptor): Likewise. (add_loc_descr_to_each): Likewise. (add_const_value_attribute): Likewise. (tree_add_const_value_attribute): Likewise. (add_comp_dir_attribute): Likewise. (add_name_and_src_coords_attributes): Likewise. (lookup_filename): Likewise. (store_vcall_insn): Likewise. (dwarf2out_init): Likewise. * dbxout.c (dbxout_init): Likewise. * config/xtensa/xtensa.c (xtensa_init_machine_status): Likewise. * config/sparc/sparc.c (sparc_init_machine_status): Likewise. * config/score/score7.c (score7_output_external): Likewise. * config/score/score3.c (score3_output_external): Likewise. * config/s390/s390.c (s390_init_machine_status): Likewise. * config/rs6000/rs6000.c (builtin_function_type): Likewise. (rs6000_init_machine_status): Likewise. (output_toc): Likewise. * config/pa/pa.c (pa_init_machine_status): Likewise. (get_deferred_plabel): Likewise. * config/moxie/moxie.c (moxie_init_machine_status): Likewise. * config/mmix/mmix.c (mmix_init_machine_status): Likewise. * config/mips/mips.c (mflip_mips16_use_mips16_p): Likewise. * config/mep/mep.c (mep_init_machine_status): Likewise. (mep_note_pragma_flag): Likewise. * config/m32c/m32c.c (m32c_init_machine_status): Likewise. * config/iq2000/iq2000.c (iq2000_init_machine_status): Likewise. * config/ia64/ia64.c (ia64_init_machine_status): Likewise. * config/i386/winnt.c (i386_pe_record_external_function): Likewise. (i386_pe_maybe_record_exported_symbol): Likewise. * config/i386/i386.c (get_dllimport_decl): Likewise. (ix86_init_machine_status): Likewise. (assign_386_stack_local): Likewise. * config/frv/frv.c (frv_init_machine_status): Likewise. * config/darwin.c (machopic_indirection_name): Likewise. * config/cris/cris.c (cris_init_machine_status): Likewise. * config/bfin/bfin.c (bfin_init_machine_status): Likewise. * config/avr/avr.c (avr_init_machine_status): Likewise. * config/arm/arm.c (arm_init_machine_status): Likewise. * config/alpha/alpha.c (alpha_init_machine_status): Likewise. (alpha_need_linkage): Likewise. (alpha_use_linkage): Likewise. * cgraph.c (cgraph_allocate_node): Likewise. (cgraph_create_edge_1): Likewise. (cgraph_create_indirect_edge): Likewise. (cgraph_add_asm_node): Likewise. * cfgrtl.c (init_rtl_bb_info): Likewise. * cfgloop.c (alloc_loop): Likewise. (rescan_loop_exit): Likewise. * cfg.c (init_flow): Likewise. (alloc_block): Likewise. (unchecked_make_edge): Likewise. * c-parser.c (c_parse_init): Likewise. (c_parse_file): Likewise. * c-decl.c (bind): Likewise. (record_inline_static): Likewise. (push_scope): Likewise. (make_label): Likewise. (lookup_label_for_goto): Likewise. (finish_struct): Likewise. (finish_enum): Likewise. (c_push_function_context): Likewise. * bitmap.c (bitmap_element_allocate): Likewise. (bitmap_gc_alloc_stat): Likewise. * alias.c (record_alias_subset): Likewise. (init_alias_analysis): Likewise. include: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * splay-tree.h: Update copyright years. (splay_tree_s): Document fields. (splay_tree_new_typed_alloc): New. * hashtab.h: Update copyright years. (htab_create_typed_alloc): New. libcpp: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * include/symtab.h (ht_identifier_ptr): New. libiberty: 2010-06-08 Laurynas Biveinis <laurynas.biveinis@gmail.com> * splay-tree.c: Update copyright years. (splay_tree_new_typed_alloc): New. (splay_tree_new_with_allocator): Use it. * hashtab.c: Update copyright years. (htab_create_typed_alloc): New. (htab_create_alloc): Use it. * functions.texi: Regenerate. From-SVN: r160425
568 lines
14 KiB
C
568 lines
14 KiB
C
/* A splay-tree datatype.
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2009,
|
|
2010 Free Software Foundation, Inc.
|
|
Contributed by Mark Mitchell (mark@markmitchell.com).
|
|
|
|
This file is part of GNU CC.
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU CC is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU CC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 51 Franklin Street - Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
/* For an easily readable description of splay-trees, see:
|
|
|
|
Lewis, Harry R. and Denenberg, Larry. Data Structures and Their
|
|
Algorithms. Harper-Collins, Inc. 1991. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "libiberty.h"
|
|
#include "splay-tree.h"
|
|
|
|
static void splay_tree_delete_helper (splay_tree, splay_tree_node);
|
|
static inline void rotate_left (splay_tree_node *,
|
|
splay_tree_node, splay_tree_node);
|
|
static inline void rotate_right (splay_tree_node *,
|
|
splay_tree_node, splay_tree_node);
|
|
static void splay_tree_splay (splay_tree, splay_tree_key);
|
|
static int splay_tree_foreach_helper (splay_tree, splay_tree_node,
|
|
splay_tree_foreach_fn, void*);
|
|
|
|
/* Deallocate NODE (a member of SP), and all its sub-trees. */
|
|
|
|
static void
|
|
splay_tree_delete_helper (splay_tree sp, splay_tree_node node)
|
|
{
|
|
splay_tree_node pending = 0;
|
|
splay_tree_node active = 0;
|
|
|
|
if (!node)
|
|
return;
|
|
|
|
#define KDEL(x) if (sp->delete_key) (*sp->delete_key)(x);
|
|
#define VDEL(x) if (sp->delete_value) (*sp->delete_value)(x);
|
|
|
|
KDEL (node->key);
|
|
VDEL (node->value);
|
|
|
|
/* We use the "key" field to hold the "next" pointer. */
|
|
node->key = (splay_tree_key)pending;
|
|
pending = (splay_tree_node)node;
|
|
|
|
/* Now, keep processing the pending list until there aren't any
|
|
more. This is a little more complicated than just recursing, but
|
|
it doesn't toast the stack for large trees. */
|
|
|
|
while (pending)
|
|
{
|
|
active = pending;
|
|
pending = 0;
|
|
while (active)
|
|
{
|
|
splay_tree_node temp;
|
|
|
|
/* active points to a node which has its key and value
|
|
deallocated, we just need to process left and right. */
|
|
|
|
if (active->left)
|
|
{
|
|
KDEL (active->left->key);
|
|
VDEL (active->left->value);
|
|
active->left->key = (splay_tree_key)pending;
|
|
pending = (splay_tree_node)(active->left);
|
|
}
|
|
if (active->right)
|
|
{
|
|
KDEL (active->right->key);
|
|
VDEL (active->right->value);
|
|
active->right->key = (splay_tree_key)pending;
|
|
pending = (splay_tree_node)(active->right);
|
|
}
|
|
|
|
temp = active;
|
|
active = (splay_tree_node)(temp->key);
|
|
(*sp->deallocate) ((char*) temp, sp->allocate_data);
|
|
}
|
|
}
|
|
#undef KDEL
|
|
#undef VDEL
|
|
}
|
|
|
|
/* Rotate the edge joining the left child N with its parent P. PP is the
|
|
grandparents' pointer to P. */
|
|
|
|
static inline void
|
|
rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
|
|
{
|
|
splay_tree_node tmp;
|
|
tmp = n->right;
|
|
n->right = p;
|
|
p->left = tmp;
|
|
*pp = n;
|
|
}
|
|
|
|
/* Rotate the edge joining the right child N with its parent P. PP is the
|
|
grandparents' pointer to P. */
|
|
|
|
static inline void
|
|
rotate_right (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
|
|
{
|
|
splay_tree_node tmp;
|
|
tmp = n->left;
|
|
n->left = p;
|
|
p->right = tmp;
|
|
*pp = n;
|
|
}
|
|
|
|
/* Bottom up splay of key. */
|
|
|
|
static void
|
|
splay_tree_splay (splay_tree sp, splay_tree_key key)
|
|
{
|
|
if (sp->root == 0)
|
|
return;
|
|
|
|
do {
|
|
int cmp1, cmp2;
|
|
splay_tree_node n, c;
|
|
|
|
n = sp->root;
|
|
cmp1 = (*sp->comp) (key, n->key);
|
|
|
|
/* Found. */
|
|
if (cmp1 == 0)
|
|
return;
|
|
|
|
/* Left or right? If no child, then we're done. */
|
|
if (cmp1 < 0)
|
|
c = n->left;
|
|
else
|
|
c = n->right;
|
|
if (!c)
|
|
return;
|
|
|
|
/* Next one left or right? If found or no child, we're done
|
|
after one rotation. */
|
|
cmp2 = (*sp->comp) (key, c->key);
|
|
if (cmp2 == 0
|
|
|| (cmp2 < 0 && !c->left)
|
|
|| (cmp2 > 0 && !c->right))
|
|
{
|
|
if (cmp1 < 0)
|
|
rotate_left (&sp->root, n, c);
|
|
else
|
|
rotate_right (&sp->root, n, c);
|
|
return;
|
|
}
|
|
|
|
/* Now we have the four cases of double-rotation. */
|
|
if (cmp1 < 0 && cmp2 < 0)
|
|
{
|
|
rotate_left (&n->left, c, c->left);
|
|
rotate_left (&sp->root, n, n->left);
|
|
}
|
|
else if (cmp1 > 0 && cmp2 > 0)
|
|
{
|
|
rotate_right (&n->right, c, c->right);
|
|
rotate_right (&sp->root, n, n->right);
|
|
}
|
|
else if (cmp1 < 0 && cmp2 > 0)
|
|
{
|
|
rotate_right (&n->left, c, c->right);
|
|
rotate_left (&sp->root, n, n->left);
|
|
}
|
|
else if (cmp1 > 0 && cmp2 < 0)
|
|
{
|
|
rotate_left (&n->right, c, c->left);
|
|
rotate_right (&sp->root, n, n->right);
|
|
}
|
|
} while (1);
|
|
}
|
|
|
|
/* Call FN, passing it the DATA, for every node below NODE, all of
|
|
which are from SP, following an in-order traversal. If FN every
|
|
returns a non-zero value, the iteration ceases immediately, and the
|
|
value is returned. Otherwise, this function returns 0. */
|
|
|
|
static int
|
|
splay_tree_foreach_helper (splay_tree sp, splay_tree_node node,
|
|
splay_tree_foreach_fn fn, void *data)
|
|
{
|
|
int val;
|
|
|
|
if (!node)
|
|
return 0;
|
|
|
|
val = splay_tree_foreach_helper (sp, node->left, fn, data);
|
|
if (val)
|
|
return val;
|
|
|
|
val = (*fn)(node, data);
|
|
if (val)
|
|
return val;
|
|
|
|
return splay_tree_foreach_helper (sp, node->right, fn, data);
|
|
}
|
|
|
|
|
|
/* An allocator and deallocator based on xmalloc. */
|
|
static void *
|
|
splay_tree_xmalloc_allocate (int size, void *data ATTRIBUTE_UNUSED)
|
|
{
|
|
return (void *) xmalloc (size);
|
|
}
|
|
|
|
static void
|
|
splay_tree_xmalloc_deallocate (void *object, void *data ATTRIBUTE_UNUSED)
|
|
{
|
|
free (object);
|
|
}
|
|
|
|
|
|
/* Allocate a new splay tree, using COMPARE_FN to compare nodes,
|
|
DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
|
|
values. Use xmalloc to allocate the splay tree structure, and any
|
|
nodes added. */
|
|
|
|
splay_tree
|
|
splay_tree_new (splay_tree_compare_fn compare_fn,
|
|
splay_tree_delete_key_fn delete_key_fn,
|
|
splay_tree_delete_value_fn delete_value_fn)
|
|
{
|
|
return (splay_tree_new_with_allocator
|
|
(compare_fn, delete_key_fn, delete_value_fn,
|
|
splay_tree_xmalloc_allocate, splay_tree_xmalloc_deallocate, 0));
|
|
}
|
|
|
|
|
|
/* Allocate a new splay tree, using COMPARE_FN to compare nodes,
|
|
DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
|
|
values. */
|
|
|
|
splay_tree
|
|
splay_tree_new_with_allocator (splay_tree_compare_fn compare_fn,
|
|
splay_tree_delete_key_fn delete_key_fn,
|
|
splay_tree_delete_value_fn delete_value_fn,
|
|
splay_tree_allocate_fn allocate_fn,
|
|
splay_tree_deallocate_fn deallocate_fn,
|
|
void *allocate_data)
|
|
{
|
|
return
|
|
splay_tree_new_typed_alloc (compare_fn, delete_key_fn, delete_value_fn,
|
|
allocate_fn, allocate_fn, deallocate_fn,
|
|
allocate_data);
|
|
}
|
|
|
|
/*
|
|
|
|
@deftypefn Supplemental splay_tree splay_tree_new_with_typed_alloc
|
|
(splay_tree_compare_fn @var{compare_fn},
|
|
splay_tree_delete_key_fn @var{delete_key_fn},
|
|
splay_tree_delete_value_fn @var{delete_value_fn},
|
|
splay_tree_allocate_fn @var{tree_allocate_fn},
|
|
splay_tree_allocate_fn @var{node_allocate_fn},
|
|
splay_tree_deallocate_fn @var{deallocate_fn},
|
|
void * @var{allocate_data})
|
|
|
|
This function creates a splay tree that uses two different allocators
|
|
@var{tree_allocate_fn} and @var{node_allocate_fn} to use for allocating the
|
|
tree itself and its nodes respectively. This is useful when variables of
|
|
different types need to be allocated with different allocators.
|
|
|
|
The splay tree will use @var{compare_fn} to compare nodes,
|
|
@var{delete_key_fn} to deallocate keys, and @var{delete_value_fn} to
|
|
deallocate values.
|
|
|
|
@end deftypefn
|
|
|
|
*/
|
|
|
|
splay_tree
|
|
splay_tree_new_typed_alloc (splay_tree_compare_fn compare_fn,
|
|
splay_tree_delete_key_fn delete_key_fn,
|
|
splay_tree_delete_value_fn delete_value_fn,
|
|
splay_tree_allocate_fn tree_allocate_fn,
|
|
splay_tree_allocate_fn node_allocate_fn,
|
|
splay_tree_deallocate_fn deallocate_fn,
|
|
void * allocate_data)
|
|
{
|
|
splay_tree sp = (splay_tree) (*tree_allocate_fn)
|
|
(sizeof (struct splay_tree_s), allocate_data);
|
|
|
|
sp->root = 0;
|
|
sp->comp = compare_fn;
|
|
sp->delete_key = delete_key_fn;
|
|
sp->delete_value = delete_value_fn;
|
|
sp->allocate = node_allocate_fn;
|
|
sp->deallocate = deallocate_fn;
|
|
sp->allocate_data = allocate_data;
|
|
|
|
return sp;
|
|
}
|
|
|
|
/* Deallocate SP. */
|
|
|
|
void
|
|
splay_tree_delete (splay_tree sp)
|
|
{
|
|
splay_tree_delete_helper (sp, sp->root);
|
|
(*sp->deallocate) ((char*) sp, sp->allocate_data);
|
|
}
|
|
|
|
/* Insert a new node (associating KEY with DATA) into SP. If a
|
|
previous node with the indicated KEY exists, its data is replaced
|
|
with the new value. Returns the new node. */
|
|
|
|
splay_tree_node
|
|
splay_tree_insert (splay_tree sp, splay_tree_key key, splay_tree_value value)
|
|
{
|
|
int comparison = 0;
|
|
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root)
|
|
comparison = (*sp->comp)(sp->root->key, key);
|
|
|
|
if (sp->root && comparison == 0)
|
|
{
|
|
/* If the root of the tree already has the indicated KEY, just
|
|
replace the value with VALUE. */
|
|
if (sp->delete_value)
|
|
(*sp->delete_value)(sp->root->value);
|
|
sp->root->value = value;
|
|
}
|
|
else
|
|
{
|
|
/* Create a new node, and insert it at the root. */
|
|
splay_tree_node node;
|
|
|
|
node = ((splay_tree_node)
|
|
(*sp->allocate) (sizeof (struct splay_tree_node_s),
|
|
sp->allocate_data));
|
|
node->key = key;
|
|
node->value = value;
|
|
|
|
if (!sp->root)
|
|
node->left = node->right = 0;
|
|
else if (comparison < 0)
|
|
{
|
|
node->left = sp->root;
|
|
node->right = node->left->right;
|
|
node->left->right = 0;
|
|
}
|
|
else
|
|
{
|
|
node->right = sp->root;
|
|
node->left = node->right->left;
|
|
node->right->left = 0;
|
|
}
|
|
|
|
sp->root = node;
|
|
}
|
|
|
|
return sp->root;
|
|
}
|
|
|
|
/* Remove KEY from SP. It is not an error if it did not exist. */
|
|
|
|
void
|
|
splay_tree_remove (splay_tree sp, splay_tree_key key)
|
|
{
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root && (*sp->comp) (sp->root->key, key) == 0)
|
|
{
|
|
splay_tree_node left, right;
|
|
|
|
left = sp->root->left;
|
|
right = sp->root->right;
|
|
|
|
/* Delete the root node itself. */
|
|
if (sp->delete_value)
|
|
(*sp->delete_value) (sp->root->value);
|
|
(*sp->deallocate) (sp->root, sp->allocate_data);
|
|
|
|
/* One of the children is now the root. Doesn't matter much
|
|
which, so long as we preserve the properties of the tree. */
|
|
if (left)
|
|
{
|
|
sp->root = left;
|
|
|
|
/* If there was a right child as well, hang it off the
|
|
right-most leaf of the left child. */
|
|
if (right)
|
|
{
|
|
while (left->right)
|
|
left = left->right;
|
|
left->right = right;
|
|
}
|
|
}
|
|
else
|
|
sp->root = right;
|
|
}
|
|
}
|
|
|
|
/* Lookup KEY in SP, returning VALUE if present, and NULL
|
|
otherwise. */
|
|
|
|
splay_tree_node
|
|
splay_tree_lookup (splay_tree sp, splay_tree_key key)
|
|
{
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root && (*sp->comp)(sp->root->key, key) == 0)
|
|
return sp->root;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Return the node in SP with the greatest key. */
|
|
|
|
splay_tree_node
|
|
splay_tree_max (splay_tree sp)
|
|
{
|
|
splay_tree_node n = sp->root;
|
|
|
|
if (!n)
|
|
return NULL;
|
|
|
|
while (n->right)
|
|
n = n->right;
|
|
|
|
return n;
|
|
}
|
|
|
|
/* Return the node in SP with the smallest key. */
|
|
|
|
splay_tree_node
|
|
splay_tree_min (splay_tree sp)
|
|
{
|
|
splay_tree_node n = sp->root;
|
|
|
|
if (!n)
|
|
return NULL;
|
|
|
|
while (n->left)
|
|
n = n->left;
|
|
|
|
return n;
|
|
}
|
|
|
|
/* Return the immediate predecessor KEY, or NULL if there is no
|
|
predecessor. KEY need not be present in the tree. */
|
|
|
|
splay_tree_node
|
|
splay_tree_predecessor (splay_tree sp, splay_tree_key key)
|
|
{
|
|
int comparison;
|
|
splay_tree_node node;
|
|
|
|
/* If the tree is empty, there is certainly no predecessor. */
|
|
if (!sp->root)
|
|
return NULL;
|
|
|
|
/* Splay the tree around KEY. That will leave either the KEY
|
|
itself, its predecessor, or its successor at the root. */
|
|
splay_tree_splay (sp, key);
|
|
comparison = (*sp->comp)(sp->root->key, key);
|
|
|
|
/* If the predecessor is at the root, just return it. */
|
|
if (comparison < 0)
|
|
return sp->root;
|
|
|
|
/* Otherwise, find the rightmost element of the left subtree. */
|
|
node = sp->root->left;
|
|
if (node)
|
|
while (node->right)
|
|
node = node->right;
|
|
|
|
return node;
|
|
}
|
|
|
|
/* Return the immediate successor KEY, or NULL if there is no
|
|
successor. KEY need not be present in the tree. */
|
|
|
|
splay_tree_node
|
|
splay_tree_successor (splay_tree sp, splay_tree_key key)
|
|
{
|
|
int comparison;
|
|
splay_tree_node node;
|
|
|
|
/* If the tree is empty, there is certainly no successor. */
|
|
if (!sp->root)
|
|
return NULL;
|
|
|
|
/* Splay the tree around KEY. That will leave either the KEY
|
|
itself, its predecessor, or its successor at the root. */
|
|
splay_tree_splay (sp, key);
|
|
comparison = (*sp->comp)(sp->root->key, key);
|
|
|
|
/* If the successor is at the root, just return it. */
|
|
if (comparison > 0)
|
|
return sp->root;
|
|
|
|
/* Otherwise, find the leftmost element of the right subtree. */
|
|
node = sp->root->right;
|
|
if (node)
|
|
while (node->left)
|
|
node = node->left;
|
|
|
|
return node;
|
|
}
|
|
|
|
/* Call FN, passing it the DATA, for every node in SP, following an
|
|
in-order traversal. If FN every returns a non-zero value, the
|
|
iteration ceases immediately, and the value is returned.
|
|
Otherwise, this function returns 0. */
|
|
|
|
int
|
|
splay_tree_foreach (splay_tree sp, splay_tree_foreach_fn fn, void *data)
|
|
{
|
|
return splay_tree_foreach_helper (sp, sp->root, fn, data);
|
|
}
|
|
|
|
/* Splay-tree comparison function, treating the keys as ints. */
|
|
|
|
int
|
|
splay_tree_compare_ints (splay_tree_key k1, splay_tree_key k2)
|
|
{
|
|
if ((int) k1 < (int) k2)
|
|
return -1;
|
|
else if ((int) k1 > (int) k2)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Splay-tree comparison function, treating the keys as pointers. */
|
|
|
|
int
|
|
splay_tree_compare_pointers (splay_tree_key k1, splay_tree_key k2)
|
|
{
|
|
if ((char*) k1 < (char*) k2)
|
|
return -1;
|
|
else if ((char*) k1 > (char*) k2)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|