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.
1105 lines
33 KiB
C
1105 lines
33 KiB
C
/* C preprocessor macro tables for GDB.
|
||
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||
Contributed by Red Hat, 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 "gdb_obstack.h"
|
||
#include "splay-tree.h"
|
||
#include "filenames.h"
|
||
#include "symtab.h"
|
||
#include "symfile.h"
|
||
#include "objfiles.h"
|
||
#include "macrotab.h"
|
||
#include "bcache.h"
|
||
#include "complaints.h"
|
||
#include "macroexp.h"
|
||
|
||
|
||
/* The macro table structure. */
|
||
|
||
struct macro_table
|
||
{
|
||
/* The obstack this table's data should be allocated in, or zero if
|
||
we should use xmalloc. */
|
||
struct obstack *obstack;
|
||
|
||
/* The bcache we should use to hold macro names, argument names, and
|
||
definitions, or zero if we should use xmalloc. */
|
||
struct bcache *bcache;
|
||
|
||
/* The main source file for this compilation unit --- the one whose
|
||
name was given to the compiler. This is the root of the
|
||
#inclusion tree; everything else is #included from here. */
|
||
struct macro_source_file *main_source;
|
||
|
||
/* Backlink to containing compilation unit, or NULL if there isn't one. */
|
||
struct compunit_symtab *compunit_symtab;
|
||
|
||
/* True if macros in this table can be redefined without issuing an
|
||
error. */
|
||
int redef_ok;
|
||
|
||
/* The table of macro definitions. This is a splay tree (an ordered
|
||
binary tree that stays balanced, effectively), sorted by macro
|
||
name. Where a macro gets defined more than once (presumably with
|
||
an #undefinition in between), we sort the definitions by the
|
||
order they would appear in the preprocessor's output. That is,
|
||
if `a.c' #includes `m.h' and then #includes `n.h', and both
|
||
header files #define X (with an #undef somewhere in between),
|
||
then the definition from `m.h' appears in our splay tree before
|
||
the one from `n.h'.
|
||
|
||
The splay tree's keys are `struct macro_key' pointers;
|
||
the values are `struct macro_definition' pointers.
|
||
|
||
The splay tree, its nodes, and the keys and values are allocated
|
||
in obstack, if it's non-zero, or with xmalloc otherwise. The
|
||
macro names, argument names, argument name arrays, and definition
|
||
strings are all allocated in bcache, if non-zero, or with xmalloc
|
||
otherwise. */
|
||
splay_tree definitions;
|
||
};
|
||
|
||
|
||
|
||
/* Allocation and freeing functions. */
|
||
|
||
/* Allocate SIZE bytes of memory appropriately for the macro table T.
|
||
This just checks whether T has an obstack, or whether its pieces
|
||
should be allocated with xmalloc. */
|
||
static void *
|
||
macro_alloc (int size, struct macro_table *t)
|
||
{
|
||
if (t->obstack)
|
||
return obstack_alloc (t->obstack, size);
|
||
else
|
||
return xmalloc (size);
|
||
}
|
||
|
||
|
||
static void
|
||
macro_free (void *object, struct macro_table *t)
|
||
{
|
||
if (t->obstack)
|
||
/* There are cases where we need to remove entries from a macro
|
||
table, even when reading debugging information. This should be
|
||
rare, and there's no easy way to free arbitrary data from an
|
||
obstack, so we just leak it. */
|
||
;
|
||
else
|
||
xfree (object);
|
||
}
|
||
|
||
|
||
/* If the macro table T has a bcache, then cache the LEN bytes at ADDR
|
||
there, and return the cached copy. Otherwise, just xmalloc a copy
|
||
of the bytes, and return a pointer to that. */
|
||
static const void *
|
||
macro_bcache (struct macro_table *t, const void *addr, int len)
|
||
{
|
||
if (t->bcache)
|
||
return bcache (addr, len, t->bcache);
|
||
else
|
||
{
|
||
void *copy = xmalloc (len);
|
||
|
||
memcpy (copy, addr, len);
|
||
return copy;
|
||
}
|
||
}
|
||
|
||
|
||
/* If the macro table T has a bcache, cache the null-terminated string
|
||
S there, and return a pointer to the cached copy. Otherwise,
|
||
xmalloc a copy and return that. */
|
||
static const char *
|
||
macro_bcache_str (struct macro_table *t, const char *s)
|
||
{
|
||
return macro_bcache (t, s, strlen (s) + 1);
|
||
}
|
||
|
||
|
||
/* Free a possibly bcached object OBJ. That is, if the macro table T
|
||
has a bcache, do nothing; otherwise, xfree OBJ. */
|
||
static void
|
||
macro_bcache_free (struct macro_table *t, void *obj)
|
||
{
|
||
if (t->bcache)
|
||
/* There are cases where we need to remove entries from a macro
|
||
table, even when reading debugging information. This should be
|
||
rare, and there's no easy way to free data from a bcache, so we
|
||
just leak it. */
|
||
;
|
||
else
|
||
xfree (obj);
|
||
}
|
||
|
||
|
||
|
||
/* Macro tree keys, w/their comparison, allocation, and freeing functions. */
|
||
|
||
/* A key in the splay tree. */
|
||
struct macro_key
|
||
{
|
||
/* The table we're in. We only need this in order to free it, since
|
||
the splay tree library's key and value freeing functions require
|
||
that the key or value contain all the information needed to free
|
||
themselves. */
|
||
struct macro_table *table;
|
||
|
||
/* The name of the macro. This is in the table's bcache, if it has
|
||
one. */
|
||
const char *name;
|
||
|
||
/* The source file and line number where the definition's scope
|
||
begins. This is also the line of the definition itself. */
|
||
struct macro_source_file *start_file;
|
||
int start_line;
|
||
|
||
/* The first source file and line after the definition's scope.
|
||
(That is, the scope does not include this endpoint.) If end_file
|
||
is zero, then the definition extends to the end of the
|
||
compilation unit. */
|
||
struct macro_source_file *end_file;
|
||
int end_line;
|
||
};
|
||
|
||
|
||
/* Return the #inclusion depth of the source file FILE. This is the
|
||
number of #inclusions it took to reach this file. For the main
|
||
source file, the #inclusion depth is zero; for a file it #includes
|
||
directly, the depth would be one; and so on. */
|
||
static int
|
||
inclusion_depth (struct macro_source_file *file)
|
||
{
|
||
int depth;
|
||
|
||
for (depth = 0; file->included_by; depth++)
|
||
file = file->included_by;
|
||
|
||
return depth;
|
||
}
|
||
|
||
|
||
/* Compare two source locations (from the same compilation unit).
|
||
This is part of the comparison function for the tree of
|
||
definitions.
|
||
|
||
LINE1 and LINE2 are line numbers in the source files FILE1 and
|
||
FILE2. Return a value:
|
||
- less than zero if {LINE,FILE}1 comes before {LINE,FILE}2,
|
||
- greater than zero if {LINE,FILE}1 comes after {LINE,FILE}2, or
|
||
- zero if they are equal.
|
||
|
||
When the two locations are in different source files --- perhaps
|
||
one is in a header, while another is in the main source file --- we
|
||
order them by where they would appear in the fully pre-processed
|
||
sources, where all the #included files have been substituted into
|
||
their places. */
|
||
static int
|
||
compare_locations (struct macro_source_file *file1, int line1,
|
||
struct macro_source_file *file2, int line2)
|
||
{
|
||
/* We want to treat positions in an #included file as coming *after*
|
||
the line containing the #include, but *before* the line after the
|
||
include. As we walk up the #inclusion tree toward the main
|
||
source file, we update fileX and lineX as we go; includedX
|
||
indicates whether the original position was from the #included
|
||
file. */
|
||
int included1 = 0;
|
||
int included2 = 0;
|
||
|
||
/* If a file is zero, that means "end of compilation unit." Handle
|
||
that specially. */
|
||
if (! file1)
|
||
{
|
||
if (! file2)
|
||
return 0;
|
||
else
|
||
return 1;
|
||
}
|
||
else if (! file2)
|
||
return -1;
|
||
|
||
/* If the two files are not the same, find their common ancestor in
|
||
the #inclusion tree. */
|
||
if (file1 != file2)
|
||
{
|
||
/* If one file is deeper than the other, walk up the #inclusion
|
||
chain until the two files are at least at the same *depth*.
|
||
Then, walk up both files in synchrony until they're the same
|
||
file. That file is the common ancestor. */
|
||
int depth1 = inclusion_depth (file1);
|
||
int depth2 = inclusion_depth (file2);
|
||
|
||
/* Only one of these while loops will ever execute in any given
|
||
case. */
|
||
while (depth1 > depth2)
|
||
{
|
||
line1 = file1->included_at_line;
|
||
file1 = file1->included_by;
|
||
included1 = 1;
|
||
depth1--;
|
||
}
|
||
while (depth2 > depth1)
|
||
{
|
||
line2 = file2->included_at_line;
|
||
file2 = file2->included_by;
|
||
included2 = 1;
|
||
depth2--;
|
||
}
|
||
|
||
/* Now both file1 and file2 are at the same depth. Walk toward
|
||
the root of the tree until we find where the branches meet. */
|
||
while (file1 != file2)
|
||
{
|
||
line1 = file1->included_at_line;
|
||
file1 = file1->included_by;
|
||
/* At this point, we know that the case the includedX flags
|
||
are trying to deal with won't come up, but we'll just
|
||
maintain them anyway. */
|
||
included1 = 1;
|
||
|
||
line2 = file2->included_at_line;
|
||
file2 = file2->included_by;
|
||
included2 = 1;
|
||
|
||
/* Sanity check. If file1 and file2 are really from the
|
||
same compilation unit, then they should both be part of
|
||
the same tree, and this shouldn't happen. */
|
||
gdb_assert (file1 && file2);
|
||
}
|
||
}
|
||
|
||
/* Now we've got two line numbers in the same file. */
|
||
if (line1 == line2)
|
||
{
|
||
/* They can't both be from #included files. Then we shouldn't
|
||
have walked up this far. */
|
||
gdb_assert (! included1 || ! included2);
|
||
|
||
/* Any #included position comes after a non-#included position
|
||
with the same line number in the #including file. */
|
||
if (included1)
|
||
return 1;
|
||
else if (included2)
|
||
return -1;
|
||
else
|
||
return 0;
|
||
}
|
||
else
|
||
return line1 - line2;
|
||
}
|
||
|
||
|
||
/* Compare a macro key KEY against NAME, the source file FILE, and
|
||
line number LINE.
|
||
|
||
Sort definitions by name; for two definitions with the same name,
|
||
place the one whose definition comes earlier before the one whose
|
||
definition comes later.
|
||
|
||
Return -1, 0, or 1 if key comes before, is identical to, or comes
|
||
after NAME, FILE, and LINE. */
|
||
static int
|
||
key_compare (struct macro_key *key,
|
||
const char *name, struct macro_source_file *file, int line)
|
||
{
|
||
int names = strcmp (key->name, name);
|
||
|
||
if (names)
|
||
return names;
|
||
|
||
return compare_locations (key->start_file, key->start_line,
|
||
file, line);
|
||
}
|
||
|
||
|
||
/* The macro tree comparison function, typed for the splay tree
|
||
library's happiness. */
|
||
static int
|
||
macro_tree_compare (splay_tree_key untyped_key1,
|
||
splay_tree_key untyped_key2)
|
||
{
|
||
struct macro_key *key1 = (struct macro_key *) untyped_key1;
|
||
struct macro_key *key2 = (struct macro_key *) untyped_key2;
|
||
|
||
return key_compare (key1, key2->name, key2->start_file, key2->start_line);
|
||
}
|
||
|
||
|
||
/* Construct a new macro key node for a macro in table T whose name is
|
||
NAME, and whose scope starts at LINE in FILE; register the name in
|
||
the bcache. */
|
||
static struct macro_key *
|
||
new_macro_key (struct macro_table *t,
|
||
const char *name,
|
||
struct macro_source_file *file,
|
||
int line)
|
||
{
|
||
struct macro_key *k = (struct macro_key *) macro_alloc (sizeof (*k), t);
|
||
|
||
memset (k, 0, sizeof (*k));
|
||
k->table = t;
|
||
k->name = macro_bcache_str (t, name);
|
||
k->start_file = file;
|
||
k->start_line = line;
|
||
k->end_file = 0;
|
||
|
||
return k;
|
||
}
|
||
|
||
|
||
static void
|
||
macro_tree_delete_key (void *untyped_key)
|
||
{
|
||
struct macro_key *key = (struct macro_key *) untyped_key;
|
||
|
||
macro_bcache_free (key->table, (char *) key->name);
|
||
macro_free (key, key->table);
|
||
}
|
||
|
||
|
||
|
||
/* Building and querying the tree of #included files. */
|
||
|
||
|
||
/* Allocate and initialize a new source file structure. */
|
||
static struct macro_source_file *
|
||
new_source_file (struct macro_table *t,
|
||
const char *filename)
|
||
{
|
||
/* Get space for the source file structure itself. */
|
||
struct macro_source_file *f
|
||
= (struct macro_source_file *) macro_alloc (sizeof (*f), t);
|
||
|
||
memset (f, 0, sizeof (*f));
|
||
f->table = t;
|
||
f->filename = macro_bcache_str (t, filename);
|
||
f->includes = 0;
|
||
|
||
return f;
|
||
}
|
||
|
||
|
||
/* Free a source file, and all the source files it #included. */
|
||
static void
|
||
free_macro_source_file (struct macro_source_file *src)
|
||
{
|
||
struct macro_source_file *child, *next_child;
|
||
|
||
/* Free this file's children. */
|
||
for (child = src->includes; child; child = next_child)
|
||
{
|
||
next_child = child->next_included;
|
||
free_macro_source_file (child);
|
||
}
|
||
|
||
macro_bcache_free (src->table, (char *) src->filename);
|
||
macro_free (src, src->table);
|
||
}
|
||
|
||
|
||
struct macro_source_file *
|
||
macro_set_main (struct macro_table *t,
|
||
const char *filename)
|
||
{
|
||
/* You can't change a table's main source file. What would that do
|
||
to the tree? */
|
||
gdb_assert (! t->main_source);
|
||
|
||
t->main_source = new_source_file (t, filename);
|
||
|
||
return t->main_source;
|
||
}
|
||
|
||
|
||
struct macro_source_file *
|
||
macro_main (struct macro_table *t)
|
||
{
|
||
gdb_assert (t->main_source);
|
||
|
||
return t->main_source;
|
||
}
|
||
|
||
|
||
void
|
||
macro_allow_redefinitions (struct macro_table *t)
|
||
{
|
||
gdb_assert (! t->obstack);
|
||
t->redef_ok = 1;
|
||
}
|
||
|
||
|
||
struct macro_source_file *
|
||
macro_include (struct macro_source_file *source,
|
||
int line,
|
||
const char *included)
|
||
{
|
||
struct macro_source_file *newobj;
|
||
struct macro_source_file **link;
|
||
|
||
/* Find the right position in SOURCE's `includes' list for the new
|
||
file. Skip inclusions at earlier lines, until we find one at the
|
||
same line or later --- or until the end of the list. */
|
||
for (link = &source->includes;
|
||
*link && (*link)->included_at_line < line;
|
||
link = &(*link)->next_included)
|
||
;
|
||
|
||
/* Did we find another file already #included at the same line as
|
||
the new one? */
|
||
if (*link && line == (*link)->included_at_line)
|
||
{
|
||
char *link_fullname, *source_fullname;
|
||
|
||
/* This means the compiler is emitting bogus debug info. (GCC
|
||
circa March 2002 did this.) It also means that the splay
|
||
tree ordering function, macro_tree_compare, will abort,
|
||
because it can't tell which #inclusion came first. But GDB
|
||
should tolerate bad debug info. So:
|
||
|
||
First, squawk. */
|
||
|
||
link_fullname = macro_source_fullname (*link);
|
||
source_fullname = macro_source_fullname (source);
|
||
complaint (&symfile_complaints,
|
||
_("both `%s' and `%s' allegedly #included at %s:%d"),
|
||
included, link_fullname, source_fullname, line);
|
||
xfree (source_fullname);
|
||
xfree (link_fullname);
|
||
|
||
/* Now, choose a new, unoccupied line number for this
|
||
#inclusion, after the alleged #inclusion line. */
|
||
while (*link && line == (*link)->included_at_line)
|
||
{
|
||
/* This line number is taken, so try the next line. */
|
||
line++;
|
||
link = &(*link)->next_included;
|
||
}
|
||
}
|
||
|
||
/* At this point, we know that LINE is an unused line number, and
|
||
*LINK points to the entry an #inclusion at that line should
|
||
precede. */
|
||
newobj = new_source_file (source->table, included);
|
||
newobj->included_by = source;
|
||
newobj->included_at_line = line;
|
||
newobj->next_included = *link;
|
||
*link = newobj;
|
||
|
||
return newobj;
|
||
}
|
||
|
||
|
||
struct macro_source_file *
|
||
macro_lookup_inclusion (struct macro_source_file *source, const char *name)
|
||
{
|
||
/* Is SOURCE itself named NAME? */
|
||
if (filename_cmp (name, source->filename) == 0)
|
||
return source;
|
||
|
||
/* It's not us. Try all our children, and return the lowest. */
|
||
{
|
||
struct macro_source_file *child;
|
||
struct macro_source_file *best = NULL;
|
||
int best_depth = 0;
|
||
|
||
for (child = source->includes; child; child = child->next_included)
|
||
{
|
||
struct macro_source_file *result
|
||
= macro_lookup_inclusion (child, name);
|
||
|
||
if (result)
|
||
{
|
||
int result_depth = inclusion_depth (result);
|
||
|
||
if (! best || result_depth < best_depth)
|
||
{
|
||
best = result;
|
||
best_depth = result_depth;
|
||
}
|
||
}
|
||
}
|
||
|
||
return best;
|
||
}
|
||
}
|
||
|
||
|
||
|
||
/* Registering and looking up macro definitions. */
|
||
|
||
|
||
/* Construct a definition for a macro in table T. Cache all strings,
|
||
and the macro_definition structure itself, in T's bcache. */
|
||
static struct macro_definition *
|
||
new_macro_definition (struct macro_table *t,
|
||
enum macro_kind kind,
|
||
int argc, const char **argv,
|
||
const char *replacement)
|
||
{
|
||
struct macro_definition *d
|
||
= (struct macro_definition *) macro_alloc (sizeof (*d), t);
|
||
|
||
memset (d, 0, sizeof (*d));
|
||
d->table = t;
|
||
d->kind = kind;
|
||
d->replacement = macro_bcache_str (t, replacement);
|
||
d->argc = argc;
|
||
|
||
if (kind == macro_function_like)
|
||
{
|
||
int i;
|
||
const char **cached_argv;
|
||
int cached_argv_size = argc * sizeof (*cached_argv);
|
||
|
||
/* Bcache all the arguments. */
|
||
cached_argv = (const char **) alloca (cached_argv_size);
|
||
for (i = 0; i < argc; i++)
|
||
cached_argv[i] = macro_bcache_str (t, argv[i]);
|
||
|
||
/* Now bcache the array of argument pointers itself. */
|
||
d->argv = macro_bcache (t, cached_argv, cached_argv_size);
|
||
}
|
||
|
||
/* We don't bcache the entire definition structure because it's got
|
||
a pointer to the macro table in it; since each compilation unit
|
||
has its own macro table, you'd only get bcache hits for identical
|
||
definitions within a compilation unit, which seems unlikely.
|
||
|
||
"So, why do macro definitions have pointers to their macro tables
|
||
at all?" Well, when the splay tree library wants to free a
|
||
node's value, it calls the value freeing function with nothing
|
||
but the value itself. It makes the (apparently reasonable)
|
||
assumption that the value carries enough information to free
|
||
itself. But not all macro tables have bcaches, so not all macro
|
||
definitions would be bcached. There's no way to tell whether a
|
||
given definition is bcached without knowing which table the
|
||
definition belongs to. ... blah. The thing's only sixteen
|
||
bytes anyway, and we can still bcache the name, args, and
|
||
definition, so we just don't bother bcaching the definition
|
||
structure itself. */
|
||
return d;
|
||
}
|
||
|
||
|
||
/* Free a macro definition. */
|
||
static void
|
||
macro_tree_delete_value (void *untyped_definition)
|
||
{
|
||
struct macro_definition *d = (struct macro_definition *) untyped_definition;
|
||
struct macro_table *t = d->table;
|
||
|
||
if (d->kind == macro_function_like)
|
||
{
|
||
int i;
|
||
|
||
for (i = 0; i < d->argc; i++)
|
||
macro_bcache_free (t, (char *) d->argv[i]);
|
||
macro_bcache_free (t, (char **) d->argv);
|
||
}
|
||
|
||
macro_bcache_free (t, (char *) d->replacement);
|
||
macro_free (d, t);
|
||
}
|
||
|
||
|
||
/* Find the splay tree node for the definition of NAME at LINE in
|
||
SOURCE, or zero if there is none. */
|
||
static splay_tree_node
|
||
find_definition (const char *name,
|
||
struct macro_source_file *file,
|
||
int line)
|
||
{
|
||
struct macro_table *t = file->table;
|
||
splay_tree_node n;
|
||
|
||
/* Construct a macro_key object, just for the query. */
|
||
struct macro_key query;
|
||
|
||
query.name = name;
|
||
query.start_file = file;
|
||
query.start_line = line;
|
||
query.end_file = NULL;
|
||
|
||
n = splay_tree_lookup (t->definitions, (splay_tree_key) &query);
|
||
if (! n)
|
||
{
|
||
/* It's okay for us to do two queries like this: the real work
|
||
of the searching is done when we splay, and splaying the tree
|
||
a second time at the same key is a constant time operation.
|
||
If this still bugs you, you could always just extend the
|
||
splay tree library with a predecessor-or-equal operation, and
|
||
use that. */
|
||
splay_tree_node pred = splay_tree_predecessor (t->definitions,
|
||
(splay_tree_key) &query);
|
||
|
||
if (pred)
|
||
{
|
||
/* Make sure this predecessor actually has the right name.
|
||
We just want to search within a given name's definitions. */
|
||
struct macro_key *found = (struct macro_key *) pred->key;
|
||
|
||
if (strcmp (found->name, name) == 0)
|
||
n = pred;
|
||
}
|
||
}
|
||
|
||
if (n)
|
||
{
|
||
struct macro_key *found = (struct macro_key *) n->key;
|
||
|
||
/* Okay, so this definition has the right name, and its scope
|
||
begins before the given source location. But does its scope
|
||
end after the given source location? */
|
||
if (compare_locations (file, line, found->end_file, found->end_line) < 0)
|
||
return n;
|
||
else
|
||
return 0;
|
||
}
|
||
else
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* If NAME already has a definition in scope at LINE in SOURCE, return
|
||
the key. If the old definition is different from the definition
|
||
given by KIND, ARGC, ARGV, and REPLACEMENT, complain, too.
|
||
Otherwise, return zero. (ARGC and ARGV are meaningless unless KIND
|
||
is `macro_function_like'.) */
|
||
static struct macro_key *
|
||
check_for_redefinition (struct macro_source_file *source, int line,
|
||
const char *name, enum macro_kind kind,
|
||
int argc, const char **argv,
|
||
const char *replacement)
|
||
{
|
||
splay_tree_node n = find_definition (name, source, line);
|
||
|
||
if (n)
|
||
{
|
||
struct macro_key *found_key = (struct macro_key *) n->key;
|
||
struct macro_definition *found_def
|
||
= (struct macro_definition *) n->value;
|
||
int same = 1;
|
||
|
||
/* Is this definition the same as the existing one?
|
||
According to the standard, this comparison needs to be done
|
||
on lists of tokens, not byte-by-byte, as we do here. But
|
||
that's too hard for us at the moment, and comparing
|
||
byte-by-byte will only yield false negatives (i.e., extra
|
||
warning messages), not false positives (i.e., unnoticed
|
||
definition changes). */
|
||
if (kind != found_def->kind)
|
||
same = 0;
|
||
else if (strcmp (replacement, found_def->replacement))
|
||
same = 0;
|
||
else if (kind == macro_function_like)
|
||
{
|
||
if (argc != found_def->argc)
|
||
same = 0;
|
||
else
|
||
{
|
||
int i;
|
||
|
||
for (i = 0; i < argc; i++)
|
||
if (strcmp (argv[i], found_def->argv[i]))
|
||
same = 0;
|
||
}
|
||
}
|
||
|
||
if (! same)
|
||
{
|
||
char *source_fullname, *found_key_fullname;
|
||
|
||
source_fullname = macro_source_fullname (source);
|
||
found_key_fullname = macro_source_fullname (found_key->start_file);
|
||
complaint (&symfile_complaints,
|
||
_("macro `%s' redefined at %s:%d; "
|
||
"original definition at %s:%d"),
|
||
name, source_fullname, line, found_key_fullname,
|
||
found_key->start_line);
|
||
xfree (found_key_fullname);
|
||
xfree (source_fullname);
|
||
}
|
||
|
||
return found_key;
|
||
}
|
||
else
|
||
return 0;
|
||
}
|
||
|
||
/* A helper function to define a new object-like macro. */
|
||
|
||
static void
|
||
macro_define_object_internal (struct macro_source_file *source, int line,
|
||
const char *name, const char *replacement,
|
||
enum macro_special_kind kind)
|
||
{
|
||
struct macro_table *t = source->table;
|
||
struct macro_key *k = NULL;
|
||
struct macro_definition *d;
|
||
|
||
if (! t->redef_ok)
|
||
k = check_for_redefinition (source, line,
|
||
name, macro_object_like,
|
||
0, 0,
|
||
replacement);
|
||
|
||
/* If we're redefining a symbol, and the existing key would be
|
||
identical to our new key, then the splay_tree_insert function
|
||
will try to delete the old definition. When the definition is
|
||
living on an obstack, this isn't a happy thing.
|
||
|
||
Since this only happens in the presence of questionable debug
|
||
info, we just ignore all definitions after the first. The only
|
||
case I know of where this arises is in GCC's output for
|
||
predefined macros, and all the definitions are the same in that
|
||
case. */
|
||
if (k && ! key_compare (k, name, source, line))
|
||
return;
|
||
|
||
k = new_macro_key (t, name, source, line);
|
||
d = new_macro_definition (t, macro_object_like, kind, 0, replacement);
|
||
splay_tree_insert (t->definitions, (splay_tree_key) k, (splay_tree_value) d);
|
||
}
|
||
|
||
void
|
||
macro_define_object (struct macro_source_file *source, int line,
|
||
const char *name, const char *replacement)
|
||
{
|
||
macro_define_object_internal (source, line, name, replacement,
|
||
macro_ordinary);
|
||
}
|
||
|
||
/* See macrotab.h. */
|
||
|
||
void
|
||
macro_define_special (struct macro_table *table)
|
||
{
|
||
macro_define_object_internal (table->main_source, -1, "__FILE__", "",
|
||
macro_FILE);
|
||
macro_define_object_internal (table->main_source, -1, "__LINE__", "",
|
||
macro_LINE);
|
||
}
|
||
|
||
void
|
||
macro_define_function (struct macro_source_file *source, int line,
|
||
const char *name, int argc, const char **argv,
|
||
const char *replacement)
|
||
{
|
||
struct macro_table *t = source->table;
|
||
struct macro_key *k = NULL;
|
||
struct macro_definition *d;
|
||
|
||
if (! t->redef_ok)
|
||
k = check_for_redefinition (source, line,
|
||
name, macro_function_like,
|
||
argc, argv,
|
||
replacement);
|
||
|
||
/* See comments about duplicate keys in macro_define_object. */
|
||
if (k && ! key_compare (k, name, source, line))
|
||
return;
|
||
|
||
/* We should also check here that all the argument names in ARGV are
|
||
distinct. */
|
||
|
||
k = new_macro_key (t, name, source, line);
|
||
d = new_macro_definition (t, macro_function_like, argc, argv, replacement);
|
||
splay_tree_insert (t->definitions, (splay_tree_key) k, (splay_tree_value) d);
|
||
}
|
||
|
||
|
||
void
|
||
macro_undef (struct macro_source_file *source, int line,
|
||
const char *name)
|
||
{
|
||
splay_tree_node n = find_definition (name, source, line);
|
||
|
||
if (n)
|
||
{
|
||
struct macro_key *key = (struct macro_key *) n->key;
|
||
|
||
/* If we're removing a definition at exactly the same point that
|
||
we defined it, then just delete the entry altogether. GCC
|
||
4.1.2 will generate DWARF that says to do this if you pass it
|
||
arguments like '-DFOO -UFOO -DFOO=2'. */
|
||
if (source == key->start_file
|
||
&& line == key->start_line)
|
||
splay_tree_remove (source->table->definitions, n->key);
|
||
|
||
else
|
||
{
|
||
/* This function is the only place a macro's end-of-scope
|
||
location gets set to anything other than "end of the
|
||
compilation unit" (i.e., end_file is zero). So if this
|
||
macro already has its end-of-scope set, then we're
|
||
probably seeing a second #undefinition for the same
|
||
#definition. */
|
||
if (key->end_file)
|
||
{
|
||
char *source_fullname, *key_fullname;
|
||
|
||
source_fullname = macro_source_fullname (source);
|
||
key_fullname = macro_source_fullname (key->end_file);
|
||
complaint (&symfile_complaints,
|
||
_("macro '%s' is #undefined twice,"
|
||
" at %s:%d and %s:%d"),
|
||
name, source_fullname, line, key_fullname,
|
||
key->end_line);
|
||
xfree (key_fullname);
|
||
xfree (source_fullname);
|
||
}
|
||
|
||
/* Whether or not we've seen a prior #undefinition, wipe out
|
||
the old ending point, and make this the ending point. */
|
||
key->end_file = source;
|
||
key->end_line = line;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
/* According to the ISO C standard, an #undef for a symbol that
|
||
has no macro definition in scope is ignored. So we should
|
||
ignore it too. */
|
||
#if 0
|
||
complaint (&symfile_complaints,
|
||
_("no definition for macro `%s' in scope to #undef at %s:%d"),
|
||
name, source->filename, line);
|
||
#endif
|
||
}
|
||
}
|
||
|
||
/* A helper function that rewrites the definition of a special macro,
|
||
when needed. */
|
||
|
||
static struct macro_definition *
|
||
fixup_definition (const char *filename, int line, struct macro_definition *def)
|
||
{
|
||
static char *saved_expansion;
|
||
|
||
if (saved_expansion)
|
||
{
|
||
xfree (saved_expansion);
|
||
saved_expansion = NULL;
|
||
}
|
||
|
||
if (def->kind == macro_object_like)
|
||
{
|
||
if (def->argc == macro_FILE)
|
||
{
|
||
saved_expansion = macro_stringify (filename);
|
||
def->replacement = saved_expansion;
|
||
}
|
||
else if (def->argc == macro_LINE)
|
||
{
|
||
saved_expansion = xstrprintf ("%d", line);
|
||
def->replacement = saved_expansion;
|
||
}
|
||
}
|
||
|
||
return def;
|
||
}
|
||
|
||
struct macro_definition *
|
||
macro_lookup_definition (struct macro_source_file *source,
|
||
int line, const char *name)
|
||
{
|
||
splay_tree_node n = find_definition (name, source, line);
|
||
|
||
if (n)
|
||
{
|
||
struct macro_definition *retval;
|
||
char *source_fullname;
|
||
|
||
source_fullname = macro_source_fullname (source);
|
||
retval = fixup_definition (source_fullname, line,
|
||
(struct macro_definition *) n->value);
|
||
xfree (source_fullname);
|
||
return retval;
|
||
}
|
||
else
|
||
return 0;
|
||
}
|
||
|
||
|
||
struct macro_source_file *
|
||
macro_definition_location (struct macro_source_file *source,
|
||
int line,
|
||
const char *name,
|
||
int *definition_line)
|
||
{
|
||
splay_tree_node n = find_definition (name, source, line);
|
||
|
||
if (n)
|
||
{
|
||
struct macro_key *key = (struct macro_key *) n->key;
|
||
|
||
*definition_line = key->start_line;
|
||
return key->start_file;
|
||
}
|
||
else
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* The type for callback data for iterating the splay tree in
|
||
macro_for_each and macro_for_each_in_scope. Only the latter uses
|
||
the FILE and LINE fields. */
|
||
struct macro_for_each_data
|
||
{
|
||
macro_callback_fn fn;
|
||
void *user_data;
|
||
struct macro_source_file *file;
|
||
int line;
|
||
};
|
||
|
||
/* Helper function for macro_for_each. */
|
||
static int
|
||
foreach_macro (splay_tree_node node, void *arg)
|
||
{
|
||
struct macro_for_each_data *datum = (struct macro_for_each_data *) arg;
|
||
struct macro_key *key = (struct macro_key *) node->key;
|
||
struct macro_definition *def;
|
||
char *key_fullname;
|
||
|
||
key_fullname = macro_source_fullname (key->start_file);
|
||
def = fixup_definition (key_fullname, key->start_line,
|
||
(struct macro_definition *) node->value);
|
||
xfree (key_fullname);
|
||
|
||
(*datum->fn) (key->name, def, key->start_file, key->start_line,
|
||
datum->user_data);
|
||
return 0;
|
||
}
|
||
|
||
/* Call FN for every macro in TABLE. */
|
||
void
|
||
macro_for_each (struct macro_table *table, macro_callback_fn fn,
|
||
void *user_data)
|
||
{
|
||
struct macro_for_each_data datum;
|
||
|
||
datum.fn = fn;
|
||
datum.user_data = user_data;
|
||
datum.file = NULL;
|
||
datum.line = 0;
|
||
splay_tree_foreach (table->definitions, foreach_macro, &datum);
|
||
}
|
||
|
||
static int
|
||
foreach_macro_in_scope (splay_tree_node node, void *info)
|
||
{
|
||
struct macro_for_each_data *datum = (struct macro_for_each_data *) info;
|
||
struct macro_key *key = (struct macro_key *) node->key;
|
||
struct macro_definition *def;
|
||
char *datum_fullname;
|
||
|
||
datum_fullname = macro_source_fullname (datum->file);
|
||
def = fixup_definition (datum_fullname, datum->line,
|
||
(struct macro_definition *) node->value);
|
||
xfree (datum_fullname);
|
||
|
||
/* See if this macro is defined before the passed-in line, and
|
||
extends past that line. */
|
||
if (compare_locations (key->start_file, key->start_line,
|
||
datum->file, datum->line) < 0
|
||
&& (!key->end_file
|
||
|| compare_locations (key->end_file, key->end_line,
|
||
datum->file, datum->line) >= 0))
|
||
(*datum->fn) (key->name, def, key->start_file, key->start_line,
|
||
datum->user_data);
|
||
return 0;
|
||
}
|
||
|
||
/* Call FN for every macro is visible in SCOPE. */
|
||
void
|
||
macro_for_each_in_scope (struct macro_source_file *file, int line,
|
||
macro_callback_fn fn, void *user_data)
|
||
{
|
||
struct macro_for_each_data datum;
|
||
|
||
datum.fn = fn;
|
||
datum.user_data = user_data;
|
||
datum.file = file;
|
||
datum.line = line;
|
||
splay_tree_foreach (file->table->definitions,
|
||
foreach_macro_in_scope, &datum);
|
||
}
|
||
|
||
|
||
|
||
/* Creating and freeing macro tables. */
|
||
|
||
|
||
struct macro_table *
|
||
new_macro_table (struct obstack *obstack, struct bcache *b,
|
||
struct compunit_symtab *cust)
|
||
{
|
||
struct macro_table *t;
|
||
|
||
/* First, get storage for the `struct macro_table' itself. */
|
||
if (obstack)
|
||
t = XOBNEW (obstack, struct macro_table);
|
||
else
|
||
t = XNEW (struct macro_table);
|
||
|
||
memset (t, 0, sizeof (*t));
|
||
t->obstack = obstack;
|
||
t->bcache = b;
|
||
t->main_source = NULL;
|
||
t->compunit_symtab = cust;
|
||
t->redef_ok = 0;
|
||
t->definitions = (splay_tree_new_with_allocator
|
||
(macro_tree_compare,
|
||
((splay_tree_delete_key_fn) macro_tree_delete_key),
|
||
((splay_tree_delete_value_fn) macro_tree_delete_value),
|
||
((splay_tree_allocate_fn) macro_alloc),
|
||
((splay_tree_deallocate_fn) macro_free),
|
||
t));
|
||
|
||
return t;
|
||
}
|
||
|
||
|
||
void
|
||
free_macro_table (struct macro_table *table)
|
||
{
|
||
/* Free the source file tree. */
|
||
free_macro_source_file (table->main_source);
|
||
|
||
/* Free the table of macro definitions. */
|
||
splay_tree_delete (table->definitions);
|
||
}
|
||
|
||
/* See macrotab.h for the comment. */
|
||
|
||
char *
|
||
macro_source_fullname (struct macro_source_file *file)
|
||
{
|
||
const char *comp_dir = NULL;
|
||
|
||
if (file->table->compunit_symtab != NULL)
|
||
comp_dir = COMPUNIT_DIRNAME (file->table->compunit_symtab);
|
||
|
||
if (comp_dir == NULL || IS_ABSOLUTE_PATH (file->filename))
|
||
return xstrdup (file->filename);
|
||
|
||
return concat (comp_dir, SLASH_STRING, file->filename, NULL);
|
||
}
|