mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +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.
492 lines
15 KiB
C
492 lines
15 KiB
C
/* Implement a cached obstack.
|
||
Written by Fred Fish <fnf@cygnus.com>
|
||
Rewritten by Jim Blandy <jimb@cygnus.com>
|
||
|
||
Copyright (C) 1999-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/>. */
|
||
|
||
#include "defs.h"
|
||
#include "gdb_obstack.h"
|
||
#include "bcache.h"
|
||
|
||
/* The type used to hold a single bcache string. The user data is
|
||
stored in d.data. Since it can be any type, it needs to have the
|
||
same alignment as the most strict alignment of any type on the host
|
||
machine. I don't know of any really correct way to do this in
|
||
stock ANSI C, so just do it the same way obstack.h does. */
|
||
|
||
struct bstring
|
||
{
|
||
/* Hash chain. */
|
||
struct bstring *next;
|
||
/* Assume the data length is no more than 64k. */
|
||
unsigned short length;
|
||
/* The half hash hack. This contains the upper 16 bits of the hash
|
||
value and is used as a pre-check when comparing two strings and
|
||
avoids the need to do length or memcmp calls. It proves to be
|
||
roughly 100% effective. */
|
||
unsigned short half_hash;
|
||
|
||
union
|
||
{
|
||
char data[1];
|
||
double dummy;
|
||
}
|
||
d;
|
||
};
|
||
|
||
|
||
/* The structure for a bcache itself. The bcache is initialized, in
|
||
bcache_xmalloc(), by filling it with zeros and then setting the
|
||
corresponding obstack's malloc() and free() methods. */
|
||
|
||
struct bcache
|
||
{
|
||
/* All the bstrings are allocated here. */
|
||
struct obstack cache;
|
||
|
||
/* How many hash buckets we're using. */
|
||
unsigned int num_buckets;
|
||
|
||
/* Hash buckets. This table is allocated using malloc, so when we
|
||
grow the table we can return the old table to the system. */
|
||
struct bstring **bucket;
|
||
|
||
/* Statistics. */
|
||
unsigned long unique_count; /* number of unique strings */
|
||
long total_count; /* total number of strings cached, including dups */
|
||
long unique_size; /* size of unique strings, in bytes */
|
||
long total_size; /* total number of bytes cached, including dups */
|
||
long structure_size; /* total size of bcache, including infrastructure */
|
||
/* Number of times that the hash table is expanded and hence
|
||
re-built, and the corresponding number of times that a string is
|
||
[re]hashed as part of entering it into the expanded table. The
|
||
total number of hashes can be computed by adding TOTAL_COUNT to
|
||
expand_hash_count. */
|
||
unsigned long expand_count;
|
||
unsigned long expand_hash_count;
|
||
/* Number of times that the half-hash compare hit (compare the upper
|
||
16 bits of hash values) hit, but the corresponding combined
|
||
length/data compare missed. */
|
||
unsigned long half_hash_miss_count;
|
||
|
||
/* Hash function to be used for this bcache object. */
|
||
unsigned long (*hash_function)(const void *addr, int length);
|
||
|
||
/* Compare function to be used for this bcache object. */
|
||
int (*compare_function)(const void *, const void *, int length);
|
||
};
|
||
|
||
/* The old hash function was stolen from SDBM. This is what DB 3.0
|
||
uses now, and is better than the old one. */
|
||
|
||
unsigned long
|
||
hash(const void *addr, int length)
|
||
{
|
||
return hash_continue (addr, length, 0);
|
||
}
|
||
|
||
/* Continue the calculation of the hash H at the given address. */
|
||
|
||
unsigned long
|
||
hash_continue (const void *addr, int length, unsigned long h)
|
||
{
|
||
const unsigned char *k, *e;
|
||
|
||
k = (const unsigned char *)addr;
|
||
e = k+length;
|
||
for (; k< e;++k)
|
||
{
|
||
h *=16777619;
|
||
h ^= *k;
|
||
}
|
||
return (h);
|
||
}
|
||
|
||
/* Growing the bcache's hash table. */
|
||
|
||
/* If the average chain length grows beyond this, then we want to
|
||
resize our hash table. */
|
||
#define CHAIN_LENGTH_THRESHOLD (5)
|
||
|
||
static void
|
||
expand_hash_table (struct bcache *bcache)
|
||
{
|
||
/* A table of good hash table sizes. Whenever we grow, we pick the
|
||
next larger size from this table. sizes[i] is close to 1 << (i+10),
|
||
so we roughly double the table size each time. After we fall off
|
||
the end of this table, we just double. Don't laugh --- there have
|
||
been executables sighted with a gigabyte of debug info. */
|
||
static unsigned long sizes[] = {
|
||
1021, 2053, 4099, 8191, 16381, 32771,
|
||
65537, 131071, 262144, 524287, 1048573, 2097143,
|
||
4194301, 8388617, 16777213, 33554467, 67108859, 134217757,
|
||
268435459, 536870923, 1073741827, 2147483659UL
|
||
};
|
||
unsigned int new_num_buckets;
|
||
struct bstring **new_buckets;
|
||
unsigned int i;
|
||
|
||
/* Count the stats. Every unique item needs to be re-hashed and
|
||
re-entered. */
|
||
bcache->expand_count++;
|
||
bcache->expand_hash_count += bcache->unique_count;
|
||
|
||
/* Find the next size. */
|
||
new_num_buckets = bcache->num_buckets * 2;
|
||
for (i = 0; i < (sizeof (sizes) / sizeof (sizes[0])); i++)
|
||
if (sizes[i] > bcache->num_buckets)
|
||
{
|
||
new_num_buckets = sizes[i];
|
||
break;
|
||
}
|
||
|
||
/* Allocate the new table. */
|
||
{
|
||
size_t new_size = new_num_buckets * sizeof (new_buckets[0]);
|
||
|
||
new_buckets = (struct bstring **) xmalloc (new_size);
|
||
memset (new_buckets, 0, new_size);
|
||
|
||
bcache->structure_size -= (bcache->num_buckets
|
||
* sizeof (bcache->bucket[0]));
|
||
bcache->structure_size += new_size;
|
||
}
|
||
|
||
/* Rehash all existing strings. */
|
||
for (i = 0; i < bcache->num_buckets; i++)
|
||
{
|
||
struct bstring *s, *next;
|
||
|
||
for (s = bcache->bucket[i]; s; s = next)
|
||
{
|
||
struct bstring **new_bucket;
|
||
next = s->next;
|
||
|
||
new_bucket = &new_buckets[(bcache->hash_function (&s->d.data,
|
||
s->length)
|
||
% new_num_buckets)];
|
||
s->next = *new_bucket;
|
||
*new_bucket = s;
|
||
}
|
||
}
|
||
|
||
/* Plug in the new table. */
|
||
if (bcache->bucket)
|
||
xfree (bcache->bucket);
|
||
bcache->bucket = new_buckets;
|
||
bcache->num_buckets = new_num_buckets;
|
||
}
|
||
|
||
|
||
/* Looking up things in the bcache. */
|
||
|
||
/* The number of bytes needed to allocate a struct bstring whose data
|
||
is N bytes long. */
|
||
#define BSTRING_SIZE(n) (offsetof (struct bstring, d.data) + (n))
|
||
|
||
/* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has
|
||
never seen those bytes before, add a copy of them to BCACHE. In
|
||
either case, return a pointer to BCACHE's copy of that string. */
|
||
const void *
|
||
bcache (const void *addr, int length, struct bcache *cache)
|
||
{
|
||
return bcache_full (addr, length, cache, NULL);
|
||
}
|
||
|
||
/* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has
|
||
never seen those bytes before, add a copy of them to BCACHE. In
|
||
either case, return a pointer to BCACHE's copy of that string. If
|
||
optional ADDED is not NULL, return 1 in case of new entry or 0 if
|
||
returning an old entry. */
|
||
|
||
const void *
|
||
bcache_full (const void *addr, int length, struct bcache *bcache, int *added)
|
||
{
|
||
unsigned long full_hash;
|
||
unsigned short half_hash;
|
||
int hash_index;
|
||
struct bstring *s;
|
||
|
||
if (added)
|
||
*added = 0;
|
||
|
||
/* Lazily initialize the obstack. This can save quite a bit of
|
||
memory in some cases. */
|
||
if (bcache->total_count == 0)
|
||
{
|
||
/* We could use obstack_specify_allocation here instead, but
|
||
gdb_obstack.h specifies the allocation/deallocation
|
||
functions. */
|
||
obstack_init (&bcache->cache);
|
||
}
|
||
|
||
/* If our average chain length is too high, expand the hash table. */
|
||
if (bcache->unique_count >= bcache->num_buckets * CHAIN_LENGTH_THRESHOLD)
|
||
expand_hash_table (bcache);
|
||
|
||
bcache->total_count++;
|
||
bcache->total_size += length;
|
||
|
||
full_hash = bcache->hash_function (addr, length);
|
||
|
||
half_hash = (full_hash >> 16);
|
||
hash_index = full_hash % bcache->num_buckets;
|
||
|
||
/* Search the hash bucket for a string identical to the caller's.
|
||
As a short-circuit first compare the upper part of each hash
|
||
values. */
|
||
for (s = bcache->bucket[hash_index]; s; s = s->next)
|
||
{
|
||
if (s->half_hash == half_hash)
|
||
{
|
||
if (s->length == length
|
||
&& bcache->compare_function (&s->d.data, addr, length))
|
||
return &s->d.data;
|
||
else
|
||
bcache->half_hash_miss_count++;
|
||
}
|
||
}
|
||
|
||
/* The user's string isn't in the list. Insert it after *ps. */
|
||
{
|
||
struct bstring *newobj
|
||
= (struct bstring *) obstack_alloc (&bcache->cache,
|
||
BSTRING_SIZE (length));
|
||
|
||
memcpy (&newobj->d.data, addr, length);
|
||
newobj->length = length;
|
||
newobj->next = bcache->bucket[hash_index];
|
||
newobj->half_hash = half_hash;
|
||
bcache->bucket[hash_index] = newobj;
|
||
|
||
bcache->unique_count++;
|
||
bcache->unique_size += length;
|
||
bcache->structure_size += BSTRING_SIZE (length);
|
||
|
||
if (added)
|
||
*added = 1;
|
||
|
||
return &newobj->d.data;
|
||
}
|
||
}
|
||
|
||
|
||
/* Compare the byte string at ADDR1 of lenght LENGHT to the
|
||
string at ADDR2. Return 1 if they are equal. */
|
||
|
||
static int
|
||
bcache_compare (const void *addr1, const void *addr2, int length)
|
||
{
|
||
return memcmp (addr1, addr2, length) == 0;
|
||
}
|
||
|
||
/* Allocating and freeing bcaches. */
|
||
|
||
/* Allocated a bcache. HASH_FUNCTION and COMPARE_FUNCTION can be used
|
||
to pass in custom hash, and compare functions to be used by this
|
||
bcache. If HASH_FUNCTION is NULL hash() is used and if
|
||
COMPARE_FUNCTION is NULL memcmp() is used. */
|
||
|
||
struct bcache *
|
||
bcache_xmalloc (unsigned long (*hash_function)(const void *, int length),
|
||
int (*compare_function)(const void *,
|
||
const void *,
|
||
int length))
|
||
{
|
||
/* Allocate the bcache pre-zeroed. */
|
||
struct bcache *b = XCNEW (struct bcache);
|
||
|
||
if (hash_function)
|
||
b->hash_function = hash_function;
|
||
else
|
||
b->hash_function = hash;
|
||
|
||
if (compare_function)
|
||
b->compare_function = compare_function;
|
||
else
|
||
b->compare_function = bcache_compare;
|
||
return b;
|
||
}
|
||
|
||
/* Free all the storage associated with BCACHE. */
|
||
void
|
||
bcache_xfree (struct bcache *bcache)
|
||
{
|
||
if (bcache == NULL)
|
||
return;
|
||
/* Only free the obstack if we actually initialized it. */
|
||
if (bcache->total_count > 0)
|
||
obstack_free (&bcache->cache, 0);
|
||
xfree (bcache->bucket);
|
||
xfree (bcache);
|
||
}
|
||
|
||
|
||
|
||
/* Printing statistics. */
|
||
|
||
static void
|
||
print_percentage (int portion, int total)
|
||
{
|
||
if (total == 0)
|
||
/* i18n: Like "Percentage of duplicates, by count: (not applicable)". */
|
||
printf_filtered (_("(not applicable)\n"));
|
||
else
|
||
printf_filtered ("%3d%%\n", (int) (portion * 100.0 / total));
|
||
}
|
||
|
||
|
||
/* Print statistics on BCACHE's memory usage and efficacity at
|
||
eliminating duplication. NAME should describe the kind of data
|
||
BCACHE holds. Statistics are printed using `printf_filtered' and
|
||
its ilk. */
|
||
void
|
||
print_bcache_statistics (struct bcache *c, char *type)
|
||
{
|
||
int occupied_buckets;
|
||
int max_chain_length;
|
||
int median_chain_length;
|
||
int max_entry_size;
|
||
int median_entry_size;
|
||
|
||
/* Count the number of occupied buckets, tally the various string
|
||
lengths, and measure chain lengths. */
|
||
{
|
||
unsigned int b;
|
||
int *chain_length = XCNEWVEC (int, c->num_buckets + 1);
|
||
int *entry_size = XCNEWVEC (int, c->unique_count + 1);
|
||
int stringi = 0;
|
||
|
||
occupied_buckets = 0;
|
||
|
||
for (b = 0; b < c->num_buckets; b++)
|
||
{
|
||
struct bstring *s = c->bucket[b];
|
||
|
||
chain_length[b] = 0;
|
||
|
||
if (s)
|
||
{
|
||
occupied_buckets++;
|
||
|
||
while (s)
|
||
{
|
||
gdb_assert (b < c->num_buckets);
|
||
chain_length[b]++;
|
||
gdb_assert (stringi < c->unique_count);
|
||
entry_size[stringi++] = s->length;
|
||
s = s->next;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* To compute the median, we need the set of chain lengths
|
||
sorted. */
|
||
qsort (chain_length, c->num_buckets, sizeof (chain_length[0]),
|
||
compare_positive_ints);
|
||
qsort (entry_size, c->unique_count, sizeof (entry_size[0]),
|
||
compare_positive_ints);
|
||
|
||
if (c->num_buckets > 0)
|
||
{
|
||
max_chain_length = chain_length[c->num_buckets - 1];
|
||
median_chain_length = chain_length[c->num_buckets / 2];
|
||
}
|
||
else
|
||
{
|
||
max_chain_length = 0;
|
||
median_chain_length = 0;
|
||
}
|
||
if (c->unique_count > 0)
|
||
{
|
||
max_entry_size = entry_size[c->unique_count - 1];
|
||
median_entry_size = entry_size[c->unique_count / 2];
|
||
}
|
||
else
|
||
{
|
||
max_entry_size = 0;
|
||
median_entry_size = 0;
|
||
}
|
||
|
||
xfree (chain_length);
|
||
xfree (entry_size);
|
||
}
|
||
|
||
printf_filtered (_(" Cached '%s' statistics:\n"), type);
|
||
printf_filtered (_(" Total object count: %ld\n"), c->total_count);
|
||
printf_filtered (_(" Unique object count: %lu\n"), c->unique_count);
|
||
printf_filtered (_(" Percentage of duplicates, by count: "));
|
||
print_percentage (c->total_count - c->unique_count, c->total_count);
|
||
printf_filtered ("\n");
|
||
|
||
printf_filtered (_(" Total object size: %ld\n"), c->total_size);
|
||
printf_filtered (_(" Unique object size: %ld\n"), c->unique_size);
|
||
printf_filtered (_(" Percentage of duplicates, by size: "));
|
||
print_percentage (c->total_size - c->unique_size, c->total_size);
|
||
printf_filtered ("\n");
|
||
|
||
printf_filtered (_(" Max entry size: %d\n"), max_entry_size);
|
||
printf_filtered (_(" Average entry size: "));
|
||
if (c->unique_count > 0)
|
||
printf_filtered ("%ld\n", c->unique_size / c->unique_count);
|
||
else
|
||
/* i18n: "Average entry size: (not applicable)". */
|
||
printf_filtered (_("(not applicable)\n"));
|
||
printf_filtered (_(" Median entry size: %d\n"), median_entry_size);
|
||
printf_filtered ("\n");
|
||
|
||
printf_filtered (_(" \
|
||
Total memory used by bcache, including overhead: %ld\n"),
|
||
c->structure_size);
|
||
printf_filtered (_(" Percentage memory overhead: "));
|
||
print_percentage (c->structure_size - c->unique_size, c->unique_size);
|
||
printf_filtered (_(" Net memory savings: "));
|
||
print_percentage (c->total_size - c->structure_size, c->total_size);
|
||
printf_filtered ("\n");
|
||
|
||
printf_filtered (_(" Hash table size: %3d\n"),
|
||
c->num_buckets);
|
||
printf_filtered (_(" Hash table expands: %lu\n"),
|
||
c->expand_count);
|
||
printf_filtered (_(" Hash table hashes: %lu\n"),
|
||
c->total_count + c->expand_hash_count);
|
||
printf_filtered (_(" Half hash misses: %lu\n"),
|
||
c->half_hash_miss_count);
|
||
printf_filtered (_(" Hash table population: "));
|
||
print_percentage (occupied_buckets, c->num_buckets);
|
||
printf_filtered (_(" Median hash chain length: %3d\n"),
|
||
median_chain_length);
|
||
printf_filtered (_(" Average hash chain length: "));
|
||
if (c->num_buckets > 0)
|
||
printf_filtered ("%3lu\n", c->unique_count / c->num_buckets);
|
||
else
|
||
/* i18n: "Average hash chain length: (not applicable)". */
|
||
printf_filtered (_("(not applicable)\n"));
|
||
printf_filtered (_(" Maximum hash chain length: %3d\n"),
|
||
max_chain_length);
|
||
printf_filtered ("\n");
|
||
}
|
||
|
||
int
|
||
bcache_memory_used (struct bcache *bcache)
|
||
{
|
||
if (bcache->total_count == 0)
|
||
return 0;
|
||
return obstack_memory_used (&bcache->cache);
|
||
}
|