mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
224c3ddb89
Most allocation functions (if not all) return a void* pointing to the allocated memory. In C++, we need to add an explicit cast when assigning the result to a pointer to another type (which is the case more often than not). The content of this patch is taken from Pedro's branch, from commit "(mostly) auto-generated patch to insert casts needed for C++". I validated that the changes make sense and manually reflowed the code to make it respect the coding style. I also found multiple places where I could use XNEW/XNEWVEC/XRESIZEVEC/etc. Thanks a lot to whoever did that automated script to insert casts, doing it completely by hand would have taken a ridiculous amount of time. Only files built on x86 with --enable-targets=all are modified. This means that all other -nat.c files are untouched and will have to be dealt with later by using appropiate compilers. Or maybe we can try to build them with a regular g++ just to know where to add casts, I don't know. I built-tested this with --enable-targets=all and reg-tested. Here's the changelog entry, which was not too bad to make despite the size, thanks to David Malcom's script. I fixed some bits by hand, but there might be some wrong parts left (hopefully not). gdb/ChangeLog: * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Add cast to allocation result assignment. * ada-exp.y (write_object_renaming): Likewise. (write_ambiguous_var): Likewise. (ada_nget_field_index): Likewise. (write_var_or_type): Likewise. * ada-lang.c (ada_decode_symbol): Likewise. (ada_value_assign): Likewise. (value_pointer): Likewise. (cache_symbol): Likewise. (add_nonlocal_symbols): Likewise. (ada_name_for_lookup): Likewise. (symbol_completion_add): Likewise. (ada_to_fixed_type_1): Likewise. (ada_get_next_arg): Likewise. (defns_collected): Likewise. * ada-lex.l (processId): Likewise. (processString): Likewise. * ada-tasks.c (read_known_tasks_array): Likewise. (read_known_tasks_list): Likewise. * ada-typeprint.c (decoded_type_name): Likewise. * addrmap.c (addrmap_mutable_create_fixed): Likewise. * amd64-tdep.c (amd64_push_arguments): Likewise. (amd64_displaced_step_copy_insn): Likewise. (amd64_classify_insn_at): Likewise. (amd64_relocate_instruction): Likewise. * amd64obsd-tdep.c (amd64obsd_sigtramp_p): Likewise. * arch-utils.c (simple_displaced_step_copy_insn): Likewise. (initialize_current_architecture): Likewise. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * arm-symbian-tdep.c (arm_symbian_osabi_sniffer): Likewise. * arm-tdep.c (arm_exidx_new_objfile): Likewise. (arm_push_dummy_call): Likewise. (extend_buffer_earlier): Likewise. (arm_adjust_breakpoint_address): Likewise. (arm_skip_stub): Likewise. * auto-load.c (filename_is_in_pattern): Likewise. (maybe_add_script_file): Likewise. (maybe_add_script_text): Likewise. (auto_load_objfile_script_1): Likewise. * auxv.c (ld_so_xfer_auxv): Likewise. * ax-general.c (new_agent_expr): Likewise. (grow_expr): Likewise. (ax_reg_mask): Likewise. * bcache.c (bcache_full): Likewise. * breakpoint.c (program_breakpoint_here_p): Likewise. * btrace.c (parse_xml_raw): Likewise. * build-id.c (build_id_to_debug_bfd): Likewise. * buildsym.c (end_symtab_with_blockvector): Likewise. * c-exp.y (string_exp): Likewise. (qualified_name): Likewise. (write_destructor_name): Likewise. (operator_stoken): Likewise. (parse_number): Likewise. (scan_macro_expansion): Likewise. (yylex): Likewise. (c_print_token): Likewise. * c-lang.c (c_get_string): Likewise. (emit_numeric_character): Likewise. * charset.c (wchar_iterate): Likewise. * cli/cli-cmds.c (complete_command): Likewise. (make_command): Likewise. * cli/cli-dump.c (restore_section_callback): Likewise. (restore_binary_file): Likewise. * cli/cli-interp.c (cli_interpreter_exec): Likewise. * cli/cli-script.c (execute_control_command): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (add_pe_forwarded_sym): Likewise. (read_pe_exported_syms): Likewise. * coffread.c (coff_read_struct_type): Likewise. (coff_read_enum_type): Likewise. * common/btrace-common.c (btrace_data_append): Likewise. * common/buffer.c (buffer_grow): Likewise. * common/filestuff.c (gdb_fopen_cloexec): Likewise. * common/format.c (parse_format_string): Likewise. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Likewise. * common/xml-utils.c (xml_escape_text): Likewise. * compile/compile-object-load.c (copy_sections): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * completer.c (filename_completer): Likewise. * corefile.c (read_memory_typed_address): Likewise. (write_memory_unsigned_integer): Likewise. (write_memory_signed_integer): Likewise. (complete_set_gnutarget): Likewise. * corelow.c (get_core_register_section): Likewise. * cp-name-parser.y (d_grab): Likewise. (allocate_info): Likewise. (cp_new_demangle_parse_info): Likewise. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Likewise. (cp_lookup_symbol_in_namespace): Likewise. (lookup_namespace_scope): Likewise. (find_symbol_in_baseclass): Likewise. (cp_lookup_nested_symbol): Likewise. (cp_lookup_transparent_type_loop): Likewise. * cp-support.c (copy_string_to_obstack): Likewise. (make_symbol_overload_list): Likewise. (make_symbol_overload_list_namespace): Likewise. (make_symbol_overload_list_adl_namespace): Likewise. (first_component_command): Likewise. * cp-valprint.c (cp_print_value): Likewise. * ctf.c (ctf_xfer_partial): Likewise. * d-exp.y (StringExp): Likewise. * d-namespace.c (d_lookup_symbol_in_module): Likewise. (lookup_module_scope): Likewise. (find_symbol_in_baseclass): Likewise. (d_lookup_nested_symbol): Likewise. * dbxread.c (find_stab_function_addr): Likewise. (read_dbx_symtab): Likewise. (dbx_end_psymtab): Likewise. (cp_set_block_scope): Likewise. * dcache.c (dcache_alloc): Likewise. * demangle.c (_initialize_demangler): Likewise. * dicos-tdep.c (dicos_load_module_p): Likewise. * dictionary.c (dict_create_hashed_expandable): Likewise. (dict_create_linear_expandable): Likewise. (expand_hashtable): Likewise. (add_symbol_linear_expandable): Likewise. * dwarf2-frame.c (add_cie): Likewise. (add_fde): Likewise. (dwarf2_build_frame_info): Likewise. * dwarf2expr.c (dwarf_expr_grow_stack): Likewise. (dwarf_expr_fetch_address): Likewise. (add_piece): Likewise. (execute_stack_op): Likewise. * dwarf2loc.c (chain_candidate): Likewise. (dwarf_entry_parameter_to_value): Likewise. (read_pieced_value): Likewise. (write_pieced_value): Likewise. * dwarf2read.c (dwarf2_read_section): Likewise. (add_type_unit): Likewise. (read_comp_units_from_section): Likewise. (fixup_go_packaging): Likewise. (dwarf2_compute_name): Likewise. (dwarf2_physname): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (read_call_site_scope): Likewise. (dwarf2_attach_fields_to_type): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (read_common_block): Likewise. (abbrev_table_read_table): Likewise. (guess_partial_die_structure_name): Likewise. (fixup_partial_die): Likewise. (add_file_name): Likewise. (dwarf2_const_value_data): Likewise. (dwarf2_const_value_attr): Likewise. (build_error_marker_type): Likewise. (guess_full_die_structure_name): Likewise. (anonymous_struct_prefix): Likewise. (typename_concat): Likewise. (dwarf2_canonicalize_name): Likewise. (dwarf2_name): Likewise. (write_constant_as_bytes): Likewise. (dwarf2_fetch_constant_bytes): Likewise. (copy_string): Likewise. (parse_macro_definition): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_rel_plt_read): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_gnu_ifunc_resolve_by_got): Likewise. (elf_read_minimal_symbols): Likewise. (elf_gnu_ifunc_record_cache): Likewise. * event-top.c (top_level_prompt): Likewise. (command_line_handler): Likewise. * exec.c (resize_section_table): Likewise. * expprint.c (print_subexp_standard): Likewise. * fbsd-tdep.c (fbsd_collect_regset_section_cb): Likewise. * findcmd.c (parse_find_args): Likewise. * findvar.c (address_from_register): Likewise. * frame.c (get_prev_frame_always): Likewise. * gdb_bfd.c (gdb_bfd_ref): Likewise. (get_section_descriptor): Likewise. * gdb_obstack.c (obconcat): Likewise. (obstack_strdup): Likewise. * gdbtypes.c (lookup_function_type_with_arguments): Likewise. (create_set_type): Likewise. (lookup_unsigned_typename): Likewise. (lookup_signed_typename): Likewise. (resolve_dynamic_union): Likewise. (resolve_dynamic_struct): Likewise. (add_dyn_prop): Likewise. (copy_dynamic_prop_list): Likewise. (arch_flags_type): Likewise. (append_composite_type_field_raw): Likewise. * gdbtypes.h (INIT_FUNC_SPECIFIC): Likewise. * gnu-v3-abi.c (gnuv3_rtti_type): Likewise. * go-exp.y (string_exp): Likewise. * go-lang.c (go_demangle): Likewise. * guile/guile.c (compute_scheme_string): Likewise. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. (gdbscm_canonicalize_command_name): Likewise. * guile/scm-ports.c (ioscm_init_stdio_buffers): Likewise. (ioscm_init_memory_port): Likewise. (ioscm_reinit_memory_port): Likewise. * guile/scm-utils.c (gdbscm_gc_xstrdup): Likewise. (gdbscm_gc_dup_argv): Likewise. * h8300-tdep.c (h8300_push_dummy_call): Likewise. * hppa-tdep.c (internalize_unwinds): Likewise. (read_unwind_info): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. (windows_core_xfer_shared_libraries): Likewise. * i386-tdep.c (i386_displaced_step_copy_insn): Likewise. (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * i386obsd-tdep.c (i386obsd_sigtramp_p): Likewise. * inf-child.c (inf_child_fileio_readlink): Likewise. * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. (inf_ptrace_store_register): Likewise. * infrun.c (follow_exec): Likewise. (displaced_step_prepare_throw): Likewise. (save_stop_context): Likewise. (save_infcall_suspend_state): Likewise. * jit.c (jit_read_descriptor): Likewise. (jit_read_code_entry): Likewise. (jit_symtab_line_mapping_add_impl): Likewise. (finalize_symtab): Likewise. (jit_unwind_reg_get_impl): Likewise. * jv-exp.y (QualifiedName): Likewise. * jv-lang.c (get_java_utf8_name): Likewise. (type_from_class): Likewise. (java_demangle_type_signature): Likewise. (java_class_name_from_physname): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_value_print): Likewise. * language.c (add_language): Likewise. * linespec.c (add_sal_to_sals_basic): Likewise. (add_sal_to_sals): Likewise. (decode_objc): Likewise. (find_linespec_symbols): Likewise. * linux-fork.c (fork_save_infrun_state): Likewise. * linux-nat.c (linux_nat_detach): Likewise. (linux_nat_fileio_readlink): Likewise. * linux-record.c (record_linux_sockaddr): Likewise. (record_linux_msghdr): Likewise. (Do): Likewise. * linux-tdep.c (linux_core_info_proc_mappings): Likewise. (linux_collect_regset_section_cb): Likewise. (linux_get_siginfo_data): Likewise. * linux-thread-db.c (try_thread_db_load_from_pdir_1): Likewise. (try_thread_db_load_from_dir): Likewise. (thread_db_load_search): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise. (m32c_m16c_pointer_to_address): Likewise. * m68hc11-tdep.c (m68hc11_pseudo_register_write): Likewise. * m68k-tdep.c (m68k_get_longjmp_target): Likewise. * machoread.c (macho_check_dsym): Likewise. * macroexp.c (resize_buffer): Likewise. (gather_arguments): Likewise. (maybe_expand): Likewise. * macrotab.c (new_macro_key): Likewise. (new_source_file): Likewise. (new_macro_definition): Likewise. * mdebugread.c (parse_symbol): Likewise. (parse_type): Likewise. (parse_partial_symbols): Likewise. (psymtab_to_symtab_1): Likewise. * mem-break.c (default_memory_insert_breakpoint): Likewise. * mi/mi-cmd-break.c (mi_argv_to_format): Likewise. * mi/mi-main.c (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_data_write_memory_bytes): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. (mi_parse): Likewise. * minidebug.c (lzma_open): Likewise. (lzma_pread): Likewise. * mips-tdep.c (mips_read_fp_register_single): Likewise. (mips_print_fp_register): Likewise. * mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Likewise. * mipsread.c (read_alphacoff_dynamic_symtab): Likewise. * mt-tdep.c (mt_register_name): Likewise. (mt_registers_info): Likewise. (mt_push_dummy_call): Likewise. * namespace.c (add_using_directive): Likewise. * nat/linux-btrace.c (perf_event_read): Likewise. (linux_enable_bts): Likewise. * nat/linux-osdata.c (linux_common_core_of_thread): Likewise. * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Likewise. * nto-tdep.c (nto_find_and_open_solib): Likewise. (nto_parse_redirection): Likewise. * objc-lang.c (objc_demangle): Likewise. (find_methods): Likewise. * objfiles.c (get_objfile_bfd_data): Likewise. (set_objfile_main_name): Likewise. (allocate_objfile): Likewise. (objfile_relocate): Likewise. (update_section_map): Likewise. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. * p-exp.y (exp): Likewise. (yylex): Likewise. * p-valprint.c (pascal_object_print_value): Likewise. * parse.c (initialize_expout): Likewise. (mark_completion_tag): Likewise. (copy_name): Likewise. (parse_float): Likewise. (type_stack_reserve): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. (ppu2spu_prev_register): Likewise. * ppc-ravenscar-thread.c (supply_register_at_address): Likewise. * printcmd.c (printf_wide_c_string): Likewise. (printf_pointer): Likewise. * probe.c (parse_probes): Likewise. * python/py-cmd.c (gdbpy_parse_command_name): Likewise. (cmdpy_init): Likewise. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Likewise. * python/py-symtab.c (set_sal): Likewise. * python/py-unwind.c (pyuw_sniffer): Likewise. * python/python.c (python_interactive_command): Likewise. (compute_python_string): Likewise. * ravenscar-thread.c (get_running_thread_id): Likewise. * record-full.c (record_full_exec_insn): Likewise. (record_full_core_open_1): Likewise. * regcache.c (regcache_raw_read_signed): Likewise. (regcache_raw_read_unsigned): Likewise. (regcache_cooked_read_signed): Likewise. (regcache_cooked_read_unsigned): Likewise. * remote-fileio.c (remote_fileio_func_open): Likewise. (remote_fileio_func_rename): Likewise. (remote_fileio_func_unlink): Likewise. (remote_fileio_func_stat): Likewise. (remote_fileio_func_system): Likewise. * remote-mips.c (mips_xfer_memory): Likewise. (mips_load_srec): Likewise. (pmon_end_download): Likewise. * remote.c (new_remote_state): Likewise. (map_regcache_remote_table): Likewise. (remote_register_number_and_offset): Likewise. (init_remote_state): Likewise. (get_memory_packet_size): Likewise. (remote_pass_signals): Likewise. (remote_program_signals): Likewise. (remote_start_remote): Likewise. (remote_check_symbols): Likewise. (remote_query_supported): Likewise. (extended_remote_attach): Likewise. (process_g_packet): Likewise. (store_registers_using_G): Likewise. (putpkt_binary): Likewise. (read_frame): Likewise. (compare_sections_command): Likewise. (remote_hostio_pread): Likewise. (remote_hostio_readlink): Likewise. (remote_file_put): Likewise. (remote_file_get): Likewise. (remote_pid_to_exec_file): Likewise. (_initialize_remote): Likewise. * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. (rs6000_aix_core_xfer_shared_libraries_aix): Likewise. * rs6000-tdep.c (ppc_displaced_step_copy_insn): Likewise. (bfd_uses_spe_extensions): Likewise. * s390-linux-tdep.c (s390_displaced_step_copy_insn): Likewise. * score-tdep.c (score7_malloc_and_get_memblock): Likewise. * solib-dsbt.c (decode_loadmap): Likewise. (fetch_loadmap): Likewise. (scan_dyntag): Likewise. (enable_break): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (fetch_loadmap): Likewise. (enable_break2): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_relocate_main_executable): Likewise. (spu_bfd_open): Likewise. * solib-svr4.c (lm_info_read): Likewise. (read_program_header): Likewise. (find_program_interpreter): Likewise. (scan_dyntag): Likewise. (elf_locate_base): Likewise. (open_symbol_file_object): Likewise. (read_program_headers_from_bfd): Likewise. (svr4_relocate_main_executable): Likewise. * solib-target.c (solib_target_relocate_section_addresses): Likewise. * solib.c (solib_find_1): Likewise. (exec_file_find): Likewise. (solib_find): Likewise. * source.c (openp): Likewise. (print_source_lines_base): Likewise. (forward_search_command): Likewise. * sparc-ravenscar-thread.c (supply_register_at_address): Likewise. * spu-tdep.c (spu2ppu_prev_register): Likewise. (spu_get_overlay_table): Likewise. * stabsread.c (patch_block_stabs): Likewise. (define_symbol): Likewise. (again:): Likewise. (read_member_functions): Likewise. (read_one_struct_field): Likewise. (read_enum_type): Likewise. (common_block_start): Likewise. * stack.c (read_frame_arg): Likewise. (backtrace_command): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. * symfile.c (syms_from_objfile_1): Likewise. (find_separate_debug_file): Likewise. (load_command): Likewise. (load_progress): Likewise. (load_section_callback): Likewise. (reread_symbols): Likewise. (add_filename_language): Likewise. (allocate_compunit_symtab): Likewise. (read_target_long_array): Likewise. (simple_read_overlay_table): Likewise. * symtab.c (symbol_set_names): Likewise. (resize_symbol_cache): Likewise. (rbreak_command): Likewise. (completion_list_add_name): Likewise. (completion_list_objc_symbol): Likewise. (add_filename_to_list): Likewise. * target-descriptions.c (maint_print_c_tdesc_cmd): Likewise. * target-memory.c (target_write_memory_blocks): Likewise. * target.c (target_read_string): Likewise. (read_whatever_is_readable): Likewise. (target_read_alloc_1): Likewise. (simple_search_memory): Likewise. (target_fileio_read_alloc_1): Likewise. * tilegx-tdep.c (tilegx_push_dummy_call): Likewise. * top.c (command_line_input): Likewise. * tracefile-tfile.c (tfile_fetch_registers): Likewise. * tracefile.c (tracefile_fetch_registers): Likewise. * tracepoint.c (add_memrange): Likewise. (init_collection_list): Likewise. (add_aexpr): Likewise. (trace_dump_actions): Likewise. (parse_trace_status): Likewise. (parse_tracepoint_definition): Likewise. (parse_tsv_definition): Likewise. (parse_static_tracepoint_marker_definition): Likewise. * tui/tui-file.c (tui_sfileopen): Likewise. (tui_file_adjust_strbuf): Likewise. * tui/tui-io.c (tui_expand_tabs): Likewise. * tui/tui-source.c (tui_set_source_content): Likewise. * typeprint.c (find_global_typedef): Likewise. * ui-file.c (do_ui_file_xstrdup): Likewise. (ui_file_obsavestring): Likewise. (mem_file_write): Likewise. * utils.c (make_hex_string): Likewise. (get_regcomp_error): Likewise. (puts_filtered_tabular): Likewise. (gdb_realpath_keepfile): Likewise. (ldirname): Likewise. (gdb_bfd_errmsg): Likewise. (substitute_path_component): Likewise. * valops.c (search_struct_method): Likewise. (find_oload_champ_namespace_loop): Likewise. * valprint.c (print_decimal_chars): Likewise. (read_string): Likewise. (generic_emit_char): Likewise. * varobj.c (varobj_delete): Likewise. (varobj_value_get_print_value): Likewise. * vaxobsd-tdep.c (vaxobsd_sigtramp_sniffer): Likewise. * windows-tdep.c (display_one_tib): Likewise. * xcoffread.c (read_xcoff_symtab): Likewise. (process_xcoff_symbol): Likewise. (swap_sym): Likewise. (scan_xcoff_symtab): Likewise. (xcoff_initial_scan): Likewise. * xml-support.c (gdb_xml_end_element): Likewise. (xml_process_xincludes): Likewise. (xml_fetch_content_from_file): Likewise. * xml-syscall.c (xml_list_of_syscalls): Likewise. * xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Add cast to allocation result assignment. (gdb_unparse_agent_expr): Likewise. * hostio.c (require_data): Likewise. (handle_pread): Likewise. * linux-low.c (disable_regset): Likewise. (fetch_register): Likewise. (store_register): Likewise. (get_dynamic): Likewise. (linux_qxfer_libraries_svr4): Likewise. * mem-break.c (delete_fast_tracepoint_jump): Likewise. (set_fast_tracepoint_jump): Likewise. (uninsert_fast_tracepoint_jumps_at): Likewise. (reinsert_fast_tracepoint_jumps_at): Likewise. (validate_inserted_breakpoint): Likewise. (clone_agent_expr): Likewise. * regcache.c (init_register_cache): Likewise. * remote-utils.c (putpkt_binary_1): Likewise. (decode_M_packet): Likewise. (decode_X_packet): Likewise. (look_up_one_symbol): Likewise. (relocate_instruction): Likewise. (monitor_output): Likewise. * server.c (handle_search_memory): Likewise. (handle_qxfer_exec_file): Likewise. (handle_qxfer_libraries): Likewise. (handle_qxfer): Likewise. (handle_query): Likewise. (handle_v_cont): Likewise. (handle_v_run): Likewise. (captured_main): Likewise. * target.c (write_inferior_memory): Likewise. * thread-db.c (try_thread_db_load_from_dir): Likewise. * tracepoint.c (init_trace_buffer): Likewise. (add_tracepoint_action): Likewise. (add_traceframe): Likewise. (add_traceframe_block): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtdv): Likewise. (cmd_qtstatus): Likewise. (response_source): Likewise. (response_tsv): Likewise. (cmd_qtnotes): Likewise. (gdb_collect): Likewise. (initialize_tracepoint): Likewise.
946 lines
26 KiB
C
946 lines
26 KiB
C
/* Routines for name->symbol lookups in GDB.
|
|
|
|
Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
|
|
Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include <ctype.h>
|
|
#include "gdb_obstack.h"
|
|
#include "symtab.h"
|
|
#include "buildsym.h"
|
|
#include "dictionary.h"
|
|
|
|
/* This file implements dictionaries, which are tables that associate
|
|
symbols to names. They are represented by an opaque type 'struct
|
|
dictionary'. That type has various internal implementations, which
|
|
you can choose between depending on what properties you need
|
|
(e.g. fast lookup, order-preserving, expandable).
|
|
|
|
Each dictionary starts with a 'virtual function table' that
|
|
contains the functions that actually implement the various
|
|
operations that dictionaries provide. (Note, however, that, for
|
|
the sake of client code, we also provide some functions that can be
|
|
implemented generically in terms of the functions in the vtable.)
|
|
|
|
To add a new dictionary implementation <impl>, what you should do
|
|
is:
|
|
|
|
* Add a new element DICT_<IMPL> to dict_type.
|
|
|
|
* Create a new structure dictionary_<impl>. If your new
|
|
implementation is a variant of an existing one, make sure that
|
|
their structs have the same initial data members. Define accessor
|
|
macros for your new data members.
|
|
|
|
* Implement all the functions in dict_vector as static functions,
|
|
whose name is the same as the corresponding member of dict_vector
|
|
plus _<impl>. You don't have to do this for those members where
|
|
you can reuse existing generic functions
|
|
(e.g. add_symbol_nonexpandable, free_obstack) or in the case where
|
|
your new implementation is a variant of an existing implementation
|
|
and where the variant doesn't affect the member function in
|
|
question.
|
|
|
|
* Define a static const struct dict_vector dict_<impl>_vector.
|
|
|
|
* Define a function dict_create_<impl> to create these
|
|
gizmos. Add its declaration to dictionary.h.
|
|
|
|
To add a new operation <op> on all existing implementations, what
|
|
you should do is:
|
|
|
|
* Add a new member <op> to struct dict_vector.
|
|
|
|
* If there is useful generic behavior <op>, define a static
|
|
function <op>_something_informative that implements that behavior.
|
|
(E.g. add_symbol_nonexpandable, free_obstack.)
|
|
|
|
* For every implementation <impl> that should have its own specific
|
|
behavior for <op>, define a static function <op>_<impl>
|
|
implementing it.
|
|
|
|
* Modify all existing dict_vector_<impl>'s to include the appropriate
|
|
member.
|
|
|
|
* Define a function dict_<op> that looks up <op> in the dict_vector
|
|
and calls the appropriate function. Add a declaration for
|
|
dict_<op> to dictionary.h. */
|
|
|
|
/* An enum representing the various implementations of dictionaries.
|
|
Used only for debugging. */
|
|
|
|
enum dict_type
|
|
{
|
|
/* Symbols are stored in a fixed-size hash table. */
|
|
DICT_HASHED,
|
|
/* Symbols are stored in an expandable hash table. */
|
|
DICT_HASHED_EXPANDABLE,
|
|
/* Symbols are stored in a fixed-size array. */
|
|
DICT_LINEAR,
|
|
/* Symbols are stored in an expandable array. */
|
|
DICT_LINEAR_EXPANDABLE
|
|
};
|
|
|
|
/* The virtual function table. */
|
|
|
|
struct dict_vector
|
|
{
|
|
/* The type of the dictionary. This is only here to make debugging
|
|
a bit easier; it's not actually used. */
|
|
enum dict_type type;
|
|
/* The function to free a dictionary. */
|
|
void (*free) (struct dictionary *dict);
|
|
/* Add a symbol to a dictionary, if possible. */
|
|
void (*add_symbol) (struct dictionary *dict, struct symbol *sym);
|
|
/* Iterator functions. */
|
|
struct symbol *(*iterator_first) (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
struct symbol *(*iterator_next) (struct dict_iterator *iterator);
|
|
/* Functions to iterate over symbols with a given name. */
|
|
struct symbol *(*iter_match_first) (const struct dictionary *dict,
|
|
const char *name,
|
|
symbol_compare_ftype *equiv,
|
|
struct dict_iterator *iterator);
|
|
struct symbol *(*iter_match_next) (const char *name,
|
|
symbol_compare_ftype *equiv,
|
|
struct dict_iterator *iterator);
|
|
/* A size function, for maint print symtabs. */
|
|
int (*size) (const struct dictionary *dict);
|
|
};
|
|
|
|
/* Now comes the structs used to store the data for different
|
|
implementations. If two implementations have data in common, put
|
|
the common data at the top of their structs, ordered in the same
|
|
way. */
|
|
|
|
struct dictionary_hashed
|
|
{
|
|
int nbuckets;
|
|
struct symbol **buckets;
|
|
};
|
|
|
|
struct dictionary_hashed_expandable
|
|
{
|
|
/* How many buckets we currently have. */
|
|
int nbuckets;
|
|
struct symbol **buckets;
|
|
/* How many syms we currently have; we need this so we will know
|
|
when to add more buckets. */
|
|
int nsyms;
|
|
};
|
|
|
|
struct dictionary_linear
|
|
{
|
|
int nsyms;
|
|
struct symbol **syms;
|
|
};
|
|
|
|
struct dictionary_linear_expandable
|
|
{
|
|
/* How many symbols we currently have. */
|
|
int nsyms;
|
|
struct symbol **syms;
|
|
/* How many symbols we can store before needing to reallocate. */
|
|
int capacity;
|
|
};
|
|
|
|
/* And now, the star of our show. */
|
|
|
|
struct dictionary
|
|
{
|
|
const struct dict_vector *vector;
|
|
union
|
|
{
|
|
struct dictionary_hashed hashed;
|
|
struct dictionary_hashed_expandable hashed_expandable;
|
|
struct dictionary_linear linear;
|
|
struct dictionary_linear_expandable linear_expandable;
|
|
}
|
|
data;
|
|
};
|
|
|
|
/* Accessor macros. */
|
|
|
|
#define DICT_VECTOR(d) (d)->vector
|
|
|
|
/* These can be used for DICT_HASHED_EXPANDABLE, too. */
|
|
|
|
#define DICT_HASHED_NBUCKETS(d) (d)->data.hashed.nbuckets
|
|
#define DICT_HASHED_BUCKETS(d) (d)->data.hashed.buckets
|
|
#define DICT_HASHED_BUCKET(d,i) DICT_HASHED_BUCKETS (d) [i]
|
|
|
|
#define DICT_HASHED_EXPANDABLE_NSYMS(d) (d)->data.hashed_expandable.nsyms
|
|
|
|
/* These can be used for DICT_LINEAR_EXPANDABLEs, too. */
|
|
|
|
#define DICT_LINEAR_NSYMS(d) (d)->data.linear.nsyms
|
|
#define DICT_LINEAR_SYMS(d) (d)->data.linear.syms
|
|
#define DICT_LINEAR_SYM(d,i) DICT_LINEAR_SYMS (d) [i]
|
|
|
|
#define DICT_LINEAR_EXPANDABLE_CAPACITY(d) \
|
|
(d)->data.linear_expandable.capacity
|
|
|
|
/* The initial size of a DICT_*_EXPANDABLE dictionary. */
|
|
|
|
#define DICT_EXPANDABLE_INITIAL_CAPACITY 10
|
|
|
|
/* This calculates the number of buckets we'll use in a hashtable,
|
|
given the number of symbols that it will contain. */
|
|
|
|
#define DICT_HASHTABLE_SIZE(n) ((n)/5 + 1)
|
|
|
|
/* Accessor macros for dict_iterators; they're here rather than
|
|
dictionary.h because code elsewhere should treat dict_iterators as
|
|
opaque. */
|
|
|
|
/* The dictionary that the iterator is associated to. */
|
|
#define DICT_ITERATOR_DICT(iter) (iter)->dict
|
|
/* For linear dictionaries, the index of the last symbol returned; for
|
|
hashed dictionaries, the bucket of the last symbol returned. */
|
|
#define DICT_ITERATOR_INDEX(iter) (iter)->index
|
|
/* For hashed dictionaries, this points to the last symbol returned;
|
|
otherwise, this is unused. */
|
|
#define DICT_ITERATOR_CURRENT(iter) (iter)->current
|
|
|
|
/* Declarations of functions for vectors. */
|
|
|
|
/* Functions that might work across a range of dictionary types. */
|
|
|
|
static void add_symbol_nonexpandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static void free_obstack (struct dictionary *dict);
|
|
|
|
/* Functions for DICT_HASHED and DICT_HASHED_EXPANDABLE
|
|
dictionaries. */
|
|
|
|
static struct symbol *iterator_first_hashed (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iterator_next_hashed (struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_first_hashed (const struct dictionary *dict,
|
|
const char *name,
|
|
symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_next_hashed (const char *name,
|
|
symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator);
|
|
|
|
static unsigned int dict_hash (const char *string);
|
|
|
|
/* Functions only for DICT_HASHED. */
|
|
|
|
static int size_hashed (const struct dictionary *dict);
|
|
|
|
/* Functions only for DICT_HASHED_EXPANDABLE. */
|
|
|
|
static void free_hashed_expandable (struct dictionary *dict);
|
|
|
|
static void add_symbol_hashed_expandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static int size_hashed_expandable (const struct dictionary *dict);
|
|
|
|
/* Functions for DICT_LINEAR and DICT_LINEAR_EXPANDABLE
|
|
dictionaries. */
|
|
|
|
static struct symbol *iterator_first_linear (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iterator_next_linear (struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_first_linear (const struct dictionary *dict,
|
|
const char *name,
|
|
symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_next_linear (const char *name,
|
|
symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator);
|
|
|
|
static int size_linear (const struct dictionary *dict);
|
|
|
|
/* Functions only for DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static void free_linear_expandable (struct dictionary *dict);
|
|
|
|
static void add_symbol_linear_expandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
/* Various vectors that we'll actually use. */
|
|
|
|
static const struct dict_vector dict_hashed_vector =
|
|
{
|
|
DICT_HASHED, /* type */
|
|
free_obstack, /* free */
|
|
add_symbol_nonexpandable, /* add_symbol */
|
|
iterator_first_hashed, /* iterator_first */
|
|
iterator_next_hashed, /* iterator_next */
|
|
iter_match_first_hashed, /* iter_name_first */
|
|
iter_match_next_hashed, /* iter_name_next */
|
|
size_hashed, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_hashed_expandable_vector =
|
|
{
|
|
DICT_HASHED_EXPANDABLE, /* type */
|
|
free_hashed_expandable, /* free */
|
|
add_symbol_hashed_expandable, /* add_symbol */
|
|
iterator_first_hashed, /* iterator_first */
|
|
iterator_next_hashed, /* iterator_next */
|
|
iter_match_first_hashed, /* iter_name_first */
|
|
iter_match_next_hashed, /* iter_name_next */
|
|
size_hashed_expandable, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_linear_vector =
|
|
{
|
|
DICT_LINEAR, /* type */
|
|
free_obstack, /* free */
|
|
add_symbol_nonexpandable, /* add_symbol */
|
|
iterator_first_linear, /* iterator_first */
|
|
iterator_next_linear, /* iterator_next */
|
|
iter_match_first_linear, /* iter_name_first */
|
|
iter_match_next_linear, /* iter_name_next */
|
|
size_linear, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_linear_expandable_vector =
|
|
{
|
|
DICT_LINEAR_EXPANDABLE, /* type */
|
|
free_linear_expandable, /* free */
|
|
add_symbol_linear_expandable, /* add_symbol */
|
|
iterator_first_linear, /* iterator_first */
|
|
iterator_next_linear, /* iterator_next */
|
|
iter_match_first_linear, /* iter_name_first */
|
|
iter_match_next_linear, /* iter_name_next */
|
|
size_linear, /* size */
|
|
};
|
|
|
|
/* Declarations of helper functions (i.e. ones that don't go into
|
|
vectors). */
|
|
|
|
static struct symbol *iterator_hashed_advance (struct dict_iterator *iter);
|
|
|
|
static void insert_symbol_hashed (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static void expand_hashtable (struct dictionary *dict);
|
|
|
|
/* The creation functions. */
|
|
|
|
/* Create a dictionary implemented via a fixed-size hashtable. All
|
|
memory it uses is allocated on OBSTACK; the environment is
|
|
initialized from SYMBOL_LIST. */
|
|
|
|
struct dictionary *
|
|
dict_create_hashed (struct obstack *obstack,
|
|
const struct pending *symbol_list)
|
|
{
|
|
struct dictionary *retval;
|
|
int nsyms = 0, nbuckets, i;
|
|
struct symbol **buckets;
|
|
const struct pending *list_counter;
|
|
|
|
retval = XOBNEW (obstack, struct dictionary);
|
|
DICT_VECTOR (retval) = &dict_hashed_vector;
|
|
|
|
/* Calculate the number of symbols, and allocate space for them. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
nsyms += list_counter->nsyms;
|
|
}
|
|
nbuckets = DICT_HASHTABLE_SIZE (nsyms);
|
|
DICT_HASHED_NBUCKETS (retval) = nbuckets;
|
|
buckets = XOBNEWVEC (obstack, struct symbol *, nbuckets);
|
|
memset (buckets, 0, nbuckets * sizeof (struct symbol *));
|
|
DICT_HASHED_BUCKETS (retval) = buckets;
|
|
|
|
/* Now fill the buckets. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
for (i = list_counter->nsyms - 1; i >= 0; --i)
|
|
{
|
|
insert_symbol_hashed (retval, list_counter->symbol[i]);
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* Create a dictionary implemented via a hashtable that grows as
|
|
necessary. The dictionary is initially empty; to add symbols to
|
|
it, call dict_add_symbol(). Call dict_free() when you're done with
|
|
it. */
|
|
|
|
extern struct dictionary *
|
|
dict_create_hashed_expandable (void)
|
|
{
|
|
struct dictionary *retval = XNEW (struct dictionary);
|
|
|
|
DICT_VECTOR (retval) = &dict_hashed_expandable_vector;
|
|
DICT_HASHED_NBUCKETS (retval) = DICT_EXPANDABLE_INITIAL_CAPACITY;
|
|
DICT_HASHED_BUCKETS (retval) = XCNEWVEC (struct symbol *,
|
|
DICT_EXPANDABLE_INITIAL_CAPACITY);
|
|
DICT_HASHED_EXPANDABLE_NSYMS (retval) = 0;
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* Create a dictionary implemented via a fixed-size array. All memory
|
|
it uses is allocated on OBSTACK; the environment is initialized
|
|
from the SYMBOL_LIST. The symbols are ordered in the same order
|
|
that they're found in SYMBOL_LIST. */
|
|
|
|
struct dictionary *
|
|
dict_create_linear (struct obstack *obstack,
|
|
const struct pending *symbol_list)
|
|
{
|
|
struct dictionary *retval;
|
|
int nsyms = 0, i, j;
|
|
struct symbol **syms;
|
|
const struct pending *list_counter;
|
|
|
|
retval = XOBNEW (obstack, struct dictionary);
|
|
DICT_VECTOR (retval) = &dict_linear_vector;
|
|
|
|
/* Calculate the number of symbols, and allocate space for them. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
nsyms += list_counter->nsyms;
|
|
}
|
|
DICT_LINEAR_NSYMS (retval) = nsyms;
|
|
syms = XOBNEWVEC (obstack, struct symbol *, nsyms );
|
|
DICT_LINEAR_SYMS (retval) = syms;
|
|
|
|
/* Now fill in the symbols. Start filling in from the back, so as
|
|
to preserve the original order of the symbols. */
|
|
for (list_counter = symbol_list, j = nsyms - 1;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
for (i = list_counter->nsyms - 1;
|
|
i >= 0;
|
|
--i, --j)
|
|
{
|
|
syms[j] = list_counter->symbol[i];
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* Create a dictionary implemented via an array that grows as
|
|
necessary. The dictionary is initially empty; to add symbols to
|
|
it, call dict_add_symbol(). Call dict_free() when you're done with
|
|
it. */
|
|
|
|
struct dictionary *
|
|
dict_create_linear_expandable (void)
|
|
{
|
|
struct dictionary *retval = XNEW (struct dictionary);
|
|
|
|
DICT_VECTOR (retval) = &dict_linear_expandable_vector;
|
|
DICT_LINEAR_NSYMS (retval) = 0;
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (retval) = DICT_EXPANDABLE_INITIAL_CAPACITY;
|
|
DICT_LINEAR_SYMS (retval)
|
|
= XNEWVEC (struct symbol *, DICT_LINEAR_EXPANDABLE_CAPACITY (retval));
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* The functions providing the dictionary interface. */
|
|
|
|
/* Free the memory used by a dictionary that's not on an obstack. (If
|
|
any.) */
|
|
|
|
void
|
|
dict_free (struct dictionary *dict)
|
|
{
|
|
(DICT_VECTOR (dict))->free (dict);
|
|
}
|
|
|
|
/* Add SYM to DICT. DICT had better be expandable. */
|
|
|
|
void
|
|
dict_add_symbol (struct dictionary *dict, struct symbol *sym)
|
|
{
|
|
(DICT_VECTOR (dict))->add_symbol (dict, sym);
|
|
}
|
|
|
|
/* Utility to add a list of symbols to a dictionary.
|
|
DICT must be an expandable dictionary. */
|
|
|
|
void
|
|
dict_add_pending (struct dictionary *dict, const struct pending *symbol_list)
|
|
{
|
|
const struct pending *list;
|
|
int i;
|
|
|
|
for (list = symbol_list; list != NULL; list = list->next)
|
|
{
|
|
for (i = 0; i < list->nsyms; ++i)
|
|
dict_add_symbol (dict, list->symbol[i]);
|
|
}
|
|
}
|
|
|
|
/* Initialize ITERATOR to point at the first symbol in DICT, and
|
|
return that first symbol, or NULL if DICT is empty. */
|
|
|
|
struct symbol *
|
|
dict_iterator_first (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (dict))->iterator_first (dict, iterator);
|
|
}
|
|
|
|
/* Advance ITERATOR, and return the next symbol, or NULL if there are
|
|
no more symbols. */
|
|
|
|
struct symbol *
|
|
dict_iterator_next (struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (DICT_ITERATOR_DICT (iterator)))
|
|
->iterator_next (iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_name_first (const struct dictionary *dict,
|
|
const char *name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return dict_iter_match_first (dict, name, strcmp_iw, iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_name_next (const char *name, struct dict_iterator *iterator)
|
|
{
|
|
return dict_iter_match_next (name, strcmp_iw, iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_match_first (const struct dictionary *dict,
|
|
const char *name, symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (dict))->iter_match_first (dict, name,
|
|
compare, iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_match_next (const char *name, symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (DICT_ITERATOR_DICT (iterator)))
|
|
->iter_match_next (name, compare, iterator);
|
|
}
|
|
|
|
int
|
|
dict_size (const struct dictionary *dict)
|
|
{
|
|
return (DICT_VECTOR (dict))->size (dict);
|
|
}
|
|
|
|
/* Now come functions (well, one function, currently) that are
|
|
implemented generically by means of the vtable. Typically, they're
|
|
rarely used. */
|
|
|
|
/* Test to see if DICT is empty. */
|
|
|
|
int
|
|
dict_empty (struct dictionary *dict)
|
|
{
|
|
struct dict_iterator iter;
|
|
|
|
return (dict_iterator_first (dict, &iter) == NULL);
|
|
}
|
|
|
|
|
|
/* The functions implementing the dictionary interface. */
|
|
|
|
/* Generic functions, where appropriate. */
|
|
|
|
static void
|
|
free_obstack (struct dictionary *dict)
|
|
{
|
|
/* Do nothing! */
|
|
}
|
|
|
|
static void
|
|
add_symbol_nonexpandable (struct dictionary *dict, struct symbol *sym)
|
|
{
|
|
internal_error (__FILE__, __LINE__,
|
|
_("dict_add_symbol: non-expandable dictionary"));
|
|
}
|
|
|
|
/* Functions for DICT_HASHED and DICT_HASHED_EXPANDABLE. */
|
|
|
|
static struct symbol *
|
|
iterator_first_hashed (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = -1;
|
|
return iterator_hashed_advance (iterator);
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_next_hashed (struct dict_iterator *iterator)
|
|
{
|
|
struct symbol *next;
|
|
|
|
next = DICT_ITERATOR_CURRENT (iterator)->hash_next;
|
|
|
|
if (next == NULL)
|
|
return iterator_hashed_advance (iterator);
|
|
else
|
|
{
|
|
DICT_ITERATOR_CURRENT (iterator) = next;
|
|
return next;
|
|
}
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_hashed_advance (struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
int nbuckets = DICT_HASHED_NBUCKETS (dict);
|
|
int i;
|
|
|
|
for (i = DICT_ITERATOR_INDEX (iterator) + 1; i < nbuckets; ++i)
|
|
{
|
|
struct symbol *sym = DICT_HASHED_BUCKET (dict, i);
|
|
|
|
if (sym != NULL)
|
|
{
|
|
DICT_ITERATOR_INDEX (iterator) = i;
|
|
DICT_ITERATOR_CURRENT (iterator) = sym;
|
|
return sym;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_first_hashed (const struct dictionary *dict, const char *name,
|
|
symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
unsigned int hash_index = dict_hash (name) % DICT_HASHED_NBUCKETS (dict);
|
|
struct symbol *sym;
|
|
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
|
|
/* Loop through the symbols in the given bucket, breaking when SYM
|
|
first matches. If SYM never matches, it will be set to NULL;
|
|
either way, we have the right return value. */
|
|
|
|
for (sym = DICT_HASHED_BUCKET (dict, hash_index);
|
|
sym != NULL;
|
|
sym = sym->hash_next)
|
|
{
|
|
/* Warning: the order of arguments to compare matters! */
|
|
if (compare (SYMBOL_SEARCH_NAME (sym), name) == 0)
|
|
{
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
DICT_ITERATOR_CURRENT (iterator) = sym;
|
|
return sym;
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_next_hashed (const char *name, symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
struct symbol *next;
|
|
|
|
for (next = DICT_ITERATOR_CURRENT (iterator)->hash_next;
|
|
next != NULL;
|
|
next = next->hash_next)
|
|
{
|
|
if (compare (SYMBOL_SEARCH_NAME (next), name) == 0)
|
|
break;
|
|
}
|
|
|
|
DICT_ITERATOR_CURRENT (iterator) = next;
|
|
|
|
return next;
|
|
}
|
|
|
|
/* Insert SYM into DICT. */
|
|
|
|
static void
|
|
insert_symbol_hashed (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
unsigned int hash_index;
|
|
struct symbol **buckets = DICT_HASHED_BUCKETS (dict);
|
|
|
|
hash_index =
|
|
dict_hash (SYMBOL_SEARCH_NAME (sym)) % DICT_HASHED_NBUCKETS (dict);
|
|
sym->hash_next = buckets[hash_index];
|
|
buckets[hash_index] = sym;
|
|
}
|
|
|
|
static int
|
|
size_hashed (const struct dictionary *dict)
|
|
{
|
|
return DICT_HASHED_NBUCKETS (dict);
|
|
}
|
|
|
|
/* Functions only for DICT_HASHED_EXPANDABLE. */
|
|
|
|
static void
|
|
free_hashed_expandable (struct dictionary *dict)
|
|
{
|
|
xfree (DICT_HASHED_BUCKETS (dict));
|
|
xfree (dict);
|
|
}
|
|
|
|
static void
|
|
add_symbol_hashed_expandable (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
int nsyms = ++DICT_HASHED_EXPANDABLE_NSYMS (dict);
|
|
|
|
if (DICT_HASHTABLE_SIZE (nsyms) > DICT_HASHED_NBUCKETS (dict))
|
|
expand_hashtable (dict);
|
|
|
|
insert_symbol_hashed (dict, sym);
|
|
DICT_HASHED_EXPANDABLE_NSYMS (dict) = nsyms;
|
|
}
|
|
|
|
static int
|
|
size_hashed_expandable (const struct dictionary *dict)
|
|
{
|
|
return DICT_HASHED_EXPANDABLE_NSYMS (dict);
|
|
}
|
|
|
|
static void
|
|
expand_hashtable (struct dictionary *dict)
|
|
{
|
|
int old_nbuckets = DICT_HASHED_NBUCKETS (dict);
|
|
struct symbol **old_buckets = DICT_HASHED_BUCKETS (dict);
|
|
int new_nbuckets = 2 * old_nbuckets + 1;
|
|
struct symbol **new_buckets = XCNEWVEC (struct symbol *, new_nbuckets);
|
|
int i;
|
|
|
|
DICT_HASHED_NBUCKETS (dict) = new_nbuckets;
|
|
DICT_HASHED_BUCKETS (dict) = new_buckets;
|
|
|
|
for (i = 0; i < old_nbuckets; ++i)
|
|
{
|
|
struct symbol *sym, *next_sym;
|
|
|
|
sym = old_buckets[i];
|
|
if (sym != NULL)
|
|
{
|
|
for (next_sym = sym->hash_next;
|
|
next_sym != NULL;
|
|
next_sym = sym->hash_next)
|
|
{
|
|
insert_symbol_hashed (dict, sym);
|
|
sym = next_sym;
|
|
}
|
|
|
|
insert_symbol_hashed (dict, sym);
|
|
}
|
|
}
|
|
|
|
xfree (old_buckets);
|
|
}
|
|
|
|
/* Produce an unsigned hash value from STRING0 that is consistent
|
|
with strcmp_iw, strcmp, and, at least on Ada symbols, wild_match.
|
|
That is, two identifiers equivalent according to any of those three
|
|
comparison operators hash to the same value. */
|
|
|
|
static unsigned int
|
|
dict_hash (const char *string0)
|
|
{
|
|
/* The Ada-encoded version of a name P1.P2...Pn has either the form
|
|
P1__P2__...Pn<suffix> or _ada_P1__P2__...Pn<suffix> (where the Pi
|
|
are lower-cased identifiers). The <suffix> (which can be empty)
|
|
encodes additional information about the denoted entity. This
|
|
routine hashes such names to msymbol_hash_iw(Pn). It actually
|
|
does this for a superset of both valid Pi and of <suffix>, but
|
|
in other cases it simply returns msymbol_hash_iw(STRING0). */
|
|
|
|
const char *string;
|
|
unsigned int hash;
|
|
|
|
string = string0;
|
|
if (*string == '_')
|
|
{
|
|
if (startswith (string, "_ada_"))
|
|
string += 5;
|
|
else
|
|
return msymbol_hash_iw (string0);
|
|
}
|
|
|
|
hash = 0;
|
|
while (*string)
|
|
{
|
|
/* Ignore "TKB" suffixes.
|
|
|
|
These are used by Ada for subprograms implementing a task body.
|
|
For instance for a task T inside package Pck, the name of the
|
|
subprogram implementing T's body is `pck__tTKB'. We need to
|
|
ignore the "TKB" suffix because searches for this task body
|
|
subprogram are going to be performed using `pck__t' (the encoded
|
|
version of the natural name `pck.t'). */
|
|
if (strcmp (string, "TKB") == 0)
|
|
return hash;
|
|
|
|
switch (*string)
|
|
{
|
|
case '$':
|
|
case '.':
|
|
case 'X':
|
|
if (string0 == string)
|
|
return msymbol_hash_iw (string0);
|
|
else
|
|
return hash;
|
|
case ' ':
|
|
case '(':
|
|
return msymbol_hash_iw (string0);
|
|
case '_':
|
|
if (string[1] == '_' && string != string0)
|
|
{
|
|
int c = string[2];
|
|
|
|
if ((c < 'a' || c > 'z') && c != 'O')
|
|
return hash;
|
|
hash = 0;
|
|
string += 2;
|
|
break;
|
|
}
|
|
/* FALL THROUGH */
|
|
default:
|
|
hash = SYMBOL_HASH_NEXT (hash, *string);
|
|
string += 1;
|
|
break;
|
|
}
|
|
}
|
|
return hash;
|
|
}
|
|
|
|
/* Functions for DICT_LINEAR and DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static struct symbol *
|
|
iterator_first_linear (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = 0;
|
|
return DICT_LINEAR_NSYMS (dict) ? DICT_LINEAR_SYM (dict, 0) : NULL;
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_next_linear (struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
|
|
if (++DICT_ITERATOR_INDEX (iterator) >= DICT_LINEAR_NSYMS (dict))
|
|
return NULL;
|
|
else
|
|
return DICT_LINEAR_SYM (dict, DICT_ITERATOR_INDEX (iterator));
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_first_linear (const struct dictionary *dict,
|
|
const char *name, symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = -1;
|
|
|
|
return iter_match_next_linear (name, compare, iterator);
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_next_linear (const char *name, symbol_compare_ftype *compare,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
int i, nsyms = DICT_LINEAR_NSYMS (dict);
|
|
struct symbol *sym, *retval = NULL;
|
|
|
|
for (i = DICT_ITERATOR_INDEX (iterator) + 1; i < nsyms; ++i)
|
|
{
|
|
sym = DICT_LINEAR_SYM (dict, i);
|
|
if (compare (SYMBOL_SEARCH_NAME (sym), name) == 0)
|
|
{
|
|
retval = sym;
|
|
break;
|
|
}
|
|
}
|
|
|
|
DICT_ITERATOR_INDEX (iterator) = i;
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int
|
|
size_linear (const struct dictionary *dict)
|
|
{
|
|
return DICT_LINEAR_NSYMS (dict);
|
|
}
|
|
|
|
/* Functions only for DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static void
|
|
free_linear_expandable (struct dictionary *dict)
|
|
{
|
|
xfree (DICT_LINEAR_SYMS (dict));
|
|
xfree (dict);
|
|
}
|
|
|
|
|
|
static void
|
|
add_symbol_linear_expandable (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
int nsyms = ++DICT_LINEAR_NSYMS (dict);
|
|
|
|
/* Do we have enough room? If not, grow it. */
|
|
if (nsyms > DICT_LINEAR_EXPANDABLE_CAPACITY (dict))
|
|
{
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (dict) *= 2;
|
|
DICT_LINEAR_SYMS (dict)
|
|
= XRESIZEVEC (struct symbol *, DICT_LINEAR_SYMS (dict),
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (dict));
|
|
}
|
|
|
|
DICT_LINEAR_SYM (dict, nsyms - 1) = sym;
|
|
}
|