9a3c826307
Note: I needed to split this patch in two, otherwise it's too big for the mailing list. This patch adds explicit casts to situations where a void pointer is assigned to a pointer to the "real" type. Building in C++ mode requires those assignments to use an explicit cast. This includes, for example: - callback arguments (cleanups, comparison functions, ...) - data attached to some object (objfile, program space, etc) in the form of a void pointer - "user data" passed to some function This patch comes from the commit "(mostly) auto-generated patch to insert casts needed for C++", taken from Pedro's C++ branch. Only files built on x86 with --enable-targets=all are modified, so the native files for other arches will need to be dealt with separately. I built-tested this with --enable-targets=all and reg-tested. To my surprise, a test case (selftest.exp) had to be adjusted. Here's the ChangeLog entry. Again, this was relatively quick to make despite the length, thanks to David Malcom's script, although I don't believe it's very useful information in that particular case... gdb/ChangeLog: * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. * ada-lang.c (ada_inferior_data_cleanup): Likewise. (get_ada_inferior_data): Likewise. (get_ada_pspace_data): Likewise. (ada_pspace_data_cleanup): Likewise. (ada_complete_symbol_matcher): Likewise. (ada_exc_search_name_matches): Likewise. * ada-tasks.c (get_ada_tasks_pspace_data): Likewise. (get_ada_tasks_inferior_data): Likewise. * addrmap.c (addrmap_mutable_foreach_worker): Likewise. (splay_obstack_alloc): Likewise. (splay_obstack_free): Likewise. * alpha-linux-tdep.c (alpha_linux_supply_gregset): Likewise. (alpha_linux_collect_gregset): Likewise. (alpha_linux_supply_fpregset): Likewise. (alpha_linux_collect_fpregset): Likewise. * alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise. * alpha-tdep.c (alpha_lds): Likewise. (alpha_sts): Likewise. (alpha_sigtramp_frame_unwind_cache): Likewise. (alpha_heuristic_frame_unwind_cache): Likewise. (alpha_supply_int_regs): Likewise. (alpha_fill_int_regs): Likewise. (alpha_supply_fp_regs): Likewise. (alpha_fill_fp_regs): Likewise. * alphanbsd-tdep.c (alphanbsd_supply_fpregset): Likewise. (alphanbsd_aout_supply_gregset): Likewise. (alphanbsd_supply_gregset): Likewise. * amd64-linux-tdep.c (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-nat.c (amd64_supply_native_gregset): Likewise. (amd64_collect_native_gregset): Likewise. * amd64-tdep.c (amd64_frame_cache): Likewise. (amd64_sigtramp_frame_cache): Likewise. (amd64_epilogue_frame_cache): Likewise. (amd64_supply_fxsave): Likewise. (amd64_supply_xsave): Likewise. (amd64_collect_fxsave): Likewise. (amd64_collect_xsave): Likewise. * amd64-windows-tdep.c (amd64_windows_frame_cache): Likewise. * amd64obsd-tdep.c (amd64obsd_trapframe_cache): Likewise. * arm-linux-tdep.c (arm_linux_supply_gregset): Likewise. (arm_linux_collect_gregset): Likewise. (arm_linux_supply_nwfpe): Likewise. (arm_linux_collect_nwfpe): Likewise. (arm_linux_supply_vfp): Likewise. (arm_linux_collect_vfp): Likewise. * arm-tdep.c (arm_find_mapping_symbol): Likewise. (arm_prologue_unwind_stop_reason): Likewise. (arm_prologue_this_id): Likewise. (arm_prologue_prev_register): Likewise. (arm_exidx_data_free): Likewise. (arm_find_exidx_entry): Likewise. (arm_stub_this_id): Likewise. (arm_m_exception_this_id): Likewise. (arm_m_exception_prev_register): Likewise. (arm_normal_frame_base): Likewise. (gdb_print_insn_arm): Likewise. (arm_objfile_data_free): Likewise. (arm_record_special_symbol): Likewise. (value_of_arm_user_reg): Likewise. * armbsd-tdep.c (armbsd_supply_fpregset): Likewise. (armbsd_supply_gregset): Likewise. * auto-load.c (auto_load_pspace_data_cleanup): Likewise. (get_auto_load_pspace_data): Likewise. (hash_loaded_script_entry): Likewise. (eq_loaded_script_entry): Likewise. (clear_section_scripts): Likewise. (collect_matching_scripts): Likewise. * auxv.c (auxv_inferior_data_cleanup): Likewise. (get_auxv_inferior_data): Likewise. * avr-tdep.c (avr_frame_unwind_cache): Likewise. * ax-general.c (do_free_agent_expr_cleanup): Likewise. * bfd-target.c (target_bfd_xfer_partial): Likewise. (target_bfd_xclose): Likewise. (target_bfd_get_section_table): Likewise. * bfin-tdep.c (bfin_frame_cache): Likewise. * block.c (find_block_in_blockvector): Likewise. (call_site_for_pc): Likewise. (block_find_non_opaque_type_preferred): Likewise. * break-catch-sig.c (signal_catchpoint_insert_location): Likewise. (signal_catchpoint_remove_location): Likewise. (signal_catchpoint_breakpoint_hit): Likewise. (signal_catchpoint_print_one): Likewise. (signal_catchpoint_print_mention): Likewise. (signal_catchpoint_print_recreate): Likewise. * break-catch-syscall.c (get_catch_syscall_inferior_data): Likewise. * breakpoint.c (do_cleanup_counted_command_line): Likewise. (bp_location_compare_addrs): Likewise. (get_first_locp_gte_addr): Likewise. (check_tracepoint_command): Likewise. (do_map_commands_command): Likewise. (get_breakpoint_objfile_data): Likewise. (free_breakpoint_probes): Likewise. (do_captured_breakpoint_query): Likewise. (compare_breakpoints): Likewise. (bp_location_compare): Likewise. (bpstat_remove_breakpoint_callback): Likewise. (do_delete_breakpoint_cleanup): Likewise. * bsd-uthread.c (bsd_uthread_set_supply_uthread): Likewise. (bsd_uthread_set_collect_uthread): Likewise. (bsd_uthread_activate): Likewise. (bsd_uthread_fetch_registers): Likewise. (bsd_uthread_store_registers): Likewise. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt_raw): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. (do_btrace_data_cleanup): Likewise. * c-typeprint.c (find_typedef_for_canonicalize): Likewise. * charset.c (cleanup_iconv): Likewise. (do_cleanup_iterator): Likewise. * cli-out.c (cli_uiout_dtor): Likewise. (cli_table_begin): Likewise. (cli_table_body): Likewise. (cli_table_end): Likewise. (cli_table_header): Likewise. (cli_begin): Likewise. (cli_end): Likewise. (cli_field_int): Likewise. (cli_field_skip): Likewise. (cli_field_string): Likewise. (cli_field_fmt): Likewise. (cli_spaces): Likewise. (cli_text): Likewise. (cli_message): Likewise. (cli_wrap_hint): Likewise. (cli_flush): Likewise. (cli_redirect): Likewise. (out_field_fmt): Likewise. (field_separator): Likewise. (cli_out_set_stream): Likewise. * cli/cli-cmds.c (compare_symtabs): Likewise. * cli/cli-dump.c (call_dump_func): Likewise. (restore_section_callback): Likewise. * cli/cli-script.c (clear_hook_in_cleanup): Likewise. (do_restore_user_call_depth): Likewise. (do_free_command_lines_cleanup): Likewise. * coff-pe-read.c (get_section_vmas): Likewise. (pe_as16): Likewise. (pe_as32): Likewise. * coffread.c (coff_symfile_read): Likewise. * common/agent.c (agent_look_up_symbols): Likewise. * common/filestuff.c (do_close_cleanup): Likewise. * common/format.c (free_format_pieces_cleanup): Likewise. * common/vec.c (vec_o_reserve): Likewise. * compile/compile-c-support.c (print_one_macro): Likewise. * compile/compile-c-symbols.c (hash_symbol_error): Likewise. (eq_symbol_error): Likewise. (del_symbol_error): Likewise. (error_symbol_once): Likewise. (gcc_convert_symbol): Likewise. (gcc_symbol_address): Likewise. (hash_symname): Likewise. (eq_symname): Likewise. * compile/compile-c-types.c (hash_type_map_instance): Likewise. (eq_type_map_instance): Likewise. (insert_type): Likewise. (convert_type): Likewise. * compile/compile-object-load.c (munmap_listp_free_cleanup): Likewise. (setup_sections): Likewise. (link_hash_table_free): Likewise. (copy_sections): Likewise. * compile/compile-object-run.c (do_module_cleanup): Likewise. * compile/compile.c (compile_print_value): Likewise. (do_rmdir): Likewise. (cleanup_compile_instance): Likewise. (cleanup_unlink_file): Likewise. * completer.c (free_completion_tracker): Likewise. * corelow.c (add_to_spuid_list): Likewise. * cp-namespace.c (reset_directive_searched): Likewise. * cp-support.c (reset_directive_searched): Likewise. * cris-tdep.c (cris_sigtramp_frame_unwind_cache): Likewise. (cris_frame_unwind_cache): Likewise. * d-lang.c (builtin_d_type): Likewise. * d-namespace.c (reset_directive_searched): Likewise. * dbxread.c (dbx_free_symfile_info): Likewise. (do_free_bincl_list_cleanup): Likewise. * disasm.c (hash_dis_line_entry): Likewise. (eq_dis_line_entry): Likewise. (dis_asm_print_address): Likewise. (fprintf_disasm): Likewise. (do_ui_file_delete): Likewise. * doublest.c (convert_floatformat_to_doublest): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Likewise. (dummy_frame_prev_register): Likewise. (dummy_frame_this_id): Likewise. * dwarf2-frame-tailcall.c (cache_hash): Likewise. (cache_eq): Likewise. (cache_find): Likewise. (tailcall_frame_this_id): Likewise. (dwarf2_tailcall_prev_register_first): Likewise. (tailcall_frame_prev_register): Likewise. (tailcall_frame_dealloc_cache): Likewise. (tailcall_frame_prev_arch): Likewise. * dwarf2-frame.c (dwarf2_frame_state_free): Likewise. (dwarf2_frame_set_init_reg): Likewise. (dwarf2_frame_init_reg): Likewise. (dwarf2_frame_set_signal_frame_p): Likewise. (dwarf2_frame_signal_frame_p): Likewise. (dwarf2_frame_set_adjust_regnum): Likewise. (dwarf2_frame_adjust_regnum): Likewise. (clear_pointer_cleanup): Likewise. (dwarf2_frame_cache): Likewise. (find_cie): Likewise. (dwarf2_frame_find_fde): Likewise. * dwarf2expr.c (dwarf_expr_address_type): Likewise. (free_dwarf_expr_context_cleanup): Likewise. * dwarf2loc.c (locexpr_find_frame_base_location): Likewise. (locexpr_get_frame_base): Likewise. (loclist_find_frame_base_location): Likewise. (loclist_get_frame_base): Likewise. (dwarf_expr_dwarf_call): Likewise. (dwarf_expr_get_base_type): Likewise. (dwarf_expr_push_dwarf_reg_entry_value): Likewise. (dwarf_expr_get_obj_addr): Likewise. (entry_data_value_coerce_ref): Likewise. (entry_data_value_copy_closure): Likewise. (entry_data_value_free_closure): Likewise. (get_frame_address_in_block_wrapper): Likewise. (dwarf2_evaluate_property): Likewise. (dwarf2_compile_property_to_c): Likewise. (needs_frame_read_addr_from_reg): Likewise. (needs_frame_get_reg_value): Likewise. (needs_frame_frame_base): Likewise. (needs_frame_frame_cfa): Likewise. (needs_frame_tls_address): Likewise. (needs_frame_dwarf_call): Likewise. (needs_dwarf_reg_entry_value): Likewise. (get_ax_pc): Likewise. (locexpr_read_variable): Likewise. (locexpr_read_variable_at_entry): Likewise. (locexpr_read_needs_frame): Likewise. (locexpr_describe_location): Likewise. (locexpr_tracepoint_var_ref): Likewise. (locexpr_generate_c_location): Likewise. (loclist_read_variable): Likewise. (loclist_read_variable_at_entry): Likewise. (loclist_describe_location): Likewise. (loclist_tracepoint_var_ref): Likewise. (loclist_generate_c_location): Likewise. * dwarf2read.c (line_header_hash_voidp): Likewise. (line_header_eq_voidp): Likewise. (dwarf2_has_info): Likewise. (dwarf2_get_section_info): Likewise. (locate_dwz_sections): Likewise. (hash_file_name_entry): Likewise. (eq_file_name_entry): Likewise. (delete_file_name_entry): Likewise. (dw2_setup): Likewise. (dw2_get_file_names_reader): Likewise. (dw2_find_pc_sect_compunit_symtab): Likewise. (hash_signatured_type): Likewise. (eq_signatured_type): Likewise. (add_signatured_type_cu_to_table): Likewise. (create_debug_types_hash_table): Likewise. (lookup_dwo_signatured_type): Likewise. (lookup_dwp_signatured_type): Likewise. (lookup_signatured_type): Likewise. (hash_type_unit_group): Likewise. (eq_type_unit_group): Likewise. (get_type_unit_group): Likewise. (process_psymtab_comp_unit_reader): Likewise. (sort_tu_by_abbrev_offset): Likewise. (process_skeletonless_type_unit): Likewise. (psymtabs_addrmap_cleanup): Likewise. (dwarf2_read_symtab): Likewise. (psymtab_to_symtab_1): Likewise. (die_hash): Likewise. (die_eq): Likewise. (load_full_comp_unit_reader): Likewise. (reset_die_in_process): Likewise. (free_cu_line_header): Likewise. (handle_DW_AT_stmt_list): Likewise. (hash_dwo_file): Likewise. (eq_dwo_file): Likewise. (hash_dwo_unit): Likewise. (eq_dwo_unit): Likewise. (create_dwo_cu_reader): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (lookup_dwo_unit_in_dwp): Likewise. (dwarf2_locate_dwo_sections): Likewise. (dwarf2_locate_common_dwp_sections): Likewise. (dwarf2_locate_v2_dwp_sections): Likewise. (hash_dwp_loaded_cutus): Likewise. (eq_dwp_loaded_cutus): Likewise. (lookup_dwo_cutu): Likewise. (abbrev_table_free_cleanup): Likewise. (dwarf2_free_abbrev_table): Likewise. (find_partial_die_in_comp_unit): Likewise. (free_line_header_voidp): Likewise. (follow_die_offset): Likewise. (follow_die_sig_1): Likewise. (free_heap_comp_unit): Likewise. (free_stack_comp_unit): Likewise. (dwarf2_free_objfile): Likewise. (per_cu_offset_and_type_hash): Likewise. (per_cu_offset_and_type_eq): Likewise. (get_die_type_at_offset): Likewise. (partial_die_hash): Likewise. (partial_die_eq): Likewise. (dwarf2_per_objfile_free): Likewise. (hash_strtab_entry): Likewise. (eq_strtab_entry): Likewise. (add_string): Likewise. (hash_symtab_entry): Likewise. (eq_symtab_entry): Likewise. (delete_symtab_entry): Likewise. (cleanup_mapped_symtab): Likewise. (add_indices_to_cpool): Likewise. (hash_psymtab_cu_index): Likewise. (eq_psymtab_cu_index): Likewise. (add_address_entry_worker): Likewise. (unlink_if_set): Likewise. (write_one_signatured_type): Likewise. (save_gdb_index_command): Likewise. * elfread.c (elf_symtab_read): Likewise. (elf_gnu_ifunc_cache_hash): Likewise. (elf_gnu_ifunc_cache_eq): Likewise. (elf_gnu_ifunc_record_cache): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_get_probes): Likewise. (probe_key_free): Likewise. * f-lang.c (builtin_f_type): Likewise. * frame-base.c (frame_base_append_sniffer): Likewise. (frame_base_set_default): Likewise. (frame_base_find_by_frame): Likewise. * frame-unwind.c (frame_unwind_prepend_unwinder): Likewise. (frame_unwind_append_unwinder): Likewise. (frame_unwind_find_by_frame): Likewise. * frame.c (frame_addr_hash): Likewise. (frame_addr_hash_eq): Likewise. (frame_stash_find): Likewise. (do_frame_register_read): Likewise. (unwind_to_current_frame): Likewise. (frame_cleanup_after_sniffer): Likewise. * frv-linux-tdep.c (frv_linux_sigtramp_frame_cache): Likewise. * frv-tdep.c (frv_frame_unwind_cache): Likewise. * ft32-tdep.c (ft32_frame_cache): Likewise. * gcore.c (do_bfd_delete_cleanup): Likewise. (gcore_create_callback): Likewise. * gdb_bfd.c (hash_bfd): Likewise. (eq_bfd): Likewise. (gdb_bfd_open): Likewise. (free_one_bfd_section): Likewise. (gdb_bfd_ref): Likewise. (gdb_bfd_unref): Likewise. (get_section_descriptor): Likewise. (gdb_bfd_map_section): Likewise. (gdb_bfd_crc): Likewise. (gdb_bfd_mark_parent): Likewise. (gdb_bfd_record_inclusion): Likewise. (gdb_bfd_requires_relocations): Likewise. (print_one_bfd): Likewise. * gdbtypes.c (type_pair_hash): Likewise. (type_pair_eq): Likewise. (builtin_type): Likewise. (objfile_type): Likewise. * gnu-v3-abi.c (vtable_ptrdiff_type): Likewise. (vtable_address_point_offset): Likewise. (gnuv3_get_vtable): Likewise. (hash_value_and_voffset): Likewise. (eq_value_and_voffset): Likewise. (compare_value_and_voffset): Likewise. (compute_vtable_size): Likewise. (gnuv3_get_typeid_type): Likewise. * go-lang.c (builtin_go_type): Likewise. * guile/scm-block.c (bkscm_hash_block_smob): Likewise. (bkscm_eq_block_smob): Likewise. (bkscm_objfile_block_map): Likewise. (bkscm_del_objfile_blocks): Likewise. * guile/scm-breakpoint.c (bpscm_build_bp_list): Likewise. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Likewise. (gdbscm_disasm_print_address): Likewise. * guile/scm-frame.c (frscm_hash_frame_smob): Likewise. (frscm_eq_frame_smob): Likewise. (frscm_inferior_frame_map): Likewise. (frscm_del_inferior_frames): Likewise. * guile/scm-gsmob.c (gdbscm_add_objfile_ref): Likewise. * guile/scm-objfile.c (ofscm_handle_objfile_deleted): Likewise. (ofscm_objfile_smob_from_objfile): Likewise. * guile/scm-ports.c (ioscm_write): Likewise. (ioscm_file_port_delete): Likewise. (ioscm_file_port_rewind): Likewise. (ioscm_file_port_put): Likewise. (ioscm_file_port_write): Likewise. * guile/scm-progspace.c (psscm_handle_pspace_deleted): Likewise. (psscm_pspace_smob_from_pspace): Likewise. * guile/scm-safe-call.c (scscm_recording_pre_unwind_handler): Likewise. (scscm_recording_unwind_handler): Likewise. (gdbscm_with_catch): Likewise. (scscm_call_0_body): Likewise. (scscm_call_1_body): Likewise. (scscm_call_2_body): Likewise. (scscm_call_3_body): Likewise. (scscm_call_4_body): Likewise. (scscm_apply_1_body): Likewise. (scscm_eval_scheme_string): Likewise. (gdbscm_safe_eval_string): Likewise. (scscm_source_scheme_script): Likewise. (gdbscm_safe_source_script): Likewise. * guile/scm-string.c (gdbscm_call_scm_to_stringn): Likewise. (gdbscm_call_scm_from_stringn): Likewise. * guile/scm-symbol.c (syscm_hash_symbol_smob): Likewise. (syscm_eq_symbol_smob): Likewise. (syscm_get_symbol_map): Likewise. (syscm_del_objfile_symbols): Likewise. * guile/scm-symtab.c (stscm_hash_symtab_smob): Likewise. (stscm_eq_symtab_smob): Likewise. (stscm_objfile_symtab_map): Likewise. (stscm_del_objfile_symtabs): Likewise. * guile/scm-type.c (tyscm_hash_type_smob): Likewise. (tyscm_eq_type_smob): Likewise. (tyscm_type_map): Likewise. (tyscm_copy_type_recursive): Likewise. (save_objfile_types): Likewise. * guile/scm-utils.c (extract_arg): Likewise. * h8300-tdep.c (h8300_frame_cache): Likewise. * hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Likewise. * hppa-tdep.c (compare_unwind_entries): Likewise. (find_unwind_entry): Likewise. (hppa_frame_cache): Likewise. (hppa_stub_frame_unwind_cache): Likewise. * hppanbsd-tdep.c (hppanbsd_supply_gregset): Likewise. * hppaobsd-tdep.c (hppaobsd_supply_gregset): Likewise. (hppaobsd_supply_fpregset): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. * i386-linux-tdep.c (i386_linux_init_abi): Likewise. * i386-tdep.c (i386_frame_cache): Likewise. (i386_epilogue_frame_cache): Likewise. (i386_sigtramp_frame_cache): Likewise. (i386_supply_gregset): Likewise. (i386_collect_gregset): Likewise. (i386_gdbarch_init): Likewise. * i386obsd-tdep.c (i386obsd_aout_supply_regset): Likewise. (i386obsd_trapframe_cache): Likewise. * i387-tdep.c (i387_supply_fsave): Likewise. (i387_collect_fsave): Likewise. (i387_supply_fxsave): Likewise. (i387_collect_fxsave): Likewise. (i387_supply_xsave): Likewise. (i387_collect_xsave): Likewise. * ia64-tdep.c (ia64_frame_cache): Likewise. (ia64_sigtramp_frame_cache): Likewise. * infcmd.c (attach_command_continuation): Likewise. (attach_command_continuation_free_args): Likewise. * inferior.c (restore_inferior): Likewise. (delete_thread_of_inferior): Likewise. * inflow.c (inflow_inferior_data_cleanup): Likewise. (get_inflow_inferior_data): Likewise. (inflow_inferior_exit): Likewise. * infrun.c (displaced_step_clear_cleanup): Likewise. (restore_current_uiout_cleanup): Likewise. (release_stop_context_cleanup): Likewise. (do_restore_infcall_suspend_state_cleanup): Likewise. (do_restore_infcall_control_state_cleanup): Likewise. (restore_inferior_ptid): Likewise. * inline-frame.c (block_starting_point_at): Likewise. * iq2000-tdep.c (iq2000_frame_cache): Likewise. * jit.c (get_jit_objfile_data): Likewise. (get_jit_program_space_data): Likewise. (jit_object_close_impl): Likewise. (jit_find_objf_with_entry_addr): Likewise. (jit_breakpoint_deleted): Likewise. (jit_unwind_reg_set_impl): Likewise. (jit_unwind_reg_get_impl): Likewise. (jit_dealloc_cache): Likewise. (jit_frame_sniffer): Likewise. (jit_frame_prev_register): Likewise. (jit_prepend_unwinder): Likewise. (jit_inferior_exit_hook): Likewise. (free_objfile_data): Likewise. * jv-lang.c (jv_per_objfile_free): Likewise. (get_dynamics_objfile): Likewise. (get_java_class_symtab): Likewise. (builtin_java_type): Likewise. * language.c (language_string_char_type): Likewise. (language_bool_type): Likewise. (language_lookup_primitive_type): Likewise. (language_lookup_primitive_type_as_symbol): Likewise. * linespec.c (hash_address_entry): Likewise. (eq_address_entry): Likewise. (iterate_inline_only): Likewise. (iterate_name_matcher): Likewise. (decode_line_2_compare_items): Likewise. (collect_one_symbol): Likewise. (compare_symbols): Likewise. (compare_msymbols): Likewise. (add_symtabs_to_list): Likewise. (collect_symbols): Likewise. (compare_msyms): Likewise. (add_minsym): Likewise. (cleanup_linespec_result): Likewise. * linux-fork.c (inferior_call_waitpid_cleanup): Likewise. * linux-nat.c (delete_lwp_cleanup): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (resume_stopped_resumed_lwps): Likewise. * linux-tdep.c (get_linux_gdbarch_data): Likewise. (invalidate_linux_cache_inf): Likewise. (get_linux_inferior_data): Likewise. (linux_find_memory_regions_thunk): Likewise. (linux_make_mappings_callback): Likewise. (linux_corefile_thread_callback): Likewise. (find_mapping_size): Likewise. * linux-thread-db.c (find_new_threads_callback): Likewise. * lm32-tdep.c (lm32_frame_cache): Likewise. * m2-lang.c (builtin_m2_type): Likewise. * m32c-tdep.c (m32c_analyze_frame_prologue): Likewise. * m32r-linux-tdep.c (m32r_linux_sigtramp_frame_cache): Likewise. (m32r_linux_supply_gregset): Likewise. (m32r_linux_collect_gregset): Likewise. * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. * m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise. * m68k-tdep.c (m68k_frame_cache): Likewise. * m68kbsd-tdep.c (m68kbsd_supply_fpregset): Likewise. (m68kbsd_supply_gregset): Likewise. * m68klinux-tdep.c (m68k_linux_sigtramp_frame_cache): Likewise. * m88k-tdep.c (m88k_frame_cache): Likewise. (m88k_supply_gregset): Likewise. gdb/gdbserver/ChangeLog: * dll.c (match_dll): Add cast(s). (unloaded_dll): Likewise. * linux-low.c (second_thread_of_pid_p): Likewise. (delete_lwp_callback): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (linux_set_resume_request): Likewise. * server.c (accumulate_file_name_length): Likewise. (emit_dll_description): Likewise. (handle_qxfer_threads_worker): Likewise. (visit_actioned_threads): Likewise. * thread-db.c (any_thread_of): Likewise. * tracepoint.c (same_process_p): Likewise. (match_blocktype): Likewise. (build_traceframe_info_xml): Likewise. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (do_steps_and_nexts): Adjust expected source line.
824 lines
24 KiB
C
824 lines
24 KiB
C
/* Dump-to-file commands, for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by Red Hat.
|
|
|
|
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 "cli/cli-decode.h"
|
|
#include "cli/cli-cmds.h"
|
|
#include "value.h"
|
|
#include "completer.h"
|
|
#include <ctype.h>
|
|
#include "target.h"
|
|
#include "readline/readline.h"
|
|
#include "gdbcore.h"
|
|
#include "cli/cli-utils.h"
|
|
#include "gdb_bfd.h"
|
|
#include "filestuff.h"
|
|
|
|
|
|
static const char *
|
|
scan_expression_with_cleanup (const char **cmd, const char *def)
|
|
{
|
|
if ((*cmd) == NULL || (**cmd) == '\0')
|
|
{
|
|
char *exp = xstrdup (def);
|
|
|
|
make_cleanup (xfree, exp);
|
|
return exp;
|
|
}
|
|
else
|
|
{
|
|
char *exp;
|
|
const char *end;
|
|
|
|
end = (*cmd) + strcspn (*cmd, " \t");
|
|
exp = savestring ((*cmd), end - (*cmd));
|
|
make_cleanup (xfree, exp);
|
|
(*cmd) = skip_spaces_const (end);
|
|
return exp;
|
|
}
|
|
}
|
|
|
|
|
|
static char *
|
|
scan_filename_with_cleanup (const char **cmd, const char *defname)
|
|
{
|
|
char *filename;
|
|
char *fullname;
|
|
|
|
/* FIXME: Need to get the ``/a(ppend)'' flag from somewhere. */
|
|
|
|
/* File. */
|
|
if ((*cmd) == NULL)
|
|
{
|
|
if (defname == NULL)
|
|
error (_("Missing filename."));
|
|
filename = xstrdup (defname);
|
|
make_cleanup (xfree, filename);
|
|
}
|
|
else
|
|
{
|
|
/* FIXME: should parse a possibly quoted string. */
|
|
const char *end;
|
|
|
|
(*cmd) = skip_spaces_const (*cmd);
|
|
end = *cmd + strcspn (*cmd, " \t");
|
|
filename = savestring ((*cmd), end - (*cmd));
|
|
make_cleanup (xfree, filename);
|
|
(*cmd) = skip_spaces_const (end);
|
|
}
|
|
gdb_assert (filename != NULL);
|
|
|
|
fullname = tilde_expand (filename);
|
|
make_cleanup (xfree, fullname);
|
|
|
|
return fullname;
|
|
}
|
|
|
|
static FILE *
|
|
fopen_with_cleanup (const char *filename, const char *mode)
|
|
{
|
|
FILE *file = gdb_fopen_cloexec (filename, mode);
|
|
|
|
if (file == NULL)
|
|
perror_with_name (filename);
|
|
make_cleanup_fclose (file);
|
|
return file;
|
|
}
|
|
|
|
static bfd *
|
|
bfd_openr_with_cleanup (const char *filename, const char *target)
|
|
{
|
|
bfd *ibfd;
|
|
|
|
ibfd = gdb_bfd_openr (filename, target);
|
|
if (ibfd == NULL)
|
|
error (_("Failed to open %s: %s."), filename,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
make_cleanup_bfd_unref (ibfd);
|
|
if (!bfd_check_format (ibfd, bfd_object))
|
|
error (_("'%s' is not a recognized file format."), filename);
|
|
|
|
return ibfd;
|
|
}
|
|
|
|
static bfd *
|
|
bfd_openw_with_cleanup (const char *filename, const char *target,
|
|
const char *mode)
|
|
{
|
|
bfd *obfd;
|
|
|
|
if (*mode == 'w') /* Write: create new file */
|
|
{
|
|
obfd = gdb_bfd_openw (filename, target);
|
|
if (obfd == NULL)
|
|
error (_("Failed to open %s: %s."), filename,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
make_cleanup_bfd_unref (obfd);
|
|
if (!bfd_set_format (obfd, bfd_object))
|
|
error (_("bfd_openw_with_cleanup: %s."), bfd_errmsg (bfd_get_error ()));
|
|
}
|
|
else if (*mode == 'a') /* Append to existing file. */
|
|
{ /* FIXME -- doesn't work... */
|
|
error (_("bfd_openw does not work with append."));
|
|
}
|
|
else
|
|
error (_("bfd_openw_with_cleanup: unknown mode %s."), mode);
|
|
|
|
return obfd;
|
|
}
|
|
|
|
static struct cmd_list_element *dump_cmdlist;
|
|
static struct cmd_list_element *append_cmdlist;
|
|
static struct cmd_list_element *srec_cmdlist;
|
|
static struct cmd_list_element *ihex_cmdlist;
|
|
static struct cmd_list_element *verilog_cmdlist;
|
|
static struct cmd_list_element *tekhex_cmdlist;
|
|
static struct cmd_list_element *binary_dump_cmdlist;
|
|
static struct cmd_list_element *binary_append_cmdlist;
|
|
|
|
static void
|
|
dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump\" must be followed by a subcommand.\n\n"));
|
|
help_list (dump_cmdlist, "dump ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
append_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"append\" must be followed by a subcommand.\n\n"));
|
|
help_list (dump_cmdlist, "append ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
dump_binary_file (const char *filename, const char *mode,
|
|
const bfd_byte *buf, ULONGEST len)
|
|
{
|
|
FILE *file;
|
|
int status;
|
|
|
|
file = fopen_with_cleanup (filename, mode);
|
|
status = fwrite (buf, len, 1, file);
|
|
if (status != 1)
|
|
perror_with_name (filename);
|
|
}
|
|
|
|
static void
|
|
dump_bfd_file (const char *filename, const char *mode,
|
|
const char *target, CORE_ADDR vaddr,
|
|
const bfd_byte *buf, ULONGEST len)
|
|
{
|
|
bfd *obfd;
|
|
asection *osection;
|
|
|
|
obfd = bfd_openw_with_cleanup (filename, target, mode);
|
|
osection = bfd_make_section_anyway (obfd, ".newsec");
|
|
bfd_set_section_size (obfd, osection, len);
|
|
bfd_set_section_vma (obfd, osection, vaddr);
|
|
bfd_set_section_alignment (obfd, osection, 0);
|
|
bfd_set_section_flags (obfd, osection, (SEC_HAS_CONTENTS
|
|
| SEC_ALLOC
|
|
| SEC_LOAD));
|
|
osection->entsize = 0;
|
|
if (!bfd_set_section_contents (obfd, osection, buf, 0, len))
|
|
warning (_("writing dump file '%s' (%s)"), filename,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
}
|
|
|
|
static void
|
|
dump_memory_to_file (const char *cmd, const char *mode, const char *file_format)
|
|
{
|
|
struct cleanup *old_cleanups = make_cleanup (null_cleanup, NULL);
|
|
CORE_ADDR lo;
|
|
CORE_ADDR hi;
|
|
ULONGEST count;
|
|
const char *filename;
|
|
void *buf;
|
|
const char *lo_exp;
|
|
const char *hi_exp;
|
|
|
|
/* Open the file. */
|
|
filename = scan_filename_with_cleanup (&cmd, NULL);
|
|
|
|
/* Find the low address. */
|
|
if (cmd == NULL || *cmd == '\0')
|
|
error (_("Missing start address."));
|
|
lo_exp = scan_expression_with_cleanup (&cmd, NULL);
|
|
|
|
/* Find the second address - rest of line. */
|
|
if (cmd == NULL || *cmd == '\0')
|
|
error (_("Missing stop address."));
|
|
hi_exp = cmd;
|
|
|
|
lo = parse_and_eval_address (lo_exp);
|
|
hi = parse_and_eval_address (hi_exp);
|
|
if (hi <= lo)
|
|
error (_("Invalid memory address range (start >= end)."));
|
|
count = hi - lo;
|
|
|
|
/* FIXME: Should use read_memory_partial() and a magic blocking
|
|
value. */
|
|
buf = xmalloc (count);
|
|
make_cleanup (xfree, buf);
|
|
read_memory (lo, buf, count);
|
|
|
|
/* Have everything. Open/write the data. */
|
|
if (file_format == NULL || strcmp (file_format, "binary") == 0)
|
|
{
|
|
dump_binary_file (filename, mode, buf, count);
|
|
}
|
|
else
|
|
{
|
|
dump_bfd_file (filename, mode, file_format, lo, buf, count);
|
|
}
|
|
|
|
do_cleanups (old_cleanups);
|
|
}
|
|
|
|
static void
|
|
dump_memory_command (char *cmd, char *mode)
|
|
{
|
|
dump_memory_to_file (cmd, mode, "binary");
|
|
}
|
|
|
|
static void
|
|
dump_value_to_file (const char *cmd, const char *mode, const char *file_format)
|
|
{
|
|
struct cleanup *old_cleanups = make_cleanup (null_cleanup, NULL);
|
|
struct value *val;
|
|
const char *filename;
|
|
|
|
/* Open the file. */
|
|
filename = scan_filename_with_cleanup (&cmd, NULL);
|
|
|
|
/* Find the value. */
|
|
if (cmd == NULL || *cmd == '\0')
|
|
error (_("No value to %s."), *mode == 'a' ? "append" : "dump");
|
|
val = parse_and_eval (cmd);
|
|
if (val == NULL)
|
|
error (_("Invalid expression."));
|
|
|
|
/* Have everything. Open/write the data. */
|
|
if (file_format == NULL || strcmp (file_format, "binary") == 0)
|
|
{
|
|
dump_binary_file (filename, mode, value_contents (val),
|
|
TYPE_LENGTH (value_type (val)));
|
|
}
|
|
else
|
|
{
|
|
CORE_ADDR vaddr;
|
|
|
|
if (VALUE_LVAL (val))
|
|
{
|
|
vaddr = value_address (val);
|
|
}
|
|
else
|
|
{
|
|
vaddr = 0;
|
|
warning (_("value is not an lval: address assumed to be zero"));
|
|
}
|
|
|
|
dump_bfd_file (filename, mode, file_format, vaddr,
|
|
value_contents (val),
|
|
TYPE_LENGTH (value_type (val)));
|
|
}
|
|
|
|
do_cleanups (old_cleanups);
|
|
}
|
|
|
|
static void
|
|
dump_value_command (char *cmd, char *mode)
|
|
{
|
|
dump_value_to_file (cmd, mode, "binary");
|
|
}
|
|
|
|
static void
|
|
dump_srec_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_WB, "srec");
|
|
}
|
|
|
|
static void
|
|
dump_srec_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_WB, "srec");
|
|
}
|
|
|
|
static void
|
|
dump_ihex_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_WB, "ihex");
|
|
}
|
|
|
|
static void
|
|
dump_ihex_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_WB, "ihex");
|
|
}
|
|
|
|
static void
|
|
dump_verilog_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_WB, "verilog");
|
|
}
|
|
|
|
static void
|
|
dump_verilog_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_WB, "verilog");
|
|
}
|
|
|
|
static void
|
|
dump_tekhex_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_WB, "tekhex");
|
|
}
|
|
|
|
static void
|
|
dump_tekhex_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_WB, "tekhex");
|
|
}
|
|
|
|
static void
|
|
dump_binary_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_WB, "binary");
|
|
}
|
|
|
|
static void
|
|
dump_binary_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_WB, "binary");
|
|
}
|
|
|
|
static void
|
|
append_binary_memory (char *args, int from_tty)
|
|
{
|
|
dump_memory_to_file (args, FOPEN_AB, "binary");
|
|
}
|
|
|
|
static void
|
|
append_binary_value (char *args, int from_tty)
|
|
{
|
|
dump_value_to_file (args, FOPEN_AB, "binary");
|
|
}
|
|
|
|
struct dump_context
|
|
{
|
|
void (*func) (char *cmd, char *mode);
|
|
char *mode;
|
|
};
|
|
|
|
static void
|
|
call_dump_func (struct cmd_list_element *c, char *args, int from_tty)
|
|
{
|
|
struct dump_context *d = (struct dump_context *) get_cmd_context (c);
|
|
|
|
d->func (args, d->mode);
|
|
}
|
|
|
|
static void
|
|
add_dump_command (char *name, void (*func) (char *args, char *mode),
|
|
char *descr)
|
|
|
|
{
|
|
struct cmd_list_element *c;
|
|
struct dump_context *d;
|
|
|
|
c = add_cmd (name, all_commands, NULL, descr, &dump_cmdlist);
|
|
c->completer = filename_completer;
|
|
d = XNEW (struct dump_context);
|
|
d->func = func;
|
|
d->mode = FOPEN_WB;
|
|
set_cmd_context (c, d);
|
|
c->func = call_dump_func;
|
|
|
|
c = add_cmd (name, all_commands, NULL, descr, &append_cmdlist);
|
|
c->completer = filename_completer;
|
|
d = XNEW (struct dump_context);
|
|
d->func = func;
|
|
d->mode = FOPEN_AB;
|
|
set_cmd_context (c, d);
|
|
c->func = call_dump_func;
|
|
|
|
/* Replace "Dump " at start of docstring with "Append " (borrowed
|
|
from [deleted] deprecated_add_show_from_set). */
|
|
if ( c->doc[0] == 'W'
|
|
&& c->doc[1] == 'r'
|
|
&& c->doc[2] == 'i'
|
|
&& c->doc[3] == 't'
|
|
&& c->doc[4] == 'e'
|
|
&& c->doc[5] == ' ')
|
|
c->doc = concat ("Append ", c->doc + 6, (char *)NULL);
|
|
}
|
|
|
|
/* Opaque data for restore_section_callback. */
|
|
struct callback_data {
|
|
CORE_ADDR load_offset;
|
|
CORE_ADDR load_start;
|
|
CORE_ADDR load_end;
|
|
};
|
|
|
|
/* Function: restore_section_callback.
|
|
|
|
Callback function for bfd_map_over_sections.
|
|
Selectively loads the sections into memory. */
|
|
|
|
static void
|
|
restore_section_callback (bfd *ibfd, asection *isec, void *args)
|
|
{
|
|
struct callback_data *data = (struct callback_data *) args;
|
|
bfd_vma sec_start = bfd_section_vma (ibfd, isec);
|
|
bfd_size_type size = bfd_section_size (ibfd, isec);
|
|
bfd_vma sec_end = sec_start + size;
|
|
bfd_size_type sec_offset = 0;
|
|
bfd_size_type sec_load_count = size;
|
|
struct cleanup *old_chain;
|
|
gdb_byte *buf;
|
|
int ret;
|
|
|
|
/* Ignore non-loadable sections, eg. from elf files. */
|
|
if (!(bfd_get_section_flags (ibfd, isec) & SEC_LOAD))
|
|
return;
|
|
|
|
/* Does the section overlap with the desired restore range? */
|
|
if (sec_end <= data->load_start
|
|
|| (data->load_end > 0 && sec_start >= data->load_end))
|
|
{
|
|
/* No, no useable data in this section. */
|
|
printf_filtered (_("skipping section %s...\n"),
|
|
bfd_section_name (ibfd, isec));
|
|
return;
|
|
}
|
|
|
|
/* Compare section address range with user-requested
|
|
address range (if any). Compute where the actual
|
|
transfer should start and end. */
|
|
if (sec_start < data->load_start)
|
|
sec_offset = data->load_start - sec_start;
|
|
/* Size of a partial transfer. */
|
|
sec_load_count -= sec_offset;
|
|
if (data->load_end > 0 && sec_end > data->load_end)
|
|
sec_load_count -= sec_end - data->load_end;
|
|
|
|
/* Get the data. */
|
|
buf = (gdb_byte *) xmalloc (size);
|
|
old_chain = make_cleanup (xfree, buf);
|
|
if (!bfd_get_section_contents (ibfd, isec, buf, 0, size))
|
|
error (_("Failed to read bfd file %s: '%s'."), bfd_get_filename (ibfd),
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
printf_filtered ("Restoring section %s (0x%lx to 0x%lx)",
|
|
bfd_section_name (ibfd, isec),
|
|
(unsigned long) sec_start,
|
|
(unsigned long) sec_end);
|
|
|
|
if (data->load_offset != 0 || data->load_start != 0 || data->load_end != 0)
|
|
printf_filtered (" into memory (%s to %s)\n",
|
|
paddress (target_gdbarch (),
|
|
(unsigned long) sec_start
|
|
+ sec_offset + data->load_offset),
|
|
paddress (target_gdbarch (),
|
|
(unsigned long) sec_start + sec_offset
|
|
+ data->load_offset + sec_load_count));
|
|
else
|
|
puts_filtered ("\n");
|
|
|
|
/* Write the data. */
|
|
ret = target_write_memory (sec_start + sec_offset + data->load_offset,
|
|
buf + sec_offset, sec_load_count);
|
|
if (ret != 0)
|
|
warning (_("restore: memory write failed (%s)."), safe_strerror (ret));
|
|
do_cleanups (old_chain);
|
|
return;
|
|
}
|
|
|
|
static void
|
|
restore_binary_file (const char *filename, struct callback_data *data)
|
|
{
|
|
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
|
|
FILE *file = fopen_with_cleanup (filename, FOPEN_RB);
|
|
gdb_byte *buf;
|
|
long len;
|
|
|
|
/* Get the file size for reading. */
|
|
if (fseek (file, 0, SEEK_END) == 0)
|
|
{
|
|
len = ftell (file);
|
|
if (len < 0)
|
|
perror_with_name (filename);
|
|
}
|
|
else
|
|
perror_with_name (filename);
|
|
|
|
if (len <= data->load_start)
|
|
error (_("Start address is greater than length of binary file %s."),
|
|
filename);
|
|
|
|
/* Chop off "len" if it exceeds the requested load_end addr. */
|
|
if (data->load_end != 0 && data->load_end < len)
|
|
len = data->load_end;
|
|
/* Chop off "len" if the requested load_start addr skips some bytes. */
|
|
if (data->load_start > 0)
|
|
len -= data->load_start;
|
|
|
|
printf_filtered
|
|
("Restoring binary file %s into memory (0x%lx to 0x%lx)\n",
|
|
filename,
|
|
(unsigned long) (data->load_start + data->load_offset),
|
|
(unsigned long) (data->load_start + data->load_offset + len));
|
|
|
|
/* Now set the file pos to the requested load start pos. */
|
|
if (fseek (file, data->load_start, SEEK_SET) != 0)
|
|
perror_with_name (filename);
|
|
|
|
/* Now allocate a buffer and read the file contents. */
|
|
buf = (gdb_byte *) xmalloc (len);
|
|
make_cleanup (xfree, buf);
|
|
if (fread (buf, 1, len, file) != len)
|
|
perror_with_name (filename);
|
|
|
|
/* Now write the buffer into target memory. */
|
|
len = target_write_memory (data->load_start + data->load_offset, buf, len);
|
|
if (len != 0)
|
|
warning (_("restore: memory write failed (%s)."), safe_strerror (len));
|
|
do_cleanups (cleanup);
|
|
}
|
|
|
|
static void
|
|
restore_command (char *args_in, int from_tty)
|
|
{
|
|
char *filename;
|
|
struct callback_data data;
|
|
bfd *ibfd;
|
|
int binary_flag = 0;
|
|
const char *args = args_in;
|
|
|
|
if (!target_has_execution)
|
|
noprocess ();
|
|
|
|
data.load_offset = 0;
|
|
data.load_start = 0;
|
|
data.load_end = 0;
|
|
|
|
/* Parse the input arguments. First is filename (required). */
|
|
filename = scan_filename_with_cleanup (&args, NULL);
|
|
if (args != NULL && *args != '\0')
|
|
{
|
|
char *binary_string = "binary";
|
|
|
|
/* Look for optional "binary" flag. */
|
|
if (startswith (args, binary_string))
|
|
{
|
|
binary_flag = 1;
|
|
args += strlen (binary_string);
|
|
args = skip_spaces_const (args);
|
|
}
|
|
/* Parse offset (optional). */
|
|
if (args != NULL && *args != '\0')
|
|
data.load_offset =
|
|
parse_and_eval_address (scan_expression_with_cleanup (&args, NULL));
|
|
if (args != NULL && *args != '\0')
|
|
{
|
|
/* Parse start address (optional). */
|
|
data.load_start =
|
|
parse_and_eval_long (scan_expression_with_cleanup (&args, NULL));
|
|
if (args != NULL && *args != '\0')
|
|
{
|
|
/* Parse end address (optional). */
|
|
data.load_end = parse_and_eval_long (args);
|
|
if (data.load_end <= data.load_start)
|
|
error (_("Start must be less than end."));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (info_verbose)
|
|
printf_filtered ("Restore file %s offset 0x%lx start 0x%lx end 0x%lx\n",
|
|
filename, (unsigned long) data.load_offset,
|
|
(unsigned long) data.load_start,
|
|
(unsigned long) data.load_end);
|
|
|
|
if (binary_flag)
|
|
{
|
|
restore_binary_file (filename, &data);
|
|
}
|
|
else
|
|
{
|
|
/* Open the file for loading. */
|
|
ibfd = bfd_openr_with_cleanup (filename, NULL);
|
|
|
|
/* Process the sections. */
|
|
bfd_map_over_sections (ibfd, restore_section_callback, &data);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void
|
|
srec_dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump srec\" must be followed by a subcommand.\n"));
|
|
help_list (srec_cmdlist, "dump srec ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
ihex_dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump ihex\" must be followed by a subcommand.\n"));
|
|
help_list (ihex_cmdlist, "dump ihex ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
verilog_dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump verilog\" must be followed by a subcommand.\n"));
|
|
help_list (verilog_cmdlist, "dump verilog ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
tekhex_dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump tekhex\" must be followed by a subcommand.\n"));
|
|
help_list (tekhex_cmdlist, "dump tekhex ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
binary_dump_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"dump binary\" must be followed by a subcommand.\n"));
|
|
help_list (binary_dump_cmdlist, "dump binary ", all_commands, gdb_stdout);
|
|
}
|
|
|
|
static void
|
|
binary_append_command (char *cmd, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"append binary\" must be followed by a subcommand.\n"));
|
|
help_list (binary_append_cmdlist, "append binary ", all_commands,
|
|
gdb_stdout);
|
|
}
|
|
|
|
extern initialize_file_ftype _initialize_cli_dump; /* -Wmissing-prototypes */
|
|
|
|
void
|
|
_initialize_cli_dump (void)
|
|
{
|
|
struct cmd_list_element *c;
|
|
|
|
add_prefix_cmd ("dump", class_vars, dump_command,
|
|
_("Dump target code/data to a local file."),
|
|
&dump_cmdlist, "dump ",
|
|
0/*allow-unknown*/,
|
|
&cmdlist);
|
|
add_prefix_cmd ("append", class_vars, append_command,
|
|
_("Append target code/data to a local file."),
|
|
&append_cmdlist, "append ",
|
|
0/*allow-unknown*/,
|
|
&cmdlist);
|
|
|
|
add_dump_command ("memory", dump_memory_command, "\
|
|
Write contents of memory to a raw binary file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory within the\n\
|
|
range [START .. STOP) to the specified FILE in raw target ordered bytes.");
|
|
|
|
add_dump_command ("value", dump_value_command, "\
|
|
Write the value of an expression to a raw binary file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION to\n\
|
|
the specified FILE in raw target ordered bytes.");
|
|
|
|
add_prefix_cmd ("srec", all_commands, srec_dump_command,
|
|
_("Write target code/data to an srec file."),
|
|
&srec_cmdlist, "dump srec ",
|
|
0 /*allow-unknown*/,
|
|
&dump_cmdlist);
|
|
|
|
add_prefix_cmd ("ihex", all_commands, ihex_dump_command,
|
|
_("Write target code/data to an intel hex file."),
|
|
&ihex_cmdlist, "dump ihex ",
|
|
0 /*allow-unknown*/,
|
|
&dump_cmdlist);
|
|
|
|
add_prefix_cmd ("verilog", all_commands, verilog_dump_command,
|
|
_("Write target code/data to a verilog hex file."),
|
|
&verilog_cmdlist, "dump verilog ",
|
|
0 /*allow-unknown*/,
|
|
&dump_cmdlist);
|
|
|
|
add_prefix_cmd ("tekhex", all_commands, tekhex_dump_command,
|
|
_("Write target code/data to a tekhex file."),
|
|
&tekhex_cmdlist, "dump tekhex ",
|
|
0 /*allow-unknown*/,
|
|
&dump_cmdlist);
|
|
|
|
add_prefix_cmd ("binary", all_commands, binary_dump_command,
|
|
_("Write target code/data to a raw binary file."),
|
|
&binary_dump_cmdlist, "dump binary ",
|
|
0 /*allow-unknown*/,
|
|
&dump_cmdlist);
|
|
|
|
add_prefix_cmd ("binary", all_commands, binary_append_command,
|
|
_("Append target code/data to a raw binary file."),
|
|
&binary_append_cmdlist, "append binary ",
|
|
0 /*allow-unknown*/,
|
|
&append_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, dump_srec_memory, _("\
|
|
Write contents of memory to an srec file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
within the range [START .. STOP) to the specified FILE in srec format."),
|
|
&srec_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, dump_srec_value, _("\
|
|
Write the value of an expression to an srec file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in srec format."),
|
|
&srec_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, dump_ihex_memory, _("\
|
|
Write contents of memory to an ihex file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory within\n\
|
|
the range [START .. STOP) to the specified FILE in intel hex format."),
|
|
&ihex_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, dump_ihex_value, _("\
|
|
Write the value of an expression to an ihex file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in intel hex format."),
|
|
&ihex_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, dump_verilog_memory, _("\
|
|
Write contents of memory to a verilog hex file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory within\n\
|
|
the range [START .. STOP) to the specified FILE in verilog hex format."),
|
|
&verilog_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, dump_verilog_value, _("\
|
|
Write the value of an expression to a verilog hex file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in verilog hex format."),
|
|
&verilog_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, dump_tekhex_memory, _("\
|
|
Write contents of memory to a tekhex file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
within the range [START .. STOP) to the specified FILE in tekhex format."),
|
|
&tekhex_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, dump_tekhex_value, _("\
|
|
Write the value of an expression to a tekhex file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in tekhex format."),
|
|
&tekhex_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, dump_binary_memory, _("\
|
|
Write contents of memory to a raw binary file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
within the range [START .. STOP) to the specified FILE in binary format."),
|
|
&binary_dump_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, dump_binary_value, _("\
|
|
Write the value of an expression to a raw binary file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in raw target ordered bytes."),
|
|
&binary_dump_cmdlist);
|
|
|
|
add_cmd ("memory", all_commands, append_binary_memory, _("\
|
|
Append contents of memory to a raw binary file.\n\
|
|
Arguments are FILE START STOP. Writes the contents of memory within the\n\
|
|
range [START .. STOP) to the specified FILE in raw target ordered bytes."),
|
|
&binary_append_cmdlist);
|
|
|
|
add_cmd ("value", all_commands, append_binary_value, _("\
|
|
Append the value of an expression to a raw binary file.\n\
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
to the specified FILE in raw target ordered bytes."),
|
|
&binary_append_cmdlist);
|
|
|
|
c = add_com ("restore", class_vars, restore_command, _("\
|
|
Restore the contents of FILE to target memory.\n\
|
|
Arguments are FILE OFFSET START END where all except FILE are optional.\n\
|
|
OFFSET will be added to the base address of the file (default zero).\n\
|
|
If START and END are given, only the file contents within that range\n\
|
|
(file relative) will be restored to target memory."));
|
|
c->completer = filename_completer;
|
|
/* FIXME: completers for other commands. */
|
|
}
|