mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
224c3ddb89
Most allocation functions (if not all) return a void* pointing to the allocated memory. In C++, we need to add an explicit cast when assigning the result to a pointer to another type (which is the case more often than not). The content of this patch is taken from Pedro's branch, from commit "(mostly) auto-generated patch to insert casts needed for C++". I validated that the changes make sense and manually reflowed the code to make it respect the coding style. I also found multiple places where I could use XNEW/XNEWVEC/XRESIZEVEC/etc. Thanks a lot to whoever did that automated script to insert casts, doing it completely by hand would have taken a ridiculous amount of time. Only files built on x86 with --enable-targets=all are modified. This means that all other -nat.c files are untouched and will have to be dealt with later by using appropiate compilers. Or maybe we can try to build them with a regular g++ just to know where to add casts, I don't know. I built-tested this with --enable-targets=all and reg-tested. Here's the changelog entry, which was not too bad to make despite the size, thanks to David Malcom's script. I fixed some bits by hand, but there might be some wrong parts left (hopefully not). gdb/ChangeLog: * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Add cast to allocation result assignment. * ada-exp.y (write_object_renaming): Likewise. (write_ambiguous_var): Likewise. (ada_nget_field_index): Likewise. (write_var_or_type): Likewise. * ada-lang.c (ada_decode_symbol): Likewise. (ada_value_assign): Likewise. (value_pointer): Likewise. (cache_symbol): Likewise. (add_nonlocal_symbols): Likewise. (ada_name_for_lookup): Likewise. (symbol_completion_add): Likewise. (ada_to_fixed_type_1): Likewise. (ada_get_next_arg): Likewise. (defns_collected): Likewise. * ada-lex.l (processId): Likewise. (processString): Likewise. * ada-tasks.c (read_known_tasks_array): Likewise. (read_known_tasks_list): Likewise. * ada-typeprint.c (decoded_type_name): Likewise. * addrmap.c (addrmap_mutable_create_fixed): Likewise. * amd64-tdep.c (amd64_push_arguments): Likewise. (amd64_displaced_step_copy_insn): Likewise. (amd64_classify_insn_at): Likewise. (amd64_relocate_instruction): Likewise. * amd64obsd-tdep.c (amd64obsd_sigtramp_p): Likewise. * arch-utils.c (simple_displaced_step_copy_insn): Likewise. (initialize_current_architecture): Likewise. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * arm-symbian-tdep.c (arm_symbian_osabi_sniffer): Likewise. * arm-tdep.c (arm_exidx_new_objfile): Likewise. (arm_push_dummy_call): Likewise. (extend_buffer_earlier): Likewise. (arm_adjust_breakpoint_address): Likewise. (arm_skip_stub): Likewise. * auto-load.c (filename_is_in_pattern): Likewise. (maybe_add_script_file): Likewise. (maybe_add_script_text): Likewise. (auto_load_objfile_script_1): Likewise. * auxv.c (ld_so_xfer_auxv): Likewise. * ax-general.c (new_agent_expr): Likewise. (grow_expr): Likewise. (ax_reg_mask): Likewise. * bcache.c (bcache_full): Likewise. * breakpoint.c (program_breakpoint_here_p): Likewise. * btrace.c (parse_xml_raw): Likewise. * build-id.c (build_id_to_debug_bfd): Likewise. * buildsym.c (end_symtab_with_blockvector): Likewise. * c-exp.y (string_exp): Likewise. (qualified_name): Likewise. (write_destructor_name): Likewise. (operator_stoken): Likewise. (parse_number): Likewise. (scan_macro_expansion): Likewise. (yylex): Likewise. (c_print_token): Likewise. * c-lang.c (c_get_string): Likewise. (emit_numeric_character): Likewise. * charset.c (wchar_iterate): Likewise. * cli/cli-cmds.c (complete_command): Likewise. (make_command): Likewise. * cli/cli-dump.c (restore_section_callback): Likewise. (restore_binary_file): Likewise. * cli/cli-interp.c (cli_interpreter_exec): Likewise. * cli/cli-script.c (execute_control_command): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (add_pe_forwarded_sym): Likewise. (read_pe_exported_syms): Likewise. * coffread.c (coff_read_struct_type): Likewise. (coff_read_enum_type): Likewise. * common/btrace-common.c (btrace_data_append): Likewise. * common/buffer.c (buffer_grow): Likewise. * common/filestuff.c (gdb_fopen_cloexec): Likewise. * common/format.c (parse_format_string): Likewise. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Likewise. * common/xml-utils.c (xml_escape_text): Likewise. * compile/compile-object-load.c (copy_sections): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * completer.c (filename_completer): Likewise. * corefile.c (read_memory_typed_address): Likewise. (write_memory_unsigned_integer): Likewise. (write_memory_signed_integer): Likewise. (complete_set_gnutarget): Likewise. * corelow.c (get_core_register_section): Likewise. * cp-name-parser.y (d_grab): Likewise. (allocate_info): Likewise. (cp_new_demangle_parse_info): Likewise. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Likewise. (cp_lookup_symbol_in_namespace): Likewise. (lookup_namespace_scope): Likewise. (find_symbol_in_baseclass): Likewise. (cp_lookup_nested_symbol): Likewise. (cp_lookup_transparent_type_loop): Likewise. * cp-support.c (copy_string_to_obstack): Likewise. (make_symbol_overload_list): Likewise. (make_symbol_overload_list_namespace): Likewise. (make_symbol_overload_list_adl_namespace): Likewise. (first_component_command): Likewise. * cp-valprint.c (cp_print_value): Likewise. * ctf.c (ctf_xfer_partial): Likewise. * d-exp.y (StringExp): Likewise. * d-namespace.c (d_lookup_symbol_in_module): Likewise. (lookup_module_scope): Likewise. (find_symbol_in_baseclass): Likewise. (d_lookup_nested_symbol): Likewise. * dbxread.c (find_stab_function_addr): Likewise. (read_dbx_symtab): Likewise. (dbx_end_psymtab): Likewise. (cp_set_block_scope): Likewise. * dcache.c (dcache_alloc): Likewise. * demangle.c (_initialize_demangler): Likewise. * dicos-tdep.c (dicos_load_module_p): Likewise. * dictionary.c (dict_create_hashed_expandable): Likewise. (dict_create_linear_expandable): Likewise. (expand_hashtable): Likewise. (add_symbol_linear_expandable): Likewise. * dwarf2-frame.c (add_cie): Likewise. (add_fde): Likewise. (dwarf2_build_frame_info): Likewise. * dwarf2expr.c (dwarf_expr_grow_stack): Likewise. (dwarf_expr_fetch_address): Likewise. (add_piece): Likewise. (execute_stack_op): Likewise. * dwarf2loc.c (chain_candidate): Likewise. (dwarf_entry_parameter_to_value): Likewise. (read_pieced_value): Likewise. (write_pieced_value): Likewise. * dwarf2read.c (dwarf2_read_section): Likewise. (add_type_unit): Likewise. (read_comp_units_from_section): Likewise. (fixup_go_packaging): Likewise. (dwarf2_compute_name): Likewise. (dwarf2_physname): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (read_call_site_scope): Likewise. (dwarf2_attach_fields_to_type): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (read_common_block): Likewise. (abbrev_table_read_table): Likewise. (guess_partial_die_structure_name): Likewise. (fixup_partial_die): Likewise. (add_file_name): Likewise. (dwarf2_const_value_data): Likewise. (dwarf2_const_value_attr): Likewise. (build_error_marker_type): Likewise. (guess_full_die_structure_name): Likewise. (anonymous_struct_prefix): Likewise. (typename_concat): Likewise. (dwarf2_canonicalize_name): Likewise. (dwarf2_name): Likewise. (write_constant_as_bytes): Likewise. (dwarf2_fetch_constant_bytes): Likewise. (copy_string): Likewise. (parse_macro_definition): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_rel_plt_read): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_gnu_ifunc_resolve_by_got): Likewise. (elf_read_minimal_symbols): Likewise. (elf_gnu_ifunc_record_cache): Likewise. * event-top.c (top_level_prompt): Likewise. (command_line_handler): Likewise. * exec.c (resize_section_table): Likewise. * expprint.c (print_subexp_standard): Likewise. * fbsd-tdep.c (fbsd_collect_regset_section_cb): Likewise. * findcmd.c (parse_find_args): Likewise. * findvar.c (address_from_register): Likewise. * frame.c (get_prev_frame_always): Likewise. * gdb_bfd.c (gdb_bfd_ref): Likewise. (get_section_descriptor): Likewise. * gdb_obstack.c (obconcat): Likewise. (obstack_strdup): Likewise. * gdbtypes.c (lookup_function_type_with_arguments): Likewise. (create_set_type): Likewise. (lookup_unsigned_typename): Likewise. (lookup_signed_typename): Likewise. (resolve_dynamic_union): Likewise. (resolve_dynamic_struct): Likewise. (add_dyn_prop): Likewise. (copy_dynamic_prop_list): Likewise. (arch_flags_type): Likewise. (append_composite_type_field_raw): Likewise. * gdbtypes.h (INIT_FUNC_SPECIFIC): Likewise. * gnu-v3-abi.c (gnuv3_rtti_type): Likewise. * go-exp.y (string_exp): Likewise. * go-lang.c (go_demangle): Likewise. * guile/guile.c (compute_scheme_string): Likewise. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. (gdbscm_canonicalize_command_name): Likewise. * guile/scm-ports.c (ioscm_init_stdio_buffers): Likewise. (ioscm_init_memory_port): Likewise. (ioscm_reinit_memory_port): Likewise. * guile/scm-utils.c (gdbscm_gc_xstrdup): Likewise. (gdbscm_gc_dup_argv): Likewise. * h8300-tdep.c (h8300_push_dummy_call): Likewise. * hppa-tdep.c (internalize_unwinds): Likewise. (read_unwind_info): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. (windows_core_xfer_shared_libraries): Likewise. * i386-tdep.c (i386_displaced_step_copy_insn): Likewise. (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * i386obsd-tdep.c (i386obsd_sigtramp_p): Likewise. * inf-child.c (inf_child_fileio_readlink): Likewise. * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. (inf_ptrace_store_register): Likewise. * infrun.c (follow_exec): Likewise. (displaced_step_prepare_throw): Likewise. (save_stop_context): Likewise. (save_infcall_suspend_state): Likewise. * jit.c (jit_read_descriptor): Likewise. (jit_read_code_entry): Likewise. (jit_symtab_line_mapping_add_impl): Likewise. (finalize_symtab): Likewise. (jit_unwind_reg_get_impl): Likewise. * jv-exp.y (QualifiedName): Likewise. * jv-lang.c (get_java_utf8_name): Likewise. (type_from_class): Likewise. (java_demangle_type_signature): Likewise. (java_class_name_from_physname): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_value_print): Likewise. * language.c (add_language): Likewise. * linespec.c (add_sal_to_sals_basic): Likewise. (add_sal_to_sals): Likewise. (decode_objc): Likewise. (find_linespec_symbols): Likewise. * linux-fork.c (fork_save_infrun_state): Likewise. * linux-nat.c (linux_nat_detach): Likewise. (linux_nat_fileio_readlink): Likewise. * linux-record.c (record_linux_sockaddr): Likewise. (record_linux_msghdr): Likewise. (Do): Likewise. * linux-tdep.c (linux_core_info_proc_mappings): Likewise. (linux_collect_regset_section_cb): Likewise. (linux_get_siginfo_data): Likewise. * linux-thread-db.c (try_thread_db_load_from_pdir_1): Likewise. (try_thread_db_load_from_dir): Likewise. (thread_db_load_search): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise. (m32c_m16c_pointer_to_address): Likewise. * m68hc11-tdep.c (m68hc11_pseudo_register_write): Likewise. * m68k-tdep.c (m68k_get_longjmp_target): Likewise. * machoread.c (macho_check_dsym): Likewise. * macroexp.c (resize_buffer): Likewise. (gather_arguments): Likewise. (maybe_expand): Likewise. * macrotab.c (new_macro_key): Likewise. (new_source_file): Likewise. (new_macro_definition): Likewise. * mdebugread.c (parse_symbol): Likewise. (parse_type): Likewise. (parse_partial_symbols): Likewise. (psymtab_to_symtab_1): Likewise. * mem-break.c (default_memory_insert_breakpoint): Likewise. * mi/mi-cmd-break.c (mi_argv_to_format): Likewise. * mi/mi-main.c (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_data_write_memory_bytes): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. (mi_parse): Likewise. * minidebug.c (lzma_open): Likewise. (lzma_pread): Likewise. * mips-tdep.c (mips_read_fp_register_single): Likewise. (mips_print_fp_register): Likewise. * mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Likewise. * mipsread.c (read_alphacoff_dynamic_symtab): Likewise. * mt-tdep.c (mt_register_name): Likewise. (mt_registers_info): Likewise. (mt_push_dummy_call): Likewise. * namespace.c (add_using_directive): Likewise. * nat/linux-btrace.c (perf_event_read): Likewise. (linux_enable_bts): Likewise. * nat/linux-osdata.c (linux_common_core_of_thread): Likewise. * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Likewise. * nto-tdep.c (nto_find_and_open_solib): Likewise. (nto_parse_redirection): Likewise. * objc-lang.c (objc_demangle): Likewise. (find_methods): Likewise. * objfiles.c (get_objfile_bfd_data): Likewise. (set_objfile_main_name): Likewise. (allocate_objfile): Likewise. (objfile_relocate): Likewise. (update_section_map): Likewise. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. * p-exp.y (exp): Likewise. (yylex): Likewise. * p-valprint.c (pascal_object_print_value): Likewise. * parse.c (initialize_expout): Likewise. (mark_completion_tag): Likewise. (copy_name): Likewise. (parse_float): Likewise. (type_stack_reserve): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. (ppu2spu_prev_register): Likewise. * ppc-ravenscar-thread.c (supply_register_at_address): Likewise. * printcmd.c (printf_wide_c_string): Likewise. (printf_pointer): Likewise. * probe.c (parse_probes): Likewise. * python/py-cmd.c (gdbpy_parse_command_name): Likewise. (cmdpy_init): Likewise. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Likewise. * python/py-symtab.c (set_sal): Likewise. * python/py-unwind.c (pyuw_sniffer): Likewise. * python/python.c (python_interactive_command): Likewise. (compute_python_string): Likewise. * ravenscar-thread.c (get_running_thread_id): Likewise. * record-full.c (record_full_exec_insn): Likewise. (record_full_core_open_1): Likewise. * regcache.c (regcache_raw_read_signed): Likewise. (regcache_raw_read_unsigned): Likewise. (regcache_cooked_read_signed): Likewise. (regcache_cooked_read_unsigned): Likewise. * remote-fileio.c (remote_fileio_func_open): Likewise. (remote_fileio_func_rename): Likewise. (remote_fileio_func_unlink): Likewise. (remote_fileio_func_stat): Likewise. (remote_fileio_func_system): Likewise. * remote-mips.c (mips_xfer_memory): Likewise. (mips_load_srec): Likewise. (pmon_end_download): Likewise. * remote.c (new_remote_state): Likewise. (map_regcache_remote_table): Likewise. (remote_register_number_and_offset): Likewise. (init_remote_state): Likewise. (get_memory_packet_size): Likewise. (remote_pass_signals): Likewise. (remote_program_signals): Likewise. (remote_start_remote): Likewise. (remote_check_symbols): Likewise. (remote_query_supported): Likewise. (extended_remote_attach): Likewise. (process_g_packet): Likewise. (store_registers_using_G): Likewise. (putpkt_binary): Likewise. (read_frame): Likewise. (compare_sections_command): Likewise. (remote_hostio_pread): Likewise. (remote_hostio_readlink): Likewise. (remote_file_put): Likewise. (remote_file_get): Likewise. (remote_pid_to_exec_file): Likewise. (_initialize_remote): Likewise. * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. (rs6000_aix_core_xfer_shared_libraries_aix): Likewise. * rs6000-tdep.c (ppc_displaced_step_copy_insn): Likewise. (bfd_uses_spe_extensions): Likewise. * s390-linux-tdep.c (s390_displaced_step_copy_insn): Likewise. * score-tdep.c (score7_malloc_and_get_memblock): Likewise. * solib-dsbt.c (decode_loadmap): Likewise. (fetch_loadmap): Likewise. (scan_dyntag): Likewise. (enable_break): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (fetch_loadmap): Likewise. (enable_break2): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_relocate_main_executable): Likewise. (spu_bfd_open): Likewise. * solib-svr4.c (lm_info_read): Likewise. (read_program_header): Likewise. (find_program_interpreter): Likewise. (scan_dyntag): Likewise. (elf_locate_base): Likewise. (open_symbol_file_object): Likewise. (read_program_headers_from_bfd): Likewise. (svr4_relocate_main_executable): Likewise. * solib-target.c (solib_target_relocate_section_addresses): Likewise. * solib.c (solib_find_1): Likewise. (exec_file_find): Likewise. (solib_find): Likewise. * source.c (openp): Likewise. (print_source_lines_base): Likewise. (forward_search_command): Likewise. * sparc-ravenscar-thread.c (supply_register_at_address): Likewise. * spu-tdep.c (spu2ppu_prev_register): Likewise. (spu_get_overlay_table): Likewise. * stabsread.c (patch_block_stabs): Likewise. (define_symbol): Likewise. (again:): Likewise. (read_member_functions): Likewise. (read_one_struct_field): Likewise. (read_enum_type): Likewise. (common_block_start): Likewise. * stack.c (read_frame_arg): Likewise. (backtrace_command): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. * symfile.c (syms_from_objfile_1): Likewise. (find_separate_debug_file): Likewise. (load_command): Likewise. (load_progress): Likewise. (load_section_callback): Likewise. (reread_symbols): Likewise. (add_filename_language): Likewise. (allocate_compunit_symtab): Likewise. (read_target_long_array): Likewise. (simple_read_overlay_table): Likewise. * symtab.c (symbol_set_names): Likewise. (resize_symbol_cache): Likewise. (rbreak_command): Likewise. (completion_list_add_name): Likewise. (completion_list_objc_symbol): Likewise. (add_filename_to_list): Likewise. * target-descriptions.c (maint_print_c_tdesc_cmd): Likewise. * target-memory.c (target_write_memory_blocks): Likewise. * target.c (target_read_string): Likewise. (read_whatever_is_readable): Likewise. (target_read_alloc_1): Likewise. (simple_search_memory): Likewise. (target_fileio_read_alloc_1): Likewise. * tilegx-tdep.c (tilegx_push_dummy_call): Likewise. * top.c (command_line_input): Likewise. * tracefile-tfile.c (tfile_fetch_registers): Likewise. * tracefile.c (tracefile_fetch_registers): Likewise. * tracepoint.c (add_memrange): Likewise. (init_collection_list): Likewise. (add_aexpr): Likewise. (trace_dump_actions): Likewise. (parse_trace_status): Likewise. (parse_tracepoint_definition): Likewise. (parse_tsv_definition): Likewise. (parse_static_tracepoint_marker_definition): Likewise. * tui/tui-file.c (tui_sfileopen): Likewise. (tui_file_adjust_strbuf): Likewise. * tui/tui-io.c (tui_expand_tabs): Likewise. * tui/tui-source.c (tui_set_source_content): Likewise. * typeprint.c (find_global_typedef): Likewise. * ui-file.c (do_ui_file_xstrdup): Likewise. (ui_file_obsavestring): Likewise. (mem_file_write): Likewise. * utils.c (make_hex_string): Likewise. (get_regcomp_error): Likewise. (puts_filtered_tabular): Likewise. (gdb_realpath_keepfile): Likewise. (ldirname): Likewise. (gdb_bfd_errmsg): Likewise. (substitute_path_component): Likewise. * valops.c (search_struct_method): Likewise. (find_oload_champ_namespace_loop): Likewise. * valprint.c (print_decimal_chars): Likewise. (read_string): Likewise. (generic_emit_char): Likewise. * varobj.c (varobj_delete): Likewise. (varobj_value_get_print_value): Likewise. * vaxobsd-tdep.c (vaxobsd_sigtramp_sniffer): Likewise. * windows-tdep.c (display_one_tib): Likewise. * xcoffread.c (read_xcoff_symtab): Likewise. (process_xcoff_symbol): Likewise. (swap_sym): Likewise. (scan_xcoff_symtab): Likewise. (xcoff_initial_scan): Likewise. * xml-support.c (gdb_xml_end_element): Likewise. (xml_process_xincludes): Likewise. (xml_fetch_content_from_file): Likewise. * xml-syscall.c (xml_list_of_syscalls): Likewise. * xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Add cast to allocation result assignment. (gdb_unparse_agent_expr): Likewise. * hostio.c (require_data): Likewise. (handle_pread): Likewise. * linux-low.c (disable_regset): Likewise. (fetch_register): Likewise. (store_register): Likewise. (get_dynamic): Likewise. (linux_qxfer_libraries_svr4): Likewise. * mem-break.c (delete_fast_tracepoint_jump): Likewise. (set_fast_tracepoint_jump): Likewise. (uninsert_fast_tracepoint_jumps_at): Likewise. (reinsert_fast_tracepoint_jumps_at): Likewise. (validate_inserted_breakpoint): Likewise. (clone_agent_expr): Likewise. * regcache.c (init_register_cache): Likewise. * remote-utils.c (putpkt_binary_1): Likewise. (decode_M_packet): Likewise. (decode_X_packet): Likewise. (look_up_one_symbol): Likewise. (relocate_instruction): Likewise. (monitor_output): Likewise. * server.c (handle_search_memory): Likewise. (handle_qxfer_exec_file): Likewise. (handle_qxfer_libraries): Likewise. (handle_qxfer): Likewise. (handle_query): Likewise. (handle_v_cont): Likewise. (handle_v_run): Likewise. (captured_main): Likewise. * target.c (write_inferior_memory): Likewise. * thread-db.c (try_thread_db_load_from_dir): Likewise. * tracepoint.c (init_trace_buffer): Likewise. (add_tracepoint_action): Likewise. (add_traceframe): Likewise. (add_traceframe_block): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtdv): Likewise. (cmd_qtstatus): Likewise. (response_source): Likewise. (response_tsv): Likewise. (cmd_qtnotes): Likewise. (gdb_collect): Likewise. (initialize_tracepoint): Likewise.
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 = 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 = 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);
|
||
}
|