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.
1101 lines
29 KiB
C
1101 lines
29 KiB
C
/* Character set conversion support for GDB.
|
||
|
||
Copyright (C) 2001-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 "charset.h"
|
||
#include "gdbcmd.h"
|
||
#include "gdb_obstack.h"
|
||
#include "gdb_wait.h"
|
||
#include "charset-list.h"
|
||
#include "vec.h"
|
||
#include "environ.h"
|
||
#include "arch-utils.h"
|
||
#include "gdb_vecs.h"
|
||
#include <ctype.h>
|
||
|
||
#ifdef USE_WIN32API
|
||
#include <windows.h>
|
||
#endif
|
||
|
||
/* How GDB's character set support works
|
||
|
||
GDB has three global settings:
|
||
|
||
- The `current host character set' is the character set GDB should
|
||
use in talking to the user, and which (hopefully) the user's
|
||
terminal knows how to display properly. Most users should not
|
||
change this.
|
||
|
||
- The `current target character set' is the character set the
|
||
program being debugged uses.
|
||
|
||
- The `current target wide character set' is the wide character set
|
||
the program being debugged uses, that is, the encoding used for
|
||
wchar_t.
|
||
|
||
There are commands to set each of these, and mechanisms for
|
||
choosing reasonable default values. GDB has a global list of
|
||
character sets that it can use as its host or target character
|
||
sets.
|
||
|
||
The header file `charset.h' declares various functions that
|
||
different pieces of GDB need to perform tasks like:
|
||
|
||
- printing target strings and characters to the user's terminal
|
||
(mostly target->host conversions),
|
||
|
||
- building target-appropriate representations of strings and
|
||
characters the user enters in expressions (mostly host->target
|
||
conversions),
|
||
|
||
and so on.
|
||
|
||
To avoid excessive code duplication and maintenance efforts,
|
||
GDB simply requires a capable iconv function. Users on platforms
|
||
without a suitable iconv can use the GNU iconv library. */
|
||
|
||
|
||
#ifdef PHONY_ICONV
|
||
|
||
/* Provide a phony iconv that does as little as possible. Also,
|
||
arrange for there to be a single available character set. */
|
||
|
||
#undef GDB_DEFAULT_HOST_CHARSET
|
||
#define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1"
|
||
#define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1"
|
||
#define GDB_DEFAULT_TARGET_WIDE_CHARSET "ISO-8859-1"
|
||
#undef DEFAULT_CHARSET_NAMES
|
||
#define DEFAULT_CHARSET_NAMES GDB_DEFAULT_HOST_CHARSET ,
|
||
|
||
#undef iconv_t
|
||
#define iconv_t int
|
||
#undef iconv_open
|
||
#define iconv_open phony_iconv_open
|
||
#undef iconv
|
||
#define iconv phony_iconv
|
||
#undef iconv_close
|
||
#define iconv_close phony_iconv_close
|
||
|
||
#undef ICONV_CONST
|
||
#define ICONV_CONST const
|
||
|
||
static iconv_t
|
||
phony_iconv_open (const char *to, const char *from)
|
||
{
|
||
/* We allow conversions from UTF-32BE, wchar_t, and the host charset.
|
||
We allow conversions to wchar_t and the host charset. */
|
||
if (strcmp (from, "UTF-32BE") && strcmp (from, "wchar_t")
|
||
&& strcmp (from, GDB_DEFAULT_HOST_CHARSET))
|
||
return -1;
|
||
if (strcmp (to, "wchar_t") && strcmp (to, GDB_DEFAULT_HOST_CHARSET))
|
||
return -1;
|
||
|
||
/* Return 1 if we are converting from UTF-32BE, 0 otherwise. This is
|
||
used as a flag in calls to iconv. */
|
||
return !strcmp (from, "UTF-32BE");
|
||
}
|
||
|
||
static int
|
||
phony_iconv_close (iconv_t arg)
|
||
{
|
||
return 0;
|
||
}
|
||
|
||
static size_t
|
||
phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft,
|
||
char **outbuf, size_t *outbytesleft)
|
||
{
|
||
if (utf_flag)
|
||
{
|
||
while (*inbytesleft >= 4)
|
||
{
|
||
size_t j;
|
||
unsigned long c = 0;
|
||
|
||
for (j = 0; j < 4; ++j)
|
||
{
|
||
c <<= 8;
|
||
c += (*inbuf)[j] & 0xff;
|
||
}
|
||
|
||
if (c >= 256)
|
||
{
|
||
errno = EILSEQ;
|
||
return -1;
|
||
}
|
||
**outbuf = c & 0xff;
|
||
++*outbuf;
|
||
--*outbytesleft;
|
||
|
||
++*inbuf;
|
||
*inbytesleft -= 4;
|
||
}
|
||
if (*inbytesleft < 4)
|
||
{
|
||
errno = EINVAL;
|
||
return -1;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
/* In all other cases we simply copy input bytes to the
|
||
output. */
|
||
size_t amt = *inbytesleft;
|
||
|
||
if (amt > *outbytesleft)
|
||
amt = *outbytesleft;
|
||
memcpy (*outbuf, *inbuf, amt);
|
||
*inbuf += amt;
|
||
*outbuf += amt;
|
||
*inbytesleft -= amt;
|
||
*outbytesleft -= amt;
|
||
}
|
||
|
||
if (*inbytesleft)
|
||
{
|
||
errno = E2BIG;
|
||
return -1;
|
||
}
|
||
|
||
/* The number of non-reversible conversions -- but they were all
|
||
reversible. */
|
||
return 0;
|
||
}
|
||
|
||
#else /* PHONY_ICONV */
|
||
|
||
/* On systems that don't have EILSEQ, GNU iconv's iconv.h defines it
|
||
to ENOENT, while gnulib defines it to a different value. Always
|
||
map ENOENT to gnulib's EILSEQ, leaving callers agnostic. */
|
||
|
||
static size_t
|
||
gdb_iconv (iconv_t utf_flag, ICONV_CONST char **inbuf, size_t *inbytesleft,
|
||
char **outbuf, size_t *outbytesleft)
|
||
{
|
||
size_t ret;
|
||
|
||
ret = iconv (utf_flag, inbuf, inbytesleft, outbuf, outbytesleft);
|
||
if (errno == ENOENT)
|
||
errno = EILSEQ;
|
||
return ret;
|
||
}
|
||
|
||
#undef iconv
|
||
#define iconv gdb_iconv
|
||
|
||
#endif /* PHONY_ICONV */
|
||
|
||
|
||
/* The global lists of character sets and translations. */
|
||
|
||
|
||
#ifndef GDB_DEFAULT_TARGET_CHARSET
|
||
#define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1"
|
||
#endif
|
||
|
||
#ifndef GDB_DEFAULT_TARGET_WIDE_CHARSET
|
||
#define GDB_DEFAULT_TARGET_WIDE_CHARSET "UTF-32"
|
||
#endif
|
||
|
||
static const char *auto_host_charset_name = GDB_DEFAULT_HOST_CHARSET;
|
||
static const char *host_charset_name = "auto";
|
||
static void
|
||
show_host_charset_name (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c,
|
||
const char *value)
|
||
{
|
||
if (!strcmp (value, "auto"))
|
||
fprintf_filtered (file,
|
||
_("The host character set is \"auto; currently %s\".\n"),
|
||
auto_host_charset_name);
|
||
else
|
||
fprintf_filtered (file, _("The host character set is \"%s\".\n"), value);
|
||
}
|
||
|
||
static const char *target_charset_name = "auto";
|
||
static void
|
||
show_target_charset_name (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
if (!strcmp (value, "auto"))
|
||
fprintf_filtered (file,
|
||
_("The target character set is \"auto; "
|
||
"currently %s\".\n"),
|
||
gdbarch_auto_charset (get_current_arch ()));
|
||
else
|
||
fprintf_filtered (file, _("The target character set is \"%s\".\n"),
|
||
value);
|
||
}
|
||
|
||
static const char *target_wide_charset_name = "auto";
|
||
static void
|
||
show_target_wide_charset_name (struct ui_file *file,
|
||
int from_tty,
|
||
struct cmd_list_element *c,
|
||
const char *value)
|
||
{
|
||
if (!strcmp (value, "auto"))
|
||
fprintf_filtered (file,
|
||
_("The target wide character set is \"auto; "
|
||
"currently %s\".\n"),
|
||
gdbarch_auto_wide_charset (get_current_arch ()));
|
||
else
|
||
fprintf_filtered (file, _("The target wide character set is \"%s\".\n"),
|
||
value);
|
||
}
|
||
|
||
static const char *default_charset_names[] =
|
||
{
|
||
DEFAULT_CHARSET_NAMES
|
||
0
|
||
};
|
||
|
||
static const char **charset_enum;
|
||
|
||
|
||
/* If the target wide character set has big- or little-endian
|
||
variants, these are the corresponding names. */
|
||
static const char *target_wide_charset_be_name;
|
||
static const char *target_wide_charset_le_name;
|
||
|
||
/* The architecture for which the BE- and LE-names are valid. */
|
||
static struct gdbarch *be_le_arch;
|
||
|
||
/* A helper function which sets the target wide big- and little-endian
|
||
character set names, if possible. */
|
||
|
||
static void
|
||
set_be_le_names (struct gdbarch *gdbarch)
|
||
{
|
||
int i, len;
|
||
const char *target_wide;
|
||
|
||
if (be_le_arch == gdbarch)
|
||
return;
|
||
be_le_arch = gdbarch;
|
||
|
||
target_wide_charset_le_name = NULL;
|
||
target_wide_charset_be_name = NULL;
|
||
|
||
target_wide = target_wide_charset_name;
|
||
if (!strcmp (target_wide, "auto"))
|
||
target_wide = gdbarch_auto_wide_charset (gdbarch);
|
||
|
||
len = strlen (target_wide);
|
||
for (i = 0; charset_enum[i]; ++i)
|
||
{
|
||
if (strncmp (target_wide, charset_enum[i], len))
|
||
continue;
|
||
if ((charset_enum[i][len] == 'B'
|
||
|| charset_enum[i][len] == 'L')
|
||
&& charset_enum[i][len + 1] == 'E'
|
||
&& charset_enum[i][len + 2] == '\0')
|
||
{
|
||
if (charset_enum[i][len] == 'B')
|
||
target_wide_charset_be_name = charset_enum[i];
|
||
else
|
||
target_wide_charset_le_name = charset_enum[i];
|
||
}
|
||
}
|
||
}
|
||
|
||
/* 'Set charset', 'set host-charset', 'set target-charset', 'set
|
||
target-wide-charset', 'set charset' sfunc's. */
|
||
|
||
static void
|
||
validate (struct gdbarch *gdbarch)
|
||
{
|
||
iconv_t desc;
|
||
const char *host_cset = host_charset ();
|
||
const char *target_cset = target_charset (gdbarch);
|
||
const char *target_wide_cset = target_wide_charset_name;
|
||
|
||
if (!strcmp (target_wide_cset, "auto"))
|
||
target_wide_cset = gdbarch_auto_wide_charset (gdbarch);
|
||
|
||
desc = iconv_open (target_wide_cset, host_cset);
|
||
if (desc == (iconv_t) -1)
|
||
error (_("Cannot convert between character sets `%s' and `%s'"),
|
||
target_wide_cset, host_cset);
|
||
iconv_close (desc);
|
||
|
||
desc = iconv_open (target_cset, host_cset);
|
||
if (desc == (iconv_t) -1)
|
||
error (_("Cannot convert between character sets `%s' and `%s'"),
|
||
target_cset, host_cset);
|
||
iconv_close (desc);
|
||
|
||
/* Clear the cache. */
|
||
be_le_arch = NULL;
|
||
}
|
||
|
||
/* This is the sfunc for the 'set charset' command. */
|
||
static void
|
||
set_charset_sfunc (char *charset, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
/* CAREFUL: set the target charset here as well. */
|
||
target_charset_name = host_charset_name;
|
||
validate (get_current_arch ());
|
||
}
|
||
|
||
/* 'set host-charset' command sfunc. We need a wrapper here because
|
||
the function needs to have a specific signature. */
|
||
static void
|
||
set_host_charset_sfunc (char *charset, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
validate (get_current_arch ());
|
||
}
|
||
|
||
/* Wrapper for the 'set target-charset' command. */
|
||
static void
|
||
set_target_charset_sfunc (char *charset, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
validate (get_current_arch ());
|
||
}
|
||
|
||
/* Wrapper for the 'set target-wide-charset' command. */
|
||
static void
|
||
set_target_wide_charset_sfunc (char *charset, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
validate (get_current_arch ());
|
||
}
|
||
|
||
/* sfunc for the 'show charset' command. */
|
||
static void
|
||
show_charset (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c,
|
||
const char *name)
|
||
{
|
||
show_host_charset_name (file, from_tty, c, host_charset_name);
|
||
show_target_charset_name (file, from_tty, c, target_charset_name);
|
||
show_target_wide_charset_name (file, from_tty, c,
|
||
target_wide_charset_name);
|
||
}
|
||
|
||
|
||
/* Accessor functions. */
|
||
|
||
const char *
|
||
host_charset (void)
|
||
{
|
||
if (!strcmp (host_charset_name, "auto"))
|
||
return auto_host_charset_name;
|
||
return host_charset_name;
|
||
}
|
||
|
||
const char *
|
||
target_charset (struct gdbarch *gdbarch)
|
||
{
|
||
if (!strcmp (target_charset_name, "auto"))
|
||
return gdbarch_auto_charset (gdbarch);
|
||
return target_charset_name;
|
||
}
|
||
|
||
const char *
|
||
target_wide_charset (struct gdbarch *gdbarch)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
|
||
|
||
set_be_le_names (gdbarch);
|
||
if (byte_order == BFD_ENDIAN_BIG)
|
||
{
|
||
if (target_wide_charset_be_name)
|
||
return target_wide_charset_be_name;
|
||
}
|
||
else
|
||
{
|
||
if (target_wide_charset_le_name)
|
||
return target_wide_charset_le_name;
|
||
}
|
||
|
||
if (!strcmp (target_wide_charset_name, "auto"))
|
||
return gdbarch_auto_wide_charset (gdbarch);
|
||
|
||
return target_wide_charset_name;
|
||
}
|
||
|
||
|
||
/* Host character set management. For the time being, we assume that
|
||
the host character set is some superset of ASCII. */
|
||
|
||
char
|
||
host_letter_to_control_character (char c)
|
||
{
|
||
if (c == '?')
|
||
return 0177;
|
||
return c & 0237;
|
||
}
|
||
|
||
/* Convert a host character, C, to its hex value. C must already have
|
||
been validated using isxdigit. */
|
||
|
||
int
|
||
host_hex_value (char c)
|
||
{
|
||
if (isdigit (c))
|
||
return c - '0';
|
||
if (c >= 'a' && c <= 'f')
|
||
return 10 + c - 'a';
|
||
gdb_assert (c >= 'A' && c <= 'F');
|
||
return 10 + c - 'A';
|
||
}
|
||
|
||
|
||
/* Public character management functions. */
|
||
|
||
/* A cleanup function which is run to close an iconv descriptor. */
|
||
|
||
static void
|
||
cleanup_iconv (void *p)
|
||
{
|
||
iconv_t *descp = (iconv_t *) p;
|
||
iconv_close (*descp);
|
||
}
|
||
|
||
void
|
||
convert_between_encodings (const char *from, const char *to,
|
||
const gdb_byte *bytes, unsigned int num_bytes,
|
||
int width, struct obstack *output,
|
||
enum transliterations translit)
|
||
{
|
||
iconv_t desc;
|
||
struct cleanup *cleanups;
|
||
size_t inleft;
|
||
ICONV_CONST char *inp;
|
||
unsigned int space_request;
|
||
|
||
/* Often, the host and target charsets will be the same. */
|
||
if (!strcmp (from, to))
|
||
{
|
||
obstack_grow (output, bytes, num_bytes);
|
||
return;
|
||
}
|
||
|
||
desc = iconv_open (to, from);
|
||
if (desc == (iconv_t) -1)
|
||
perror_with_name (_("Converting character sets"));
|
||
cleanups = make_cleanup (cleanup_iconv, &desc);
|
||
|
||
inleft = num_bytes;
|
||
inp = (ICONV_CONST char *) bytes;
|
||
|
||
space_request = num_bytes;
|
||
|
||
while (inleft > 0)
|
||
{
|
||
char *outp;
|
||
size_t outleft, r;
|
||
int old_size;
|
||
|
||
old_size = obstack_object_size (output);
|
||
obstack_blank (output, space_request);
|
||
|
||
outp = (char *) obstack_base (output) + old_size;
|
||
outleft = space_request;
|
||
|
||
r = iconv (desc, &inp, &inleft, &outp, &outleft);
|
||
|
||
/* Now make sure that the object on the obstack only includes
|
||
bytes we have converted. */
|
||
obstack_blank_fast (output, -outleft);
|
||
|
||
if (r == (size_t) -1)
|
||
{
|
||
switch (errno)
|
||
{
|
||
case EILSEQ:
|
||
{
|
||
int i;
|
||
|
||
/* Invalid input sequence. */
|
||
if (translit == translit_none)
|
||
error (_("Could not convert character "
|
||
"to `%s' character set"), to);
|
||
|
||
/* We emit escape sequence for the bytes, skip them,
|
||
and try again. */
|
||
for (i = 0; i < width; ++i)
|
||
{
|
||
char octal[5];
|
||
|
||
xsnprintf (octal, sizeof (octal), "\\%.3o", *inp & 0xff);
|
||
obstack_grow_str (output, octal);
|
||
|
||
++inp;
|
||
--inleft;
|
||
}
|
||
}
|
||
break;
|
||
|
||
case E2BIG:
|
||
/* We ran out of space in the output buffer. Make it
|
||
bigger next time around. */
|
||
space_request *= 2;
|
||
break;
|
||
|
||
case EINVAL:
|
||
/* Incomplete input sequence. FIXME: ought to report this
|
||
to the caller somehow. */
|
||
inleft = 0;
|
||
break;
|
||
|
||
default:
|
||
perror_with_name (_("Internal error while "
|
||
"converting character sets"));
|
||
}
|
||
}
|
||
}
|
||
|
||
do_cleanups (cleanups);
|
||
}
|
||
|
||
|
||
|
||
/* An iterator that returns host wchar_t's from a target string. */
|
||
struct wchar_iterator
|
||
{
|
||
/* The underlying iconv descriptor. */
|
||
iconv_t desc;
|
||
|
||
/* The input string. This is updated as convert characters. */
|
||
const gdb_byte *input;
|
||
/* The number of bytes remaining in the input. */
|
||
size_t bytes;
|
||
|
||
/* The width of an input character. */
|
||
size_t width;
|
||
|
||
/* The output buffer and its size. */
|
||
gdb_wchar_t *out;
|
||
size_t out_size;
|
||
};
|
||
|
||
/* Create a new iterator. */
|
||
struct wchar_iterator *
|
||
make_wchar_iterator (const gdb_byte *input, size_t bytes,
|
||
const char *charset, size_t width)
|
||
{
|
||
struct wchar_iterator *result;
|
||
iconv_t desc;
|
||
|
||
desc = iconv_open (INTERMEDIATE_ENCODING, charset);
|
||
if (desc == (iconv_t) -1)
|
||
perror_with_name (_("Converting character sets"));
|
||
|
||
result = XNEW (struct wchar_iterator);
|
||
result->desc = desc;
|
||
result->input = input;
|
||
result->bytes = bytes;
|
||
result->width = width;
|
||
|
||
result->out = XNEW (gdb_wchar_t);
|
||
result->out_size = 1;
|
||
|
||
return result;
|
||
}
|
||
|
||
static void
|
||
do_cleanup_iterator (void *p)
|
||
{
|
||
struct wchar_iterator *iter = (struct wchar_iterator *) p;
|
||
|
||
iconv_close (iter->desc);
|
||
xfree (iter->out);
|
||
xfree (iter);
|
||
}
|
||
|
||
struct cleanup *
|
||
make_cleanup_wchar_iterator (struct wchar_iterator *iter)
|
||
{
|
||
return make_cleanup (do_cleanup_iterator, iter);
|
||
}
|
||
|
||
int
|
||
wchar_iterate (struct wchar_iterator *iter,
|
||
enum wchar_iterate_result *out_result,
|
||
gdb_wchar_t **out_chars,
|
||
const gdb_byte **ptr,
|
||
size_t *len)
|
||
{
|
||
size_t out_request;
|
||
|
||
/* Try to convert some characters. At first we try to convert just
|
||
a single character. The reason for this is that iconv does not
|
||
necessarily update its outgoing arguments when it encounters an
|
||
invalid input sequence -- but we want to reliably report this to
|
||
our caller so it can emit an escape sequence. */
|
||
out_request = 1;
|
||
while (iter->bytes > 0)
|
||
{
|
||
ICONV_CONST char *inptr = (ICONV_CONST char *) iter->input;
|
||
char *outptr = (char *) &iter->out[0];
|
||
const gdb_byte *orig_inptr = iter->input;
|
||
size_t orig_in = iter->bytes;
|
||
size_t out_avail = out_request * sizeof (gdb_wchar_t);
|
||
size_t num;
|
||
size_t r = iconv (iter->desc, &inptr, &iter->bytes, &outptr, &out_avail);
|
||
|
||
iter->input = (gdb_byte *) inptr;
|
||
|
||
if (r == (size_t) -1)
|
||
{
|
||
switch (errno)
|
||
{
|
||
case EILSEQ:
|
||
/* Invalid input sequence. We still might have
|
||
converted a character; if so, return it. */
|
||
if (out_avail < out_request * sizeof (gdb_wchar_t))
|
||
break;
|
||
|
||
/* Otherwise skip the first invalid character, and let
|
||
the caller know about it. */
|
||
*out_result = wchar_iterate_invalid;
|
||
*ptr = iter->input;
|
||
*len = iter->width;
|
||
iter->input += iter->width;
|
||
iter->bytes -= iter->width;
|
||
return 0;
|
||
|
||
case E2BIG:
|
||
/* We ran out of space. We still might have converted a
|
||
character; if so, return it. Otherwise, grow the
|
||
buffer and try again. */
|
||
if (out_avail < out_request * sizeof (gdb_wchar_t))
|
||
break;
|
||
|
||
++out_request;
|
||
if (out_request > iter->out_size)
|
||
{
|
||
iter->out_size = out_request;
|
||
iter->out = XRESIZEVEC (gdb_wchar_t, iter->out, out_request);
|
||
}
|
||
continue;
|
||
|
||
case EINVAL:
|
||
/* Incomplete input sequence. Let the caller know, and
|
||
arrange for future calls to see EOF. */
|
||
*out_result = wchar_iterate_incomplete;
|
||
*ptr = iter->input;
|
||
*len = iter->bytes;
|
||
iter->bytes = 0;
|
||
return 0;
|
||
|
||
default:
|
||
perror_with_name (_("Internal error while "
|
||
"converting character sets"));
|
||
}
|
||
}
|
||
|
||
/* We converted something. */
|
||
num = out_request - out_avail / sizeof (gdb_wchar_t);
|
||
*out_result = wchar_iterate_ok;
|
||
*out_chars = iter->out;
|
||
*ptr = orig_inptr;
|
||
*len = orig_in - iter->bytes;
|
||
return num;
|
||
}
|
||
|
||
/* Really done. */
|
||
*out_result = wchar_iterate_eof;
|
||
return -1;
|
||
}
|
||
|
||
|
||
/* The charset.c module initialization function. */
|
||
|
||
extern initialize_file_ftype _initialize_charset; /* -Wmissing-prototype */
|
||
|
||
static VEC (char_ptr) *charsets;
|
||
|
||
#ifdef PHONY_ICONV
|
||
|
||
static void
|
||
find_charset_names (void)
|
||
{
|
||
VEC_safe_push (char_ptr, charsets, GDB_DEFAULT_HOST_CHARSET);
|
||
VEC_safe_push (char_ptr, charsets, NULL);
|
||
}
|
||
|
||
#else /* PHONY_ICONV */
|
||
|
||
/* Sometimes, libiconv redefines iconvlist as libiconvlist -- but
|
||
provides different symbols in the static and dynamic libraries.
|
||
So, configure may see libiconvlist but not iconvlist. But, calling
|
||
iconvlist is the right thing to do and will work. Hence we do a
|
||
check here but unconditionally call iconvlist below. */
|
||
#if defined (HAVE_ICONVLIST) || defined (HAVE_LIBICONVLIST)
|
||
|
||
/* A helper function that adds some character sets to the vector of
|
||
all character sets. This is a callback function for iconvlist. */
|
||
|
||
static int
|
||
add_one (unsigned int count, const char *const *names, void *data)
|
||
{
|
||
unsigned int i;
|
||
|
||
for (i = 0; i < count; ++i)
|
||
VEC_safe_push (char_ptr, charsets, xstrdup (names[i]));
|
||
|
||
return 0;
|
||
}
|
||
|
||
static void
|
||
find_charset_names (void)
|
||
{
|
||
iconvlist (add_one, NULL);
|
||
VEC_safe_push (char_ptr, charsets, NULL);
|
||
}
|
||
|
||
#else
|
||
|
||
/* Return non-zero if LINE (output from iconv) should be ignored.
|
||
Older iconv programs (e.g. 2.2.2) include the human readable
|
||
introduction even when stdout is not a tty. Newer versions omit
|
||
the intro if stdout is not a tty. */
|
||
|
||
static int
|
||
ignore_line_p (const char *line)
|
||
{
|
||
/* This table is used to filter the output. If this text appears
|
||
anywhere in the line, it is ignored (strstr is used). */
|
||
static const char * const ignore_lines[] =
|
||
{
|
||
"The following",
|
||
"not necessarily",
|
||
"the FROM and TO",
|
||
"listed with several",
|
||
NULL
|
||
};
|
||
int i;
|
||
|
||
for (i = 0; ignore_lines[i] != NULL; ++i)
|
||
{
|
||
if (strstr (line, ignore_lines[i]) != NULL)
|
||
return 1;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
static void
|
||
find_charset_names (void)
|
||
{
|
||
struct pex_obj *child;
|
||
char *args[3];
|
||
int err, status;
|
||
int fail = 1;
|
||
int flags;
|
||
struct gdb_environ *iconv_env;
|
||
char *iconv_program;
|
||
|
||
/* Older iconvs, e.g. 2.2.2, don't omit the intro text if stdout is
|
||
not a tty. We need to recognize it and ignore it. This text is
|
||
subject to translation, so force LANGUAGE=C. */
|
||
iconv_env = make_environ ();
|
||
init_environ (iconv_env);
|
||
set_in_environ (iconv_env, "LANGUAGE", "C");
|
||
set_in_environ (iconv_env, "LC_ALL", "C");
|
||
|
||
child = pex_init (PEX_USE_PIPES, "iconv", NULL);
|
||
|
||
#ifdef ICONV_BIN
|
||
{
|
||
char *iconv_dir = relocate_gdb_directory (ICONV_BIN,
|
||
ICONV_BIN_RELOCATABLE);
|
||
iconv_program = concat (iconv_dir, SLASH_STRING, "iconv", NULL);
|
||
xfree (iconv_dir);
|
||
}
|
||
#else
|
||
iconv_program = xstrdup ("iconv");
|
||
#endif
|
||
args[0] = iconv_program;
|
||
args[1] = "-l";
|
||
args[2] = NULL;
|
||
flags = PEX_STDERR_TO_STDOUT;
|
||
#ifndef ICONV_BIN
|
||
flags |= PEX_SEARCH;
|
||
#endif
|
||
/* Note that we simply ignore errors here. */
|
||
if (!pex_run_in_environment (child, flags,
|
||
args[0], args, environ_vector (iconv_env),
|
||
NULL, NULL, &err))
|
||
{
|
||
FILE *in = pex_read_output (child, 0);
|
||
|
||
/* POSIX says that iconv -l uses an unspecified format. We
|
||
parse the glibc and libiconv formats; feel free to add others
|
||
as needed. */
|
||
|
||
while (in != NULL && !feof (in))
|
||
{
|
||
/* The size of buf is chosen arbitrarily. */
|
||
char buf[1024];
|
||
char *start, *r;
|
||
int len;
|
||
|
||
r = fgets (buf, sizeof (buf), in);
|
||
if (!r)
|
||
break;
|
||
len = strlen (r);
|
||
if (len <= 3)
|
||
continue;
|
||
if (ignore_line_p (r))
|
||
continue;
|
||
|
||
/* Strip off the newline. */
|
||
--len;
|
||
/* Strip off one or two '/'s. glibc will print lines like
|
||
"8859_7//", but also "10646-1:1993/UCS4/". */
|
||
if (buf[len - 1] == '/')
|
||
--len;
|
||
if (buf[len - 1] == '/')
|
||
--len;
|
||
buf[len] = '\0';
|
||
|
||
/* libiconv will print multiple entries per line, separated
|
||
by spaces. Older iconvs will print multiple entries per
|
||
line, indented by two spaces, and separated by ", "
|
||
(i.e. the human readable form). */
|
||
start = buf;
|
||
while (1)
|
||
{
|
||
int keep_going;
|
||
char *p;
|
||
|
||
/* Skip leading blanks. */
|
||
for (p = start; *p && *p == ' '; ++p)
|
||
;
|
||
start = p;
|
||
/* Find the next space, comma, or end-of-line. */
|
||
for ( ; *p && *p != ' ' && *p != ','; ++p)
|
||
;
|
||
/* Ignore an empty result. */
|
||
if (p == start)
|
||
break;
|
||
keep_going = *p;
|
||
*p = '\0';
|
||
VEC_safe_push (char_ptr, charsets, xstrdup (start));
|
||
if (!keep_going)
|
||
break;
|
||
/* Skip any extra spaces. */
|
||
for (start = p + 1; *start && *start == ' '; ++start)
|
||
;
|
||
}
|
||
}
|
||
|
||
if (pex_get_status (child, 1, &status)
|
||
&& WIFEXITED (status) && !WEXITSTATUS (status))
|
||
fail = 0;
|
||
|
||
}
|
||
|
||
xfree (iconv_program);
|
||
pex_free (child);
|
||
free_environ (iconv_env);
|
||
|
||
if (fail)
|
||
{
|
||
/* Some error occurred, so drop the vector. */
|
||
free_char_ptr_vec (charsets);
|
||
charsets = NULL;
|
||
}
|
||
else
|
||
VEC_safe_push (char_ptr, charsets, NULL);
|
||
}
|
||
|
||
#endif /* HAVE_ICONVLIST || HAVE_LIBICONVLIST */
|
||
#endif /* PHONY_ICONV */
|
||
|
||
/* The "auto" target charset used by default_auto_charset. */
|
||
static const char *auto_target_charset_name = GDB_DEFAULT_TARGET_CHARSET;
|
||
|
||
const char *
|
||
default_auto_charset (void)
|
||
{
|
||
return auto_target_charset_name;
|
||
}
|
||
|
||
const char *
|
||
default_auto_wide_charset (void)
|
||
{
|
||
return GDB_DEFAULT_TARGET_WIDE_CHARSET;
|
||
}
|
||
|
||
|
||
#ifdef USE_INTERMEDIATE_ENCODING_FUNCTION
|
||
/* Macro used for UTF or UCS endianness suffix. */
|
||
#if WORDS_BIGENDIAN
|
||
#define ENDIAN_SUFFIX "BE"
|
||
#else
|
||
#define ENDIAN_SUFFIX "LE"
|
||
#endif
|
||
|
||
/* The code below serves to generate a compile time error if
|
||
gdb_wchar_t type is not of size 2 nor 4, despite the fact that
|
||
macro __STDC_ISO_10646__ is defined.
|
||
This is better than a gdb_assert call, because GDB cannot handle
|
||
strings correctly if this size is different. */
|
||
|
||
extern char your_gdb_wchar_t_is_bogus[(sizeof (gdb_wchar_t) == 2
|
||
|| sizeof (gdb_wchar_t) == 4)
|
||
? 1 : -1];
|
||
|
||
/* intermediate_encoding returns the charset used internally by
|
||
GDB to convert between target and host encodings. As the test above
|
||
compiled, sizeof (gdb_wchar_t) is either 2 or 4 bytes.
|
||
UTF-16/32 is tested first, UCS-2/4 is tested as a second option,
|
||
otherwise an error is generated. */
|
||
|
||
const char *
|
||
intermediate_encoding (void)
|
||
{
|
||
iconv_t desc;
|
||
static const char *stored_result = NULL;
|
||
char *result;
|
||
|
||
if (stored_result)
|
||
return stored_result;
|
||
result = xstrprintf ("UTF-%d%s", (int) (sizeof (gdb_wchar_t) * 8),
|
||
ENDIAN_SUFFIX);
|
||
/* Check that the name is supported by iconv_open. */
|
||
desc = iconv_open (result, host_charset ());
|
||
if (desc != (iconv_t) -1)
|
||
{
|
||
iconv_close (desc);
|
||
stored_result = result;
|
||
return result;
|
||
}
|
||
/* Not valid, free the allocated memory. */
|
||
xfree (result);
|
||
/* Second try, with UCS-2 type. */
|
||
result = xstrprintf ("UCS-%d%s", (int) sizeof (gdb_wchar_t),
|
||
ENDIAN_SUFFIX);
|
||
/* Check that the name is supported by iconv_open. */
|
||
desc = iconv_open (result, host_charset ());
|
||
if (desc != (iconv_t) -1)
|
||
{
|
||
iconv_close (desc);
|
||
stored_result = result;
|
||
return result;
|
||
}
|
||
/* Not valid, free the allocated memory. */
|
||
xfree (result);
|
||
/* No valid charset found, generate error here. */
|
||
error (_("Unable to find a vaild charset for string conversions"));
|
||
}
|
||
|
||
#endif /* USE_INTERMEDIATE_ENCODING_FUNCTION */
|
||
|
||
void
|
||
_initialize_charset (void)
|
||
{
|
||
/* The first element is always "auto". */
|
||
VEC_safe_push (char_ptr, charsets, xstrdup ("auto"));
|
||
find_charset_names ();
|
||
|
||
if (VEC_length (char_ptr, charsets) > 1)
|
||
charset_enum = (const char **) VEC_address (char_ptr, charsets);
|
||
else
|
||
charset_enum = default_charset_names;
|
||
|
||
#ifndef PHONY_ICONV
|
||
#ifdef HAVE_LANGINFO_CODESET
|
||
/* The result of nl_langinfo may be overwritten later. This may
|
||
leak a little memory, if the user later changes the host charset,
|
||
but that doesn't matter much. */
|
||
auto_host_charset_name = xstrdup (nl_langinfo (CODESET));
|
||
/* Solaris will return `646' here -- but the Solaris iconv then does
|
||
not accept this. Darwin (and maybe FreeBSD) may return "" here,
|
||
which GNU libiconv doesn't like (infinite loop). */
|
||
if (!strcmp (auto_host_charset_name, "646") || !*auto_host_charset_name)
|
||
auto_host_charset_name = "ASCII";
|
||
auto_target_charset_name = auto_host_charset_name;
|
||
#elif defined (USE_WIN32API)
|
||
{
|
||
/* "CP" + x<=5 digits + paranoia. */
|
||
static char w32_host_default_charset[16];
|
||
|
||
snprintf (w32_host_default_charset, sizeof w32_host_default_charset,
|
||
"CP%d", GetACP());
|
||
auto_host_charset_name = w32_host_default_charset;
|
||
auto_target_charset_name = auto_host_charset_name;
|
||
}
|
||
#endif
|
||
#endif
|
||
|
||
add_setshow_enum_cmd ("charset", class_support,
|
||
charset_enum, &host_charset_name, _("\
|
||
Set the host and target character sets."), _("\
|
||
Show the host and target character sets."), _("\
|
||
The `host character set' is the one used by the system GDB is running on.\n\
|
||
The `target character set' is the one used by the program being debugged.\n\
|
||
You may only use supersets of ASCII for your host character set; GDB does\n\
|
||
not support any others.\n\
|
||
To see a list of the character sets GDB supports, type `set charset <TAB>'."),
|
||
/* Note that the sfunc below needs to set
|
||
target_charset_name, because the 'set
|
||
charset' command sets two variables. */
|
||
set_charset_sfunc,
|
||
show_charset,
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_enum_cmd ("host-charset", class_support,
|
||
charset_enum, &host_charset_name, _("\
|
||
Set the host character set."), _("\
|
||
Show the host character set."), _("\
|
||
The `host character set' is the one used by the system GDB is running on.\n\
|
||
You may only use supersets of ASCII for your host character set; GDB does\n\
|
||
not support any others.\n\
|
||
To see a list of the character sets GDB supports, type `set host-charset <TAB>'."),
|
||
set_host_charset_sfunc,
|
||
show_host_charset_name,
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_enum_cmd ("target-charset", class_support,
|
||
charset_enum, &target_charset_name, _("\
|
||
Set the target character set."), _("\
|
||
Show the target character set."), _("\
|
||
The `target character set' is the one used by the program being debugged.\n\
|
||
GDB translates characters and strings between the host and target\n\
|
||
character sets as needed.\n\
|
||
To see a list of the character sets GDB supports, type `set target-charset'<TAB>"),
|
||
set_target_charset_sfunc,
|
||
show_target_charset_name,
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_enum_cmd ("target-wide-charset", class_support,
|
||
charset_enum, &target_wide_charset_name,
|
||
_("\
|
||
Set the target wide character set."), _("\
|
||
Show the target wide character set."), _("\
|
||
The `target wide character set' is the one used by the program being debugged.\
|
||
\nIn particular it is the encoding used by `wchar_t'.\n\
|
||
GDB translates characters and strings between the host and target\n\
|
||
character sets as needed.\n\
|
||
To see a list of the character sets GDB supports, type\n\
|
||
`set target-wide-charset'<TAB>"),
|
||
set_target_wide_charset_sfunc,
|
||
show_target_wide_charset_name,
|
||
&setlist, &showlist);
|
||
}
|