mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +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.
1792 lines
53 KiB
C
1792 lines
53 KiB
C
/* Support routines for building symbol tables in GDB's internal format.
|
||
Copyright (C) 1986-2015 Free Software Foundation, 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/>. */
|
||
|
||
/* This module provides subroutines used for creating and adding to
|
||
the symbol table. These routines are called from various symbol-
|
||
file-reading routines.
|
||
|
||
Routines to support specific debugging information formats (stabs,
|
||
DWARF, etc) belong somewhere else.
|
||
|
||
The basic way this module is used is as follows:
|
||
|
||
buildsym_init ();
|
||
cleanups = make_cleanup (really_free_pendings, NULL);
|
||
cust = start_symtab (...);
|
||
... read debug info ...
|
||
cust = end_symtab (...);
|
||
do_cleanups (cleanups);
|
||
|
||
The compunit symtab pointer ("cust") is returned from both start_symtab
|
||
and end_symtab to simplify the debug info readers.
|
||
|
||
There are minor variations on this, e.g., dwarf2read.c splits end_symtab
|
||
into two calls: end_symtab_get_static_block, end_symtab_from_static_block,
|
||
but all debug info readers follow this basic flow.
|
||
|
||
Reading DWARF Type Units is another variation:
|
||
|
||
buildsym_init ();
|
||
cleanups = make_cleanup (really_free_pendings, NULL);
|
||
cust = start_symtab (...);
|
||
... read debug info ...
|
||
cust = end_expandable_symtab (...);
|
||
do_cleanups (cleanups);
|
||
|
||
And then reading subsequent Type Units within the containing "Comp Unit"
|
||
will use a second flow:
|
||
|
||
buildsym_init ();
|
||
cleanups = make_cleanup (really_free_pendings, NULL);
|
||
cust = restart_symtab (...);
|
||
... read debug info ...
|
||
cust = augment_type_symtab (...);
|
||
do_cleanups (cleanups);
|
||
|
||
dbxread.c and xcoffread.c use another variation:
|
||
|
||
buildsym_init ();
|
||
cleanups = make_cleanup (really_free_pendings, NULL);
|
||
cust = start_symtab (...);
|
||
... read debug info ...
|
||
cust = end_symtab (...);
|
||
... start_symtab + read + end_symtab repeated ...
|
||
do_cleanups (cleanups);
|
||
*/
|
||
|
||
#include "defs.h"
|
||
#include "bfd.h"
|
||
#include "gdb_obstack.h"
|
||
#include "symtab.h"
|
||
#include "symfile.h"
|
||
#include "objfiles.h"
|
||
#include "gdbtypes.h"
|
||
#include "complaints.h"
|
||
#include "expression.h" /* For "enum exp_opcode" used by... */
|
||
#include "bcache.h"
|
||
#include "filenames.h" /* For DOSish file names. */
|
||
#include "macrotab.h"
|
||
#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */
|
||
#include "block.h"
|
||
#include "cp-support.h"
|
||
#include "dictionary.h"
|
||
#include "addrmap.h"
|
||
|
||
/* Ask buildsym.h to define the vars it normally declares `extern'. */
|
||
#define EXTERN
|
||
/**/
|
||
#include "buildsym.h" /* Our own declarations. */
|
||
#undef EXTERN
|
||
|
||
/* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat
|
||
questionable--see comment where we call them). */
|
||
|
||
#include "stabsread.h"
|
||
|
||
/* Buildsym's counterpart to struct compunit_symtab.
|
||
TODO(dje): Move all related global state into here. */
|
||
|
||
struct buildsym_compunit
|
||
{
|
||
/* The objfile we're reading debug info from. */
|
||
struct objfile *objfile;
|
||
|
||
/* List of subfiles (source files).
|
||
Files are added to the front of the list.
|
||
This is important mostly for the language determination hacks we use,
|
||
which iterate over previously added files. */
|
||
struct subfile *subfiles;
|
||
|
||
/* The subfile of the main source file. */
|
||
struct subfile *main_subfile;
|
||
|
||
/* E.g., DW_AT_comp_dir if DWARF. Space for this is malloc'd. */
|
||
char *comp_dir;
|
||
|
||
/* Space for this is not malloc'd, and is assumed to have at least
|
||
the same lifetime as objfile. */
|
||
const char *producer;
|
||
|
||
/* Space for this is not malloc'd, and is assumed to have at least
|
||
the same lifetime as objfile. */
|
||
const char *debugformat;
|
||
|
||
/* The compunit we are building. */
|
||
struct compunit_symtab *compunit_symtab;
|
||
};
|
||
|
||
/* The work-in-progress of the compunit we are building.
|
||
This is created first, before any subfiles by start_symtab. */
|
||
|
||
static struct buildsym_compunit *buildsym_compunit;
|
||
|
||
/* List of free `struct pending' structures for reuse. */
|
||
|
||
static struct pending *free_pendings;
|
||
|
||
/* Non-zero if symtab has line number info. This prevents an
|
||
otherwise empty symtab from being tossed. */
|
||
|
||
static int have_line_numbers;
|
||
|
||
/* The mutable address map for the compilation unit whose symbols
|
||
we're currently reading. The symtabs' shared blockvector will
|
||
point to a fixed copy of this. */
|
||
static struct addrmap *pending_addrmap;
|
||
|
||
/* The obstack on which we allocate pending_addrmap.
|
||
If pending_addrmap is NULL, this is uninitialized; otherwise, it is
|
||
initialized (and holds pending_addrmap). */
|
||
static struct obstack pending_addrmap_obstack;
|
||
|
||
/* Non-zero if we recorded any ranges in the addrmap that are
|
||
different from those in the blockvector already. We set this to
|
||
zero when we start processing a symfile, and if it's still zero at
|
||
the end, then we just toss the addrmap. */
|
||
static int pending_addrmap_interesting;
|
||
|
||
/* An obstack used for allocating pending blocks. */
|
||
|
||
static struct obstack pending_block_obstack;
|
||
|
||
/* List of blocks already made (lexical contexts already closed).
|
||
This is used at the end to make the blockvector. */
|
||
|
||
struct pending_block
|
||
{
|
||
struct pending_block *next;
|
||
struct block *block;
|
||
};
|
||
|
||
/* Pointer to the head of a linked list of symbol blocks which have
|
||
already been finalized (lexical contexts already closed) and which
|
||
are just waiting to be built into a blockvector when finalizing the
|
||
associated symtab. */
|
||
|
||
static struct pending_block *pending_blocks;
|
||
|
||
struct subfile_stack
|
||
{
|
||
struct subfile_stack *next;
|
||
char *name;
|
||
};
|
||
|
||
static struct subfile_stack *subfile_stack;
|
||
|
||
/* The macro table for the compilation unit whose symbols we're
|
||
currently reading. */
|
||
static struct macro_table *pending_macros;
|
||
|
||
static void free_buildsym_compunit (void);
|
||
|
||
static int compare_line_numbers (const void *ln1p, const void *ln2p);
|
||
|
||
static void record_pending_block (struct objfile *objfile,
|
||
struct block *block,
|
||
struct pending_block *opblock);
|
||
|
||
/* Initial sizes of data structures. These are realloc'd larger if
|
||
needed, and realloc'd down to the size actually used, when
|
||
completed. */
|
||
|
||
#define INITIAL_CONTEXT_STACK_SIZE 10
|
||
#define INITIAL_LINE_VECTOR_LENGTH 1000
|
||
|
||
|
||
/* Maintain the lists of symbols and blocks. */
|
||
|
||
/* Add a symbol to one of the lists of symbols. */
|
||
|
||
void
|
||
add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
|
||
{
|
||
struct pending *link;
|
||
|
||
/* If this is an alias for another symbol, don't add it. */
|
||
if (symbol->ginfo.name && symbol->ginfo.name[0] == '#')
|
||
return;
|
||
|
||
/* We keep PENDINGSIZE symbols in each link of the list. If we
|
||
don't have a link with room in it, add a new link. */
|
||
if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE)
|
||
{
|
||
if (free_pendings)
|
||
{
|
||
link = free_pendings;
|
||
free_pendings = link->next;
|
||
}
|
||
else
|
||
{
|
||
link = XNEW (struct pending);
|
||
}
|
||
|
||
link->next = *listhead;
|
||
*listhead = link;
|
||
link->nsyms = 0;
|
||
}
|
||
|
||
(*listhead)->symbol[(*listhead)->nsyms++] = symbol;
|
||
}
|
||
|
||
/* Find a symbol named NAME on a LIST. NAME need not be
|
||
'\0'-terminated; LENGTH is the length of the name. */
|
||
|
||
struct symbol *
|
||
find_symbol_in_list (struct pending *list, char *name, int length)
|
||
{
|
||
int j;
|
||
const char *pp;
|
||
|
||
while (list != NULL)
|
||
{
|
||
for (j = list->nsyms; --j >= 0;)
|
||
{
|
||
pp = SYMBOL_LINKAGE_NAME (list->symbol[j]);
|
||
if (*pp == *name && strncmp (pp, name, length) == 0
|
||
&& pp[length] == '\0')
|
||
{
|
||
return (list->symbol[j]);
|
||
}
|
||
}
|
||
list = list->next;
|
||
}
|
||
return (NULL);
|
||
}
|
||
|
||
/* At end of reading syms, or in case of quit, ensure everything associated
|
||
with building symtabs is freed. This is intended to be registered as a
|
||
cleanup before doing psymtab->symtab expansion.
|
||
|
||
N.B. This is *not* intended to be used when building psymtabs. Some debug
|
||
info readers call this anyway, which is harmless if confusing. */
|
||
|
||
void
|
||
really_free_pendings (void *dummy)
|
||
{
|
||
struct pending *next, *next1;
|
||
|
||
for (next = free_pendings; next; next = next1)
|
||
{
|
||
next1 = next->next;
|
||
xfree ((void *) next);
|
||
}
|
||
free_pendings = NULL;
|
||
|
||
free_pending_blocks ();
|
||
|
||
for (next = file_symbols; next != NULL; next = next1)
|
||
{
|
||
next1 = next->next;
|
||
xfree ((void *) next);
|
||
}
|
||
file_symbols = NULL;
|
||
|
||
for (next = global_symbols; next != NULL; next = next1)
|
||
{
|
||
next1 = next->next;
|
||
xfree ((void *) next);
|
||
}
|
||
global_symbols = NULL;
|
||
|
||
if (pending_macros)
|
||
free_macro_table (pending_macros);
|
||
pending_macros = NULL;
|
||
|
||
if (pending_addrmap)
|
||
obstack_free (&pending_addrmap_obstack, NULL);
|
||
pending_addrmap = NULL;
|
||
|
||
free_buildsym_compunit ();
|
||
}
|
||
|
||
/* This function is called to discard any pending blocks. */
|
||
|
||
void
|
||
free_pending_blocks (void)
|
||
{
|
||
if (pending_blocks != NULL)
|
||
{
|
||
obstack_free (&pending_block_obstack, NULL);
|
||
pending_blocks = NULL;
|
||
}
|
||
}
|
||
|
||
/* Take one of the lists of symbols and make a block from it. Keep
|
||
the order the symbols have in the list (reversed from the input
|
||
file). Put the block on the list of pending blocks. */
|
||
|
||
static struct block *
|
||
finish_block_internal (struct symbol *symbol,
|
||
struct pending **listhead,
|
||
struct pending_block *old_blocks,
|
||
const struct dynamic_prop *static_link,
|
||
CORE_ADDR start, CORE_ADDR end,
|
||
int is_global, int expandable)
|
||
{
|
||
struct objfile *objfile = buildsym_compunit->objfile;
|
||
struct gdbarch *gdbarch = get_objfile_arch (objfile);
|
||
struct pending *next, *next1;
|
||
struct block *block;
|
||
struct pending_block *pblock;
|
||
struct pending_block *opblock;
|
||
|
||
block = (is_global
|
||
? allocate_global_block (&objfile->objfile_obstack)
|
||
: allocate_block (&objfile->objfile_obstack));
|
||
|
||
if (symbol)
|
||
{
|
||
BLOCK_DICT (block) = dict_create_linear (&objfile->objfile_obstack,
|
||
*listhead);
|
||
}
|
||
else
|
||
{
|
||
if (expandable)
|
||
{
|
||
BLOCK_DICT (block) = dict_create_hashed_expandable ();
|
||
dict_add_pending (BLOCK_DICT (block), *listhead);
|
||
}
|
||
else
|
||
{
|
||
BLOCK_DICT (block) =
|
||
dict_create_hashed (&objfile->objfile_obstack, *listhead);
|
||
}
|
||
}
|
||
|
||
BLOCK_START (block) = start;
|
||
BLOCK_END (block) = end;
|
||
|
||
/* Put the block in as the value of the symbol that names it. */
|
||
|
||
if (symbol)
|
||
{
|
||
struct type *ftype = SYMBOL_TYPE (symbol);
|
||
struct dict_iterator iter;
|
||
SYMBOL_BLOCK_VALUE (symbol) = block;
|
||
BLOCK_FUNCTION (block) = symbol;
|
||
|
||
if (TYPE_NFIELDS (ftype) <= 0)
|
||
{
|
||
/* No parameter type information is recorded with the
|
||
function's type. Set that from the type of the
|
||
parameter symbols. */
|
||
int nparams = 0, iparams;
|
||
struct symbol *sym;
|
||
|
||
/* Here we want to directly access the dictionary, because
|
||
we haven't fully initialized the block yet. */
|
||
ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
|
||
{
|
||
if (SYMBOL_IS_ARGUMENT (sym))
|
||
nparams++;
|
||
}
|
||
if (nparams > 0)
|
||
{
|
||
TYPE_NFIELDS (ftype) = nparams;
|
||
TYPE_FIELDS (ftype) = (struct field *)
|
||
TYPE_ALLOC (ftype, nparams * sizeof (struct field));
|
||
|
||
iparams = 0;
|
||
/* Here we want to directly access the dictionary, because
|
||
we haven't fully initialized the block yet. */
|
||
ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
|
||
{
|
||
if (iparams == nparams)
|
||
break;
|
||
|
||
if (SYMBOL_IS_ARGUMENT (sym))
|
||
{
|
||
TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
|
||
TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
|
||
iparams++;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
else
|
||
{
|
||
BLOCK_FUNCTION (block) = NULL;
|
||
}
|
||
|
||
if (static_link != NULL)
|
||
objfile_register_static_link (objfile, block, static_link);
|
||
|
||
/* Now "free" the links of the list, and empty the list. */
|
||
|
||
for (next = *listhead; next; next = next1)
|
||
{
|
||
next1 = next->next;
|
||
next->next = free_pendings;
|
||
free_pendings = next;
|
||
}
|
||
*listhead = NULL;
|
||
|
||
/* Check to be sure that the blocks have an end address that is
|
||
greater than starting address. */
|
||
|
||
if (BLOCK_END (block) < BLOCK_START (block))
|
||
{
|
||
if (symbol)
|
||
{
|
||
complaint (&symfile_complaints,
|
||
_("block end address less than block "
|
||
"start address in %s (patched it)"),
|
||
SYMBOL_PRINT_NAME (symbol));
|
||
}
|
||
else
|
||
{
|
||
complaint (&symfile_complaints,
|
||
_("block end address %s less than block "
|
||
"start address %s (patched it)"),
|
||
paddress (gdbarch, BLOCK_END (block)),
|
||
paddress (gdbarch, BLOCK_START (block)));
|
||
}
|
||
/* Better than nothing. */
|
||
BLOCK_END (block) = BLOCK_START (block);
|
||
}
|
||
|
||
/* Install this block as the superblock of all blocks made since the
|
||
start of this scope that don't have superblocks yet. */
|
||
|
||
opblock = NULL;
|
||
for (pblock = pending_blocks;
|
||
pblock && pblock != old_blocks;
|
||
pblock = pblock->next)
|
||
{
|
||
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
|
||
{
|
||
/* Check to be sure the blocks are nested as we receive
|
||
them. If the compiler/assembler/linker work, this just
|
||
burns a small amount of time.
|
||
|
||
Skip blocks which correspond to a function; they're not
|
||
physically nested inside this other blocks, only
|
||
lexically nested. */
|
||
if (BLOCK_FUNCTION (pblock->block) == NULL
|
||
&& (BLOCK_START (pblock->block) < BLOCK_START (block)
|
||
|| BLOCK_END (pblock->block) > BLOCK_END (block)))
|
||
{
|
||
if (symbol)
|
||
{
|
||
complaint (&symfile_complaints,
|
||
_("inner block not inside outer block in %s"),
|
||
SYMBOL_PRINT_NAME (symbol));
|
||
}
|
||
else
|
||
{
|
||
complaint (&symfile_complaints,
|
||
_("inner block (%s-%s) not "
|
||
"inside outer block (%s-%s)"),
|
||
paddress (gdbarch, BLOCK_START (pblock->block)),
|
||
paddress (gdbarch, BLOCK_END (pblock->block)),
|
||
paddress (gdbarch, BLOCK_START (block)),
|
||
paddress (gdbarch, BLOCK_END (block)));
|
||
}
|
||
if (BLOCK_START (pblock->block) < BLOCK_START (block))
|
||
BLOCK_START (pblock->block) = BLOCK_START (block);
|
||
if (BLOCK_END (pblock->block) > BLOCK_END (block))
|
||
BLOCK_END (pblock->block) = BLOCK_END (block);
|
||
}
|
||
BLOCK_SUPERBLOCK (pblock->block) = block;
|
||
}
|
||
opblock = pblock;
|
||
}
|
||
|
||
block_set_using (block,
|
||
(is_global
|
||
? global_using_directives
|
||
: local_using_directives),
|
||
&objfile->objfile_obstack);
|
||
if (is_global)
|
||
global_using_directives = NULL;
|
||
else
|
||
local_using_directives = NULL;
|
||
|
||
record_pending_block (objfile, block, opblock);
|
||
|
||
return block;
|
||
}
|
||
|
||
struct block *
|
||
finish_block (struct symbol *symbol,
|
||
struct pending **listhead,
|
||
struct pending_block *old_blocks,
|
||
const struct dynamic_prop *static_link,
|
||
CORE_ADDR start, CORE_ADDR end)
|
||
{
|
||
return finish_block_internal (symbol, listhead, old_blocks, static_link,
|
||
start, end, 0, 0);
|
||
}
|
||
|
||
/* Record BLOCK on the list of all blocks in the file. Put it after
|
||
OPBLOCK, or at the beginning if opblock is NULL. This puts the
|
||
block in the list after all its subblocks.
|
||
|
||
Allocate the pending block struct in the objfile_obstack to save
|
||
time. This wastes a little space. FIXME: Is it worth it? */
|
||
|
||
static void
|
||
record_pending_block (struct objfile *objfile, struct block *block,
|
||
struct pending_block *opblock)
|
||
{
|
||
struct pending_block *pblock;
|
||
|
||
if (pending_blocks == NULL)
|
||
obstack_init (&pending_block_obstack);
|
||
|
||
pblock = XOBNEW (&pending_block_obstack, struct pending_block);
|
||
pblock->block = block;
|
||
if (opblock)
|
||
{
|
||
pblock->next = opblock->next;
|
||
opblock->next = pblock;
|
||
}
|
||
else
|
||
{
|
||
pblock->next = pending_blocks;
|
||
pending_blocks = pblock;
|
||
}
|
||
}
|
||
|
||
|
||
/* Record that the range of addresses from START to END_INCLUSIVE
|
||
(inclusive, like it says) belongs to BLOCK. BLOCK's start and end
|
||
addresses must be set already. You must apply this function to all
|
||
BLOCK's children before applying it to BLOCK.
|
||
|
||
If a call to this function complicates the picture beyond that
|
||
already provided by BLOCK_START and BLOCK_END, then we create an
|
||
address map for the block. */
|
||
void
|
||
record_block_range (struct block *block,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive)
|
||
{
|
||
/* If this is any different from the range recorded in the block's
|
||
own BLOCK_START and BLOCK_END, then note that the address map has
|
||
become interesting. Note that even if this block doesn't have
|
||
any "interesting" ranges, some later block might, so we still
|
||
need to record this block in the addrmap. */
|
||
if (start != BLOCK_START (block)
|
||
|| end_inclusive + 1 != BLOCK_END (block))
|
||
pending_addrmap_interesting = 1;
|
||
|
||
if (! pending_addrmap)
|
||
{
|
||
obstack_init (&pending_addrmap_obstack);
|
||
pending_addrmap = addrmap_create_mutable (&pending_addrmap_obstack);
|
||
}
|
||
|
||
addrmap_set_empty (pending_addrmap, start, end_inclusive, block);
|
||
}
|
||
|
||
static struct blockvector *
|
||
make_blockvector (void)
|
||
{
|
||
struct objfile *objfile = buildsym_compunit->objfile;
|
||
struct pending_block *next;
|
||
struct blockvector *blockvector;
|
||
int i;
|
||
|
||
/* Count the length of the list of blocks. */
|
||
|
||
for (next = pending_blocks, i = 0; next; next = next->next, i++)
|
||
{;
|
||
}
|
||
|
||
blockvector = (struct blockvector *)
|
||
obstack_alloc (&objfile->objfile_obstack,
|
||
(sizeof (struct blockvector)
|
||
+ (i - 1) * sizeof (struct block *)));
|
||
|
||
/* Copy the blocks into the blockvector. This is done in reverse
|
||
order, which happens to put the blocks into the proper order
|
||
(ascending starting address). finish_block has hair to insert
|
||
each block into the list after its subblocks in order to make
|
||
sure this is true. */
|
||
|
||
BLOCKVECTOR_NBLOCKS (blockvector) = i;
|
||
for (next = pending_blocks; next; next = next->next)
|
||
{
|
||
BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
|
||
}
|
||
|
||
free_pending_blocks ();
|
||
|
||
/* If we needed an address map for this symtab, record it in the
|
||
blockvector. */
|
||
if (pending_addrmap && pending_addrmap_interesting)
|
||
BLOCKVECTOR_MAP (blockvector)
|
||
= addrmap_create_fixed (pending_addrmap, &objfile->objfile_obstack);
|
||
else
|
||
BLOCKVECTOR_MAP (blockvector) = 0;
|
||
|
||
/* Some compilers output blocks in the wrong order, but we depend on
|
||
their being in the right order so we can binary search. Check the
|
||
order and moan about it.
|
||
Note: Remember that the first two blocks are the global and static
|
||
blocks. We could special case that fact and begin checking at block 2.
|
||
To avoid making that assumption we do not. */
|
||
if (BLOCKVECTOR_NBLOCKS (blockvector) > 1)
|
||
{
|
||
for (i = 1; i < BLOCKVECTOR_NBLOCKS (blockvector); i++)
|
||
{
|
||
if (BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i - 1))
|
||
> BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i)))
|
||
{
|
||
CORE_ADDR start
|
||
= BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i));
|
||
|
||
complaint (&symfile_complaints, _("block at %s out of order"),
|
||
hex_string ((LONGEST) start));
|
||
}
|
||
}
|
||
}
|
||
|
||
return (blockvector);
|
||
}
|
||
|
||
/* Start recording information about source code that came from an
|
||
included (or otherwise merged-in) source file with a different
|
||
name. NAME is the name of the file (cannot be NULL). */
|
||
|
||
void
|
||
start_subfile (const char *name)
|
||
{
|
||
const char *subfile_dirname;
|
||
struct subfile *subfile;
|
||
|
||
gdb_assert (buildsym_compunit != NULL);
|
||
|
||
subfile_dirname = buildsym_compunit->comp_dir;
|
||
|
||
/* See if this subfile is already registered. */
|
||
|
||
for (subfile = buildsym_compunit->subfiles; subfile; subfile = subfile->next)
|
||
{
|
||
char *subfile_name;
|
||
|
||
/* If NAME is an absolute path, and this subfile is not, then
|
||
attempt to create an absolute path to compare. */
|
||
if (IS_ABSOLUTE_PATH (name)
|
||
&& !IS_ABSOLUTE_PATH (subfile->name)
|
||
&& subfile_dirname != NULL)
|
||
subfile_name = concat (subfile_dirname, SLASH_STRING,
|
||
subfile->name, (char *) NULL);
|
||
else
|
||
subfile_name = subfile->name;
|
||
|
||
if (FILENAME_CMP (subfile_name, name) == 0)
|
||
{
|
||
current_subfile = subfile;
|
||
if (subfile_name != subfile->name)
|
||
xfree (subfile_name);
|
||
return;
|
||
}
|
||
if (subfile_name != subfile->name)
|
||
xfree (subfile_name);
|
||
}
|
||
|
||
/* This subfile is not known. Add an entry for it. */
|
||
|
||
subfile = XNEW (struct subfile);
|
||
memset (subfile, 0, sizeof (struct subfile));
|
||
subfile->buildsym_compunit = buildsym_compunit;
|
||
|
||
subfile->next = buildsym_compunit->subfiles;
|
||
buildsym_compunit->subfiles = subfile;
|
||
|
||
current_subfile = subfile;
|
||
|
||
subfile->name = xstrdup (name);
|
||
|
||
/* Initialize line-number recording for this subfile. */
|
||
subfile->line_vector = NULL;
|
||
|
||
/* Default the source language to whatever can be deduced from the
|
||
filename. If nothing can be deduced (such as for a C/C++ include
|
||
file with a ".h" extension), then inherit whatever language the
|
||
previous subfile had. This kludgery is necessary because there
|
||
is no standard way in some object formats to record the source
|
||
language. Also, when symtabs are allocated we try to deduce a
|
||
language then as well, but it is too late for us to use that
|
||
information while reading symbols, since symtabs aren't allocated
|
||
until after all the symbols have been processed for a given
|
||
source file. */
|
||
|
||
subfile->language = deduce_language_from_filename (subfile->name);
|
||
if (subfile->language == language_unknown
|
||
&& subfile->next != NULL)
|
||
{
|
||
subfile->language = subfile->next->language;
|
||
}
|
||
|
||
/* If the filename of this subfile ends in .C, then change the
|
||
language of any pending subfiles from C to C++. We also accept
|
||
any other C++ suffixes accepted by deduce_language_from_filename. */
|
||
/* Likewise for f2c. */
|
||
|
||
if (subfile->name)
|
||
{
|
||
struct subfile *s;
|
||
enum language sublang = deduce_language_from_filename (subfile->name);
|
||
|
||
if (sublang == language_cplus || sublang == language_fortran)
|
||
for (s = buildsym_compunit->subfiles; s != NULL; s = s->next)
|
||
if (s->language == language_c)
|
||
s->language = sublang;
|
||
}
|
||
|
||
/* And patch up this file if necessary. */
|
||
if (subfile->language == language_c
|
||
&& subfile->next != NULL
|
||
&& (subfile->next->language == language_cplus
|
||
|| subfile->next->language == language_fortran))
|
||
{
|
||
subfile->language = subfile->next->language;
|
||
}
|
||
}
|
||
|
||
/* Start recording information about a primary source file (IOW, not an
|
||
included source file).
|
||
COMP_DIR is the directory in which the compilation unit was compiled
|
||
(or NULL if not known). */
|
||
|
||
static struct buildsym_compunit *
|
||
start_buildsym_compunit (struct objfile *objfile, const char *comp_dir)
|
||
{
|
||
struct buildsym_compunit *bscu;
|
||
|
||
bscu = XNEW (struct buildsym_compunit);
|
||
memset (bscu, 0, sizeof (struct buildsym_compunit));
|
||
|
||
bscu->objfile = objfile;
|
||
bscu->comp_dir = (comp_dir == NULL) ? NULL : xstrdup (comp_dir);
|
||
|
||
/* Initialize the debug format string to NULL. We may supply it
|
||
later via a call to record_debugformat. */
|
||
bscu->debugformat = NULL;
|
||
|
||
/* Similarly for the producer. */
|
||
bscu->producer = NULL;
|
||
|
||
return bscu;
|
||
}
|
||
|
||
/* Delete the buildsym compunit. */
|
||
|
||
static void
|
||
free_buildsym_compunit (void)
|
||
{
|
||
struct subfile *subfile, *nextsub;
|
||
|
||
if (buildsym_compunit == NULL)
|
||
return;
|
||
for (subfile = buildsym_compunit->subfiles;
|
||
subfile != NULL;
|
||
subfile = nextsub)
|
||
{
|
||
nextsub = subfile->next;
|
||
xfree (subfile->name);
|
||
xfree (subfile->line_vector);
|
||
xfree (subfile);
|
||
}
|
||
xfree (buildsym_compunit->comp_dir);
|
||
xfree (buildsym_compunit);
|
||
buildsym_compunit = NULL;
|
||
current_subfile = NULL;
|
||
}
|
||
|
||
/* For stabs readers, the first N_SO symbol is assumed to be the
|
||
source file name, and the subfile struct is initialized using that
|
||
assumption. If another N_SO symbol is later seen, immediately
|
||
following the first one, then the first one is assumed to be the
|
||
directory name and the second one is really the source file name.
|
||
|
||
So we have to patch up the subfile struct by moving the old name
|
||
value to dirname and remembering the new name. Some sanity
|
||
checking is performed to ensure that the state of the subfile
|
||
struct is reasonable and that the old name we are assuming to be a
|
||
directory name actually is (by checking for a trailing '/'). */
|
||
|
||
void
|
||
patch_subfile_names (struct subfile *subfile, char *name)
|
||
{
|
||
if (subfile != NULL
|
||
&& buildsym_compunit->comp_dir == NULL
|
||
&& subfile->name != NULL
|
||
&& IS_DIR_SEPARATOR (subfile->name[strlen (subfile->name) - 1]))
|
||
{
|
||
buildsym_compunit->comp_dir = subfile->name;
|
||
subfile->name = xstrdup (name);
|
||
set_last_source_file (name);
|
||
|
||
/* Default the source language to whatever can be deduced from
|
||
the filename. If nothing can be deduced (such as for a C/C++
|
||
include file with a ".h" extension), then inherit whatever
|
||
language the previous subfile had. This kludgery is
|
||
necessary because there is no standard way in some object
|
||
formats to record the source language. Also, when symtabs
|
||
are allocated we try to deduce a language then as well, but
|
||
it is too late for us to use that information while reading
|
||
symbols, since symtabs aren't allocated until after all the
|
||
symbols have been processed for a given source file. */
|
||
|
||
subfile->language = deduce_language_from_filename (subfile->name);
|
||
if (subfile->language == language_unknown
|
||
&& subfile->next != NULL)
|
||
{
|
||
subfile->language = subfile->next->language;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Handle the N_BINCL and N_EINCL symbol types that act like N_SOL for
|
||
switching source files (different subfiles, as we call them) within
|
||
one object file, but using a stack rather than in an arbitrary
|
||
order. */
|
||
|
||
void
|
||
push_subfile (void)
|
||
{
|
||
struct subfile_stack *tem = XNEW (struct subfile_stack);
|
||
|
||
tem->next = subfile_stack;
|
||
subfile_stack = tem;
|
||
if (current_subfile == NULL || current_subfile->name == NULL)
|
||
{
|
||
internal_error (__FILE__, __LINE__,
|
||
_("failed internal consistency check"));
|
||
}
|
||
tem->name = current_subfile->name;
|
||
}
|
||
|
||
char *
|
||
pop_subfile (void)
|
||
{
|
||
char *name;
|
||
struct subfile_stack *link = subfile_stack;
|
||
|
||
if (link == NULL)
|
||
{
|
||
internal_error (__FILE__, __LINE__,
|
||
_("failed internal consistency check"));
|
||
}
|
||
name = link->name;
|
||
subfile_stack = link->next;
|
||
xfree ((void *) link);
|
||
return (name);
|
||
}
|
||
|
||
/* Add a linetable entry for line number LINE and address PC to the
|
||
line vector for SUBFILE. */
|
||
|
||
void
|
||
record_line (struct subfile *subfile, int line, CORE_ADDR pc)
|
||
{
|
||
struct linetable_entry *e;
|
||
|
||
/* Ignore the dummy line number in libg.o */
|
||
if (line == 0xffff)
|
||
{
|
||
return;
|
||
}
|
||
|
||
/* Make sure line vector exists and is big enough. */
|
||
if (!subfile->line_vector)
|
||
{
|
||
subfile->line_vector_length = INITIAL_LINE_VECTOR_LENGTH;
|
||
subfile->line_vector = (struct linetable *)
|
||
xmalloc (sizeof (struct linetable)
|
||
+ subfile->line_vector_length * sizeof (struct linetable_entry));
|
||
subfile->line_vector->nitems = 0;
|
||
have_line_numbers = 1;
|
||
}
|
||
|
||
if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
|
||
{
|
||
subfile->line_vector_length *= 2;
|
||
subfile->line_vector = (struct linetable *)
|
||
xrealloc ((char *) subfile->line_vector,
|
||
(sizeof (struct linetable)
|
||
+ (subfile->line_vector_length
|
||
* sizeof (struct linetable_entry))));
|
||
}
|
||
|
||
/* Normally, we treat lines as unsorted. But the end of sequence
|
||
marker is special. We sort line markers at the same PC by line
|
||
number, so end of sequence markers (which have line == 0) appear
|
||
first. This is right if the marker ends the previous function,
|
||
and there is no padding before the next function. But it is
|
||
wrong if the previous line was empty and we are now marking a
|
||
switch to a different subfile. We must leave the end of sequence
|
||
marker at the end of this group of lines, not sort the empty line
|
||
to after the marker. The easiest way to accomplish this is to
|
||
delete any empty lines from our table, if they are followed by
|
||
end of sequence markers. All we lose is the ability to set
|
||
breakpoints at some lines which contain no instructions
|
||
anyway. */
|
||
if (line == 0 && subfile->line_vector->nitems > 0)
|
||
{
|
||
e = subfile->line_vector->item + subfile->line_vector->nitems - 1;
|
||
while (subfile->line_vector->nitems > 0 && e->pc == pc)
|
||
{
|
||
e--;
|
||
subfile->line_vector->nitems--;
|
||
}
|
||
}
|
||
|
||
e = subfile->line_vector->item + subfile->line_vector->nitems++;
|
||
e->line = line;
|
||
e->pc = pc;
|
||
}
|
||
|
||
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
|
||
|
||
static int
|
||
compare_line_numbers (const void *ln1p, const void *ln2p)
|
||
{
|
||
struct linetable_entry *ln1 = (struct linetable_entry *) ln1p;
|
||
struct linetable_entry *ln2 = (struct linetable_entry *) ln2p;
|
||
|
||
/* Note: this code does not assume that CORE_ADDRs can fit in ints.
|
||
Please keep it that way. */
|
||
if (ln1->pc < ln2->pc)
|
||
return -1;
|
||
|
||
if (ln1->pc > ln2->pc)
|
||
return 1;
|
||
|
||
/* If pc equal, sort by line. I'm not sure whether this is optimum
|
||
behavior (see comment at struct linetable in symtab.h). */
|
||
return ln1->line - ln2->line;
|
||
}
|
||
|
||
/* See buildsym.h. */
|
||
|
||
struct compunit_symtab *
|
||
buildsym_compunit_symtab (void)
|
||
{
|
||
gdb_assert (buildsym_compunit != NULL);
|
||
|
||
return buildsym_compunit->compunit_symtab;
|
||
}
|
||
|
||
/* See buildsym.h. */
|
||
|
||
struct macro_table *
|
||
get_macro_table (void)
|
||
{
|
||
struct objfile *objfile;
|
||
|
||
gdb_assert (buildsym_compunit != NULL);
|
||
|
||
objfile = buildsym_compunit->objfile;
|
||
|
||
if (! pending_macros)
|
||
{
|
||
pending_macros = new_macro_table (&objfile->per_bfd->storage_obstack,
|
||
objfile->per_bfd->macro_cache,
|
||
buildsym_compunit->compunit_symtab);
|
||
}
|
||
|
||
return pending_macros;
|
||
}
|
||
|
||
/* Init state to prepare for building a symtab.
|
||
Note: This can't be done in buildsym_init because dbxread.c and xcoffread.c
|
||
can call start_symtab+end_symtab multiple times after one call to
|
||
buildsym_init. */
|
||
|
||
static void
|
||
prepare_for_building (const char *name, CORE_ADDR start_addr)
|
||
{
|
||
set_last_source_file (name);
|
||
last_source_start_addr = start_addr;
|
||
|
||
local_symbols = NULL;
|
||
local_using_directives = NULL;
|
||
within_function = 0;
|
||
have_line_numbers = 0;
|
||
|
||
context_stack_depth = 0;
|
||
|
||
/* These should have been reset either by successful completion of building
|
||
a symtab, or by the really_free_pendings cleanup. */
|
||
gdb_assert (file_symbols == NULL);
|
||
gdb_assert (global_symbols == NULL);
|
||
gdb_assert (global_using_directives == NULL);
|
||
gdb_assert (pending_macros == NULL);
|
||
gdb_assert (pending_addrmap == NULL);
|
||
gdb_assert (current_subfile == NULL);
|
||
}
|
||
|
||
/* Start a new symtab for a new source file in OBJFILE. Called, for example,
|
||
when a stabs symbol of type N_SO is seen, or when a DWARF
|
||
TAG_compile_unit DIE is seen. It indicates the start of data for
|
||
one original source file.
|
||
|
||
NAME is the name of the file (cannot be NULL). COMP_DIR is the directory in
|
||
which the file was compiled (or NULL if not known). START_ADDR is the
|
||
lowest address of objects in the file (or 0 if not known). */
|
||
|
||
struct compunit_symtab *
|
||
start_symtab (struct objfile *objfile, const char *name, const char *comp_dir,
|
||
CORE_ADDR start_addr)
|
||
{
|
||
prepare_for_building (name, start_addr);
|
||
|
||
buildsym_compunit = start_buildsym_compunit (objfile, comp_dir);
|
||
|
||
/* Allocate the compunit symtab now. The caller needs it to allocate
|
||
non-primary symtabs. It is also needed by get_macro_table. */
|
||
buildsym_compunit->compunit_symtab = allocate_compunit_symtab (objfile,
|
||
name);
|
||
|
||
/* Build the subfile for NAME (the main source file) so that we can record
|
||
a pointer to it for later.
|
||
IMPORTANT: Do not allocate a struct symtab for NAME here.
|
||
It can happen that the debug info provides a different path to NAME than
|
||
DIRNAME,NAME. We cope with this in watch_main_source_file_lossage but
|
||
that only works if the main_subfile doesn't have a symtab yet. */
|
||
start_subfile (name);
|
||
/* Save this so that we don't have to go looking for it at the end
|
||
of the subfiles list. */
|
||
buildsym_compunit->main_subfile = current_subfile;
|
||
|
||
return buildsym_compunit->compunit_symtab;
|
||
}
|
||
|
||
/* Restart compilation for a symtab.
|
||
CUST is the result of end_expandable_symtab.
|
||
NAME, START_ADDR are the source file we are resuming with.
|
||
|
||
This is used when a symtab is built from multiple sources.
|
||
The symtab is first built with start_symtab/end_expandable_symtab
|
||
and then for each additional piece call restart_symtab/augment_*_symtab.
|
||
Note: At the moment there is only augment_type_symtab. */
|
||
|
||
void
|
||
restart_symtab (struct compunit_symtab *cust,
|
||
const char *name, CORE_ADDR start_addr)
|
||
{
|
||
prepare_for_building (name, start_addr);
|
||
|
||
buildsym_compunit = start_buildsym_compunit (COMPUNIT_OBJFILE (cust),
|
||
COMPUNIT_DIRNAME (cust));
|
||
buildsym_compunit->compunit_symtab = cust;
|
||
}
|
||
|
||
/* Subroutine of end_symtab to simplify it. Look for a subfile that
|
||
matches the main source file's basename. If there is only one, and
|
||
if the main source file doesn't have any symbol or line number
|
||
information, then copy this file's symtab and line_vector to the
|
||
main source file's subfile and discard the other subfile. This can
|
||
happen because of a compiler bug or from the user playing games
|
||
with #line or from things like a distributed build system that
|
||
manipulates the debug info. This can also happen from an innocent
|
||
symlink in the paths, we don't canonicalize paths here. */
|
||
|
||
static void
|
||
watch_main_source_file_lossage (void)
|
||
{
|
||
struct subfile *mainsub, *subfile;
|
||
|
||
/* We have to watch for buildsym_compunit == NULL here. It's a quirk of
|
||
end_symtab, it can return NULL so there may not be a main subfile. */
|
||
if (buildsym_compunit == NULL)
|
||
return;
|
||
|
||
/* Get the main source file. */
|
||
mainsub = buildsym_compunit->main_subfile;
|
||
|
||
/* If the main source file doesn't have any line number or symbol
|
||
info, look for an alias in another subfile. */
|
||
|
||
if (mainsub->line_vector == NULL
|
||
&& mainsub->symtab == NULL)
|
||
{
|
||
const char *mainbase = lbasename (mainsub->name);
|
||
int nr_matches = 0;
|
||
struct subfile *prevsub;
|
||
struct subfile *mainsub_alias = NULL;
|
||
struct subfile *prev_mainsub_alias = NULL;
|
||
|
||
prevsub = NULL;
|
||
for (subfile = buildsym_compunit->subfiles;
|
||
subfile != NULL;
|
||
subfile = subfile->next)
|
||
{
|
||
if (subfile == mainsub)
|
||
continue;
|
||
if (filename_cmp (lbasename (subfile->name), mainbase) == 0)
|
||
{
|
||
++nr_matches;
|
||
mainsub_alias = subfile;
|
||
prev_mainsub_alias = prevsub;
|
||
}
|
||
prevsub = subfile;
|
||
}
|
||
|
||
if (nr_matches == 1)
|
||
{
|
||
gdb_assert (mainsub_alias != NULL && mainsub_alias != mainsub);
|
||
|
||
/* Found a match for the main source file.
|
||
Copy its line_vector and symtab to the main subfile
|
||
and then discard it. */
|
||
|
||
mainsub->line_vector = mainsub_alias->line_vector;
|
||
mainsub->line_vector_length = mainsub_alias->line_vector_length;
|
||
mainsub->symtab = mainsub_alias->symtab;
|
||
|
||
if (prev_mainsub_alias == NULL)
|
||
buildsym_compunit->subfiles = mainsub_alias->next;
|
||
else
|
||
prev_mainsub_alias->next = mainsub_alias->next;
|
||
xfree (mainsub_alias->name);
|
||
xfree (mainsub_alias);
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Helper function for qsort. Parameters are `struct block *' pointers,
|
||
function sorts them in descending order by their BLOCK_START. */
|
||
|
||
static int
|
||
block_compar (const void *ap, const void *bp)
|
||
{
|
||
const struct block *a = *(const struct block **) ap;
|
||
const struct block *b = *(const struct block **) bp;
|
||
|
||
return ((BLOCK_START (b) > BLOCK_START (a))
|
||
- (BLOCK_START (b) < BLOCK_START (a)));
|
||
}
|
||
|
||
/* Reset state after a successful building of a symtab.
|
||
This exists because dbxread.c and xcoffread.c can call
|
||
start_symtab+end_symtab multiple times after one call to buildsym_init,
|
||
and before the really_free_pendings cleanup is called.
|
||
We keep the free_pendings list around for dbx/xcoff sake. */
|
||
|
||
static void
|
||
reset_symtab_globals (void)
|
||
{
|
||
set_last_source_file (NULL);
|
||
|
||
local_symbols = NULL;
|
||
local_using_directives = NULL;
|
||
file_symbols = NULL;
|
||
global_symbols = NULL;
|
||
global_using_directives = NULL;
|
||
|
||
/* We don't free pending_macros here because if the symtab was successfully
|
||
built then ownership was transferred to the symtab. */
|
||
pending_macros = NULL;
|
||
|
||
if (pending_addrmap)
|
||
obstack_free (&pending_addrmap_obstack, NULL);
|
||
pending_addrmap = NULL;
|
||
|
||
free_buildsym_compunit ();
|
||
}
|
||
|
||
/* Implementation of the first part of end_symtab. It allows modifying
|
||
STATIC_BLOCK before it gets finalized by end_symtab_from_static_block.
|
||
If the returned value is NULL there is no blockvector created for
|
||
this symtab (you still must call end_symtab_from_static_block).
|
||
|
||
END_ADDR is the same as for end_symtab: the address of the end of the
|
||
file's text.
|
||
|
||
If EXPANDABLE is non-zero the STATIC_BLOCK dictionary is made
|
||
expandable.
|
||
|
||
If REQUIRED is non-zero, then a symtab is created even if it does
|
||
not contain any symbols. */
|
||
|
||
struct block *
|
||
end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required)
|
||
{
|
||
struct objfile *objfile = buildsym_compunit->objfile;
|
||
|
||
/* Finish the lexical context of the last function in the file; pop
|
||
the context stack. */
|
||
|
||
if (context_stack_depth > 0)
|
||
{
|
||
struct context_stack *cstk = pop_context ();
|
||
|
||
/* Make a block for the local symbols within. */
|
||
finish_block (cstk->name, &local_symbols, cstk->old_blocks, NULL,
|
||
cstk->start_addr, end_addr);
|
||
|
||
if (context_stack_depth > 0)
|
||
{
|
||
/* This is said to happen with SCO. The old coffread.c
|
||
code simply emptied the context stack, so we do the
|
||
same. FIXME: Find out why it is happening. This is not
|
||
believed to happen in most cases (even for coffread.c);
|
||
it used to be an abort(). */
|
||
complaint (&symfile_complaints,
|
||
_("Context stack not empty in end_symtab"));
|
||
context_stack_depth = 0;
|
||
}
|
||
}
|
||
|
||
/* Reordered executables may have out of order pending blocks; if
|
||
OBJF_REORDERED is true, then sort the pending blocks. */
|
||
|
||
if ((objfile->flags & OBJF_REORDERED) && pending_blocks)
|
||
{
|
||
unsigned count = 0;
|
||
struct pending_block *pb;
|
||
struct block **barray, **bp;
|
||
struct cleanup *back_to;
|
||
|
||
for (pb = pending_blocks; pb != NULL; pb = pb->next)
|
||
count++;
|
||
|
||
barray = XNEWVEC (struct block *, count);
|
||
back_to = make_cleanup (xfree, barray);
|
||
|
||
bp = barray;
|
||
for (pb = pending_blocks; pb != NULL; pb = pb->next)
|
||
*bp++ = pb->block;
|
||
|
||
qsort (barray, count, sizeof (*barray), block_compar);
|
||
|
||
bp = barray;
|
||
for (pb = pending_blocks; pb != NULL; pb = pb->next)
|
||
pb->block = *bp++;
|
||
|
||
do_cleanups (back_to);
|
||
}
|
||
|
||
/* Cleanup any undefined types that have been left hanging around
|
||
(this needs to be done before the finish_blocks so that
|
||
file_symbols is still good).
|
||
|
||
Both cleanup_undefined_stabs_types and finish_global_stabs are stabs
|
||
specific, but harmless for other symbol readers, since on gdb
|
||
startup or when finished reading stabs, the state is set so these
|
||
are no-ops. FIXME: Is this handled right in case of QUIT? Can
|
||
we make this cleaner? */
|
||
|
||
cleanup_undefined_stabs_types (objfile);
|
||
finish_global_stabs (objfile);
|
||
|
||
if (!required
|
||
&& pending_blocks == NULL
|
||
&& file_symbols == NULL
|
||
&& global_symbols == NULL
|
||
&& have_line_numbers == 0
|
||
&& pending_macros == NULL
|
||
&& global_using_directives == NULL)
|
||
{
|
||
/* Ignore symtabs that have no functions with real debugging info. */
|
||
return NULL;
|
||
}
|
||
else
|
||
{
|
||
/* Define the STATIC_BLOCK. */
|
||
return finish_block_internal (NULL, &file_symbols, NULL, NULL,
|
||
last_source_start_addr, end_addr,
|
||
0, expandable);
|
||
}
|
||
}
|
||
|
||
/* Subroutine of end_symtab_from_static_block to simplify it.
|
||
Handle the "have blockvector" case.
|
||
See end_symtab_from_static_block for a description of the arguments. */
|
||
|
||
static struct compunit_symtab *
|
||
end_symtab_with_blockvector (struct block *static_block,
|
||
int section, int expandable)
|
||
{
|
||
struct objfile *objfile = buildsym_compunit->objfile;
|
||
struct compunit_symtab *cu = buildsym_compunit->compunit_symtab;
|
||
struct symtab *symtab;
|
||
struct blockvector *blockvector;
|
||
struct subfile *subfile;
|
||
CORE_ADDR end_addr;
|
||
|
||
gdb_assert (static_block != NULL);
|
||
gdb_assert (buildsym_compunit != NULL);
|
||
gdb_assert (buildsym_compunit->subfiles != NULL);
|
||
|
||
end_addr = BLOCK_END (static_block);
|
||
|
||
/* Create the GLOBAL_BLOCK and build the blockvector. */
|
||
finish_block_internal (NULL, &global_symbols, NULL, NULL,
|
||
last_source_start_addr, end_addr,
|
||
1, expandable);
|
||
blockvector = make_blockvector ();
|
||
|
||
/* Read the line table if it has to be read separately.
|
||
This is only used by xcoffread.c. */
|
||
if (objfile->sf->sym_read_linetable != NULL)
|
||
objfile->sf->sym_read_linetable (objfile);
|
||
|
||
/* Handle the case where the debug info specifies a different path
|
||
for the main source file. It can cause us to lose track of its
|
||
line number information. */
|
||
watch_main_source_file_lossage ();
|
||
|
||
/* Now create the symtab objects proper, if not already done,
|
||
one for each subfile. */
|
||
|
||
for (subfile = buildsym_compunit->subfiles;
|
||
subfile != NULL;
|
||
subfile = subfile->next)
|
||
{
|
||
int linetablesize = 0;
|
||
|
||
if (subfile->line_vector)
|
||
{
|
||
linetablesize = sizeof (struct linetable) +
|
||
subfile->line_vector->nitems * sizeof (struct linetable_entry);
|
||
|
||
/* Like the pending blocks, the line table may be
|
||
scrambled in reordered executables. Sort it if
|
||
OBJF_REORDERED is true. */
|
||
if (objfile->flags & OBJF_REORDERED)
|
||
qsort (subfile->line_vector->item,
|
||
subfile->line_vector->nitems,
|
||
sizeof (struct linetable_entry), compare_line_numbers);
|
||
}
|
||
|
||
/* Allocate a symbol table if necessary. */
|
||
if (subfile->symtab == NULL)
|
||
subfile->symtab = allocate_symtab (cu, subfile->name);
|
||
symtab = subfile->symtab;
|
||
|
||
/* Fill in its components. */
|
||
|
||
if (subfile->line_vector)
|
||
{
|
||
/* Reallocate the line table on the symbol obstack. */
|
||
SYMTAB_LINETABLE (symtab) = (struct linetable *)
|
||
obstack_alloc (&objfile->objfile_obstack, linetablesize);
|
||
memcpy (SYMTAB_LINETABLE (symtab), subfile->line_vector,
|
||
linetablesize);
|
||
}
|
||
else
|
||
{
|
||
SYMTAB_LINETABLE (symtab) = NULL;
|
||
}
|
||
|
||
/* Use whatever language we have been using for this
|
||
subfile, not the one that was deduced in allocate_symtab
|
||
from the filename. We already did our own deducing when
|
||
we created the subfile, and we may have altered our
|
||
opinion of what language it is from things we found in
|
||
the symbols. */
|
||
symtab->language = subfile->language;
|
||
}
|
||
|
||
/* Make sure the symtab of main_subfile is the first in its list. */
|
||
{
|
||
struct symtab *main_symtab, *prev_symtab;
|
||
|
||
main_symtab = buildsym_compunit->main_subfile->symtab;
|
||
prev_symtab = NULL;
|
||
ALL_COMPUNIT_FILETABS (cu, symtab)
|
||
{
|
||
if (symtab == main_symtab)
|
||
{
|
||
if (prev_symtab != NULL)
|
||
{
|
||
prev_symtab->next = main_symtab->next;
|
||
main_symtab->next = COMPUNIT_FILETABS (cu);
|
||
COMPUNIT_FILETABS (cu) = main_symtab;
|
||
}
|
||
break;
|
||
}
|
||
prev_symtab = symtab;
|
||
}
|
||
gdb_assert (main_symtab == COMPUNIT_FILETABS (cu));
|
||
}
|
||
|
||
/* Fill out the compunit symtab. */
|
||
|
||
if (buildsym_compunit->comp_dir != NULL)
|
||
{
|
||
/* Reallocate the dirname on the symbol obstack. */
|
||
COMPUNIT_DIRNAME (cu)
|
||
= (const char *) obstack_copy0 (&objfile->objfile_obstack,
|
||
buildsym_compunit->comp_dir,
|
||
strlen (buildsym_compunit->comp_dir));
|
||
}
|
||
|
||
/* Save the debug format string (if any) in the symtab. */
|
||
COMPUNIT_DEBUGFORMAT (cu) = buildsym_compunit->debugformat;
|
||
|
||
/* Similarly for the producer. */
|
||
COMPUNIT_PRODUCER (cu) = buildsym_compunit->producer;
|
||
|
||
COMPUNIT_BLOCKVECTOR (cu) = blockvector;
|
||
{
|
||
struct block *b = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
|
||
|
||
set_block_compunit_symtab (b, cu);
|
||
}
|
||
|
||
COMPUNIT_BLOCK_LINE_SECTION (cu) = section;
|
||
|
||
COMPUNIT_MACRO_TABLE (cu) = pending_macros;
|
||
|
||
/* Default any symbols without a specified symtab to the primary symtab. */
|
||
{
|
||
int block_i;
|
||
|
||
/* The main source file's symtab. */
|
||
symtab = COMPUNIT_FILETABS (cu);
|
||
|
||
for (block_i = 0; block_i < BLOCKVECTOR_NBLOCKS (blockvector); block_i++)
|
||
{
|
||
struct block *block = BLOCKVECTOR_BLOCK (blockvector, block_i);
|
||
struct symbol *sym;
|
||
struct dict_iterator iter;
|
||
|
||
/* Inlined functions may have symbols not in the global or
|
||
static symbol lists. */
|
||
if (BLOCK_FUNCTION (block) != NULL)
|
||
if (symbol_symtab (BLOCK_FUNCTION (block)) == NULL)
|
||
symbol_set_symtab (BLOCK_FUNCTION (block), symtab);
|
||
|
||
/* Note that we only want to fix up symbols from the local
|
||
blocks, not blocks coming from included symtabs. That is why
|
||
we use ALL_DICT_SYMBOLS here and not ALL_BLOCK_SYMBOLS. */
|
||
ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
|
||
if (symbol_symtab (sym) == NULL)
|
||
symbol_set_symtab (sym, symtab);
|
||
}
|
||
}
|
||
|
||
add_compunit_symtab_to_objfile (cu);
|
||
|
||
return cu;
|
||
}
|
||
|
||
/* Implementation of the second part of end_symtab. Pass STATIC_BLOCK
|
||
as value returned by end_symtab_get_static_block.
|
||
|
||
SECTION is the same as for end_symtab: the section number
|
||
(in objfile->section_offsets) of the blockvector and linetable.
|
||
|
||
If EXPANDABLE is non-zero the GLOBAL_BLOCK dictionary is made
|
||
expandable. */
|
||
|
||
struct compunit_symtab *
|
||
end_symtab_from_static_block (struct block *static_block,
|
||
int section, int expandable)
|
||
{
|
||
struct compunit_symtab *cu;
|
||
|
||
if (static_block == NULL)
|
||
{
|
||
/* Handle the "no blockvector" case.
|
||
When this happens there is nothing to record, so there's nothing
|
||
to do: memory will be freed up later.
|
||
|
||
Note: We won't be adding a compunit to the objfile's list of
|
||
compunits, so there's nothing to unchain. However, since each symtab
|
||
is added to the objfile's obstack we can't free that space.
|
||
We could do better, but this is believed to be a sufficiently rare
|
||
event. */
|
||
cu = NULL;
|
||
}
|
||
else
|
||
cu = end_symtab_with_blockvector (static_block, section, expandable);
|
||
|
||
reset_symtab_globals ();
|
||
|
||
return cu;
|
||
}
|
||
|
||
/* Finish the symbol definitions for one main source file, close off
|
||
all the lexical contexts for that file (creating struct block's for
|
||
them), then make the struct symtab for that file and put it in the
|
||
list of all such.
|
||
|
||
END_ADDR is the address of the end of the file's text. SECTION is
|
||
the section number (in objfile->section_offsets) of the blockvector
|
||
and linetable.
|
||
|
||
Note that it is possible for end_symtab() to return NULL. In
|
||
particular, for the DWARF case at least, it will return NULL when
|
||
it finds a compilation unit that has exactly one DIE, a
|
||
TAG_compile_unit DIE. This can happen when we link in an object
|
||
file that was compiled from an empty source file. Returning NULL
|
||
is probably not the correct thing to do, because then gdb will
|
||
never know about this empty file (FIXME).
|
||
|
||
If you need to modify STATIC_BLOCK before it is finalized you should
|
||
call end_symtab_get_static_block and end_symtab_from_static_block
|
||
yourself. */
|
||
|
||
struct compunit_symtab *
|
||
end_symtab (CORE_ADDR end_addr, int section)
|
||
{
|
||
struct block *static_block;
|
||
|
||
static_block = end_symtab_get_static_block (end_addr, 0, 0);
|
||
return end_symtab_from_static_block (static_block, section, 0);
|
||
}
|
||
|
||
/* Same as end_symtab except create a symtab that can be later added to. */
|
||
|
||
struct compunit_symtab *
|
||
end_expandable_symtab (CORE_ADDR end_addr, int section)
|
||
{
|
||
struct block *static_block;
|
||
|
||
static_block = end_symtab_get_static_block (end_addr, 1, 0);
|
||
return end_symtab_from_static_block (static_block, section, 1);
|
||
}
|
||
|
||
/* Subroutine of augment_type_symtab to simplify it.
|
||
Attach the main source file's symtab to all symbols in PENDING_LIST that
|
||
don't have one. */
|
||
|
||
static void
|
||
set_missing_symtab (struct pending *pending_list,
|
||
struct compunit_symtab *cu)
|
||
{
|
||
struct pending *pending;
|
||
int i;
|
||
|
||
for (pending = pending_list; pending != NULL; pending = pending->next)
|
||
{
|
||
for (i = 0; i < pending->nsyms; ++i)
|
||
{
|
||
if (symbol_symtab (pending->symbol[i]) == NULL)
|
||
symbol_set_symtab (pending->symbol[i], COMPUNIT_FILETABS (cu));
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Same as end_symtab, but for the case where we're adding more symbols
|
||
to an existing symtab that is known to contain only type information.
|
||
This is the case for DWARF4 Type Units. */
|
||
|
||
void
|
||
augment_type_symtab (void)
|
||
{
|
||
struct compunit_symtab *cust = buildsym_compunit->compunit_symtab;
|
||
const struct blockvector *blockvector = COMPUNIT_BLOCKVECTOR (cust);
|
||
|
||
if (context_stack_depth > 0)
|
||
{
|
||
complaint (&symfile_complaints,
|
||
_("Context stack not empty in augment_type_symtab"));
|
||
context_stack_depth = 0;
|
||
}
|
||
if (pending_blocks != NULL)
|
||
complaint (&symfile_complaints, _("Blocks in a type symtab"));
|
||
if (pending_macros != NULL)
|
||
complaint (&symfile_complaints, _("Macro in a type symtab"));
|
||
if (have_line_numbers)
|
||
complaint (&symfile_complaints,
|
||
_("Line numbers recorded in a type symtab"));
|
||
|
||
if (file_symbols != NULL)
|
||
{
|
||
struct block *block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
|
||
|
||
/* First mark any symbols without a specified symtab as belonging
|
||
to the primary symtab. */
|
||
set_missing_symtab (file_symbols, cust);
|
||
|
||
dict_add_pending (BLOCK_DICT (block), file_symbols);
|
||
}
|
||
|
||
if (global_symbols != NULL)
|
||
{
|
||
struct block *block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
|
||
|
||
/* First mark any symbols without a specified symtab as belonging
|
||
to the primary symtab. */
|
||
set_missing_symtab (global_symbols, cust);
|
||
|
||
dict_add_pending (BLOCK_DICT (block), global_symbols);
|
||
}
|
||
|
||
reset_symtab_globals ();
|
||
}
|
||
|
||
/* Push a context block. Args are an identifying nesting level
|
||
(checkable when you pop it), and the starting PC address of this
|
||
context. */
|
||
|
||
struct context_stack *
|
||
push_context (int desc, CORE_ADDR valu)
|
||
{
|
||
struct context_stack *newobj;
|
||
|
||
if (context_stack_depth == context_stack_size)
|
||
{
|
||
context_stack_size *= 2;
|
||
context_stack = (struct context_stack *)
|
||
xrealloc ((char *) context_stack,
|
||
(context_stack_size * sizeof (struct context_stack)));
|
||
}
|
||
|
||
newobj = &context_stack[context_stack_depth++];
|
||
newobj->depth = desc;
|
||
newobj->locals = local_symbols;
|
||
newobj->old_blocks = pending_blocks;
|
||
newobj->start_addr = valu;
|
||
newobj->local_using_directives = local_using_directives;
|
||
newobj->name = NULL;
|
||
|
||
local_symbols = NULL;
|
||
local_using_directives = NULL;
|
||
|
||
return newobj;
|
||
}
|
||
|
||
/* Pop a context block. Returns the address of the context block just
|
||
popped. */
|
||
|
||
struct context_stack *
|
||
pop_context (void)
|
||
{
|
||
gdb_assert (context_stack_depth > 0);
|
||
return (&context_stack[--context_stack_depth]);
|
||
}
|
||
|
||
|
||
|
||
/* Compute a small integer hash code for the given name. */
|
||
|
||
int
|
||
hashname (const char *name)
|
||
{
|
||
return (hash(name,strlen(name)) % HASHSIZE);
|
||
}
|
||
|
||
|
||
void
|
||
record_debugformat (const char *format)
|
||
{
|
||
buildsym_compunit->debugformat = format;
|
||
}
|
||
|
||
void
|
||
record_producer (const char *producer)
|
||
{
|
||
buildsym_compunit->producer = producer;
|
||
}
|
||
|
||
/* Merge the first symbol list SRCLIST into the second symbol list
|
||
TARGETLIST by repeated calls to add_symbol_to_list(). This
|
||
procedure "frees" each link of SRCLIST by adding it to the
|
||
free_pendings list. Caller must set SRCLIST to a null list after
|
||
calling this function.
|
||
|
||
Void return. */
|
||
|
||
void
|
||
merge_symbol_lists (struct pending **srclist, struct pending **targetlist)
|
||
{
|
||
int i;
|
||
|
||
if (!srclist || !*srclist)
|
||
return;
|
||
|
||
/* Merge in elements from current link. */
|
||
for (i = 0; i < (*srclist)->nsyms; i++)
|
||
add_symbol_to_list ((*srclist)->symbol[i], targetlist);
|
||
|
||
/* Recurse on next. */
|
||
merge_symbol_lists (&(*srclist)->next, targetlist);
|
||
|
||
/* "Free" the current link. */
|
||
(*srclist)->next = free_pendings;
|
||
free_pendings = (*srclist);
|
||
}
|
||
|
||
|
||
/* Name of source file whose symbol data we are now processing. This
|
||
comes from a symbol of type N_SO for stabs. For Dwarf it comes
|
||
from the DW_AT_name attribute of a DW_TAG_compile_unit DIE. */
|
||
|
||
static char *last_source_file;
|
||
|
||
/* See buildsym.h. */
|
||
|
||
void
|
||
set_last_source_file (const char *name)
|
||
{
|
||
xfree (last_source_file);
|
||
last_source_file = name == NULL ? NULL : xstrdup (name);
|
||
}
|
||
|
||
/* See buildsym.h. */
|
||
|
||
const char *
|
||
get_last_source_file (void)
|
||
{
|
||
return last_source_file;
|
||
}
|
||
|
||
|
||
|
||
/* Initialize anything that needs initializing when starting to read a
|
||
fresh piece of a symbol file, e.g. reading in the stuff
|
||
corresponding to a psymtab. */
|
||
|
||
void
|
||
buildsym_init (void)
|
||
{
|
||
subfile_stack = NULL;
|
||
|
||
pending_addrmap_interesting = 0;
|
||
|
||
/* Context stack is initially empty. Allocate first one with room
|
||
for a few levels; reuse it forever afterward. */
|
||
if (context_stack == NULL)
|
||
{
|
||
context_stack_size = INITIAL_CONTEXT_STACK_SIZE;
|
||
context_stack = XNEWVEC (struct context_stack, context_stack_size);
|
||
}
|
||
|
||
/* Ensure the really_free_pendings cleanup was called after
|
||
the last time. */
|
||
gdb_assert (free_pendings == NULL);
|
||
gdb_assert (pending_blocks == NULL);
|
||
gdb_assert (file_symbols == NULL);
|
||
gdb_assert (global_symbols == NULL);
|
||
gdb_assert (global_using_directives == NULL);
|
||
gdb_assert (pending_macros == NULL);
|
||
gdb_assert (pending_addrmap == NULL);
|
||
gdb_assert (buildsym_compunit == NULL);
|
||
}
|
||
|
||
/* Initialize anything that needs initializing when a completely new
|
||
symbol file is specified (not just adding some symbols from another
|
||
file, e.g. a shared library). */
|
||
|
||
void
|
||
buildsym_new_init (void)
|
||
{
|
||
buildsym_init ();
|
||
}
|