
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.
644 lines
16 KiB
C
644 lines
16 KiB
C
/* General utility routines for GDB/Scheme code.
|
||
|
||
Copyright (C) 2014-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/>. */
|
||
|
||
/* See README file in this directory for implementation notes, coding
|
||
conventions, et.al. */
|
||
|
||
#include "defs.h"
|
||
#include "guile-internal.h"
|
||
|
||
/* Define VARIABLES in the gdb module. */
|
||
|
||
void
|
||
gdbscm_define_variables (const scheme_variable *variables, int is_public)
|
||
{
|
||
const scheme_variable *sv;
|
||
|
||
for (sv = variables; sv->name != NULL; ++sv)
|
||
{
|
||
scm_c_define (sv->name, sv->value);
|
||
if (is_public)
|
||
scm_c_export (sv->name, NULL);
|
||
}
|
||
}
|
||
|
||
/* Define FUNCTIONS in the gdb module. */
|
||
|
||
void
|
||
gdbscm_define_functions (const scheme_function *functions, int is_public)
|
||
{
|
||
const scheme_function *sf;
|
||
|
||
for (sf = functions; sf->name != NULL; ++sf)
|
||
{
|
||
SCM proc = scm_c_define_gsubr (sf->name, sf->required, sf->optional,
|
||
sf->rest, sf->func);
|
||
|
||
scm_set_procedure_property_x (proc, gdbscm_documentation_symbol,
|
||
gdbscm_scm_from_c_string (sf->doc_string));
|
||
if (is_public)
|
||
scm_c_export (sf->name, NULL);
|
||
}
|
||
}
|
||
|
||
/* Define CONSTANTS in the gdb module. */
|
||
|
||
void
|
||
gdbscm_define_integer_constants (const scheme_integer_constant *constants,
|
||
int is_public)
|
||
{
|
||
const scheme_integer_constant *sc;
|
||
|
||
for (sc = constants; sc->name != NULL; ++sc)
|
||
{
|
||
scm_c_define (sc->name, scm_from_int (sc->value));
|
||
if (is_public)
|
||
scm_c_export (sc->name, NULL);
|
||
}
|
||
}
|
||
|
||
/* scm_printf, alas it doesn't exist. */
|
||
|
||
void
|
||
gdbscm_printf (SCM port, const char *format, ...)
|
||
{
|
||
va_list args;
|
||
char *string;
|
||
|
||
va_start (args, format);
|
||
string = xstrvprintf (format, args);
|
||
va_end (args);
|
||
scm_puts (string, port);
|
||
xfree (string);
|
||
}
|
||
|
||
/* Utility for calling from gdb to "display" an SCM object. */
|
||
|
||
void
|
||
gdbscm_debug_display (SCM obj)
|
||
{
|
||
SCM port = scm_current_output_port ();
|
||
|
||
scm_display (obj, port);
|
||
scm_newline (port);
|
||
scm_force_output (port);
|
||
}
|
||
|
||
/* Utility for calling from gdb to "write" an SCM object. */
|
||
|
||
void
|
||
gdbscm_debug_write (SCM obj)
|
||
{
|
||
SCM port = scm_current_output_port ();
|
||
|
||
scm_write (obj, port);
|
||
scm_newline (port);
|
||
scm_force_output (port);
|
||
}
|
||
|
||
/* Subroutine of gdbscm_parse_function_args to simplify it.
|
||
Return the number of keyword arguments. */
|
||
|
||
static int
|
||
count_keywords (const SCM *keywords)
|
||
{
|
||
int i;
|
||
|
||
if (keywords == NULL)
|
||
return 0;
|
||
for (i = 0; keywords[i] != SCM_BOOL_F; ++i)
|
||
continue;
|
||
|
||
return i;
|
||
}
|
||
|
||
/* Subroutine of gdbscm_parse_function_args to simplify it.
|
||
Validate an argument format string.
|
||
The result is a boolean indicating if "." was seen. */
|
||
|
||
static int
|
||
validate_arg_format (const char *format)
|
||
{
|
||
const char *p;
|
||
int length = strlen (format);
|
||
int optional_position = -1;
|
||
int keyword_position = -1;
|
||
int dot_seen = 0;
|
||
|
||
gdb_assert (length > 0);
|
||
|
||
for (p = format; *p != '\0'; ++p)
|
||
{
|
||
switch (*p)
|
||
{
|
||
case 's':
|
||
case 't':
|
||
case 'i':
|
||
case 'u':
|
||
case 'l':
|
||
case 'n':
|
||
case 'L':
|
||
case 'U':
|
||
case 'O':
|
||
break;
|
||
case '|':
|
||
gdb_assert (keyword_position < 0);
|
||
gdb_assert (optional_position < 0);
|
||
optional_position = p - format;
|
||
break;
|
||
case '#':
|
||
gdb_assert (keyword_position < 0);
|
||
keyword_position = p - format;
|
||
break;
|
||
case '.':
|
||
gdb_assert (p[1] == '\0');
|
||
dot_seen = 1;
|
||
break;
|
||
default:
|
||
gdb_assert_not_reached ("invalid argument format character");
|
||
}
|
||
}
|
||
|
||
return dot_seen;
|
||
}
|
||
|
||
/* Our version of SCM_ASSERT_TYPE that calls gdbscm_make_type_error. */
|
||
#define CHECK_TYPE(ok, arg, position, func_name, expected_type) \
|
||
do { \
|
||
if (!(ok)) \
|
||
{ \
|
||
return gdbscm_make_type_error ((func_name), (position), (arg), \
|
||
(expected_type)); \
|
||
} \
|
||
} while (0)
|
||
|
||
/* Subroutine of gdbscm_parse_function_args to simplify it.
|
||
Check the type of ARG against FORMAT_CHAR and extract the value.
|
||
POSITION is the position of ARG in the argument list.
|
||
The result is #f upon success or a <gdb:exception> object. */
|
||
|
||
static SCM
|
||
extract_arg (char format_char, SCM arg, void *argp,
|
||
const char *func_name, int position)
|
||
{
|
||
switch (format_char)
|
||
{
|
||
case 's':
|
||
{
|
||
char **arg_ptr = argp;
|
||
|
||
CHECK_TYPE (gdbscm_is_true (scm_string_p (arg)), arg, position,
|
||
func_name, _("string"));
|
||
*arg_ptr = gdbscm_scm_to_c_string (arg);
|
||
break;
|
||
}
|
||
case 't':
|
||
{
|
||
int *arg_ptr = argp;
|
||
|
||
/* While in Scheme, anything non-#f is "true", we're strict. */
|
||
CHECK_TYPE (gdbscm_is_bool (arg), arg, position, func_name,
|
||
_("boolean"));
|
||
*arg_ptr = gdbscm_is_true (arg);
|
||
break;
|
||
}
|
||
case 'i':
|
||
{
|
||
int *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_signed_integer (arg, INT_MIN, INT_MAX),
|
||
arg, position, func_name, _("int"));
|
||
*arg_ptr = scm_to_int (arg);
|
||
break;
|
||
}
|
||
case 'u':
|
||
{
|
||
int *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_unsigned_integer (arg, 0, UINT_MAX),
|
||
arg, position, func_name, _("unsigned int"));
|
||
*arg_ptr = scm_to_uint (arg);
|
||
break;
|
||
}
|
||
case 'l':
|
||
{
|
||
long *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_signed_integer (arg, LONG_MIN, LONG_MAX),
|
||
arg, position, func_name, _("long"));
|
||
*arg_ptr = scm_to_long (arg);
|
||
break;
|
||
}
|
||
case 'n':
|
||
{
|
||
unsigned long *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_unsigned_integer (arg, 0, ULONG_MAX),
|
||
arg, position, func_name, _("unsigned long"));
|
||
*arg_ptr = scm_to_ulong (arg);
|
||
break;
|
||
}
|
||
case 'L':
|
||
{
|
||
LONGEST *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_signed_integer (arg, INT64_MIN, INT64_MAX),
|
||
arg, position, func_name, _("LONGEST"));
|
||
*arg_ptr = gdbscm_scm_to_longest (arg);
|
||
break;
|
||
}
|
||
case 'U':
|
||
{
|
||
ULONGEST *arg_ptr = argp;
|
||
|
||
CHECK_TYPE (scm_is_unsigned_integer (arg, 0, UINT64_MAX),
|
||
arg, position, func_name, _("ULONGEST"));
|
||
*arg_ptr = gdbscm_scm_to_ulongest (arg);
|
||
break;
|
||
}
|
||
case 'O':
|
||
{
|
||
SCM *arg_ptr = argp;
|
||
|
||
*arg_ptr = arg;
|
||
break;
|
||
}
|
||
default:
|
||
gdb_assert_not_reached ("invalid argument format character");
|
||
}
|
||
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
#undef CHECK_TYPE
|
||
|
||
/* Look up KEYWORD in KEYWORD_LIST.
|
||
The result is the index of the keyword in the list or -1 if not found. */
|
||
|
||
static int
|
||
lookup_keyword (const SCM *keyword_list, SCM keyword)
|
||
{
|
||
int i = 0;
|
||
|
||
while (keyword_list[i] != SCM_BOOL_F)
|
||
{
|
||
if (scm_is_eq (keyword_list[i], keyword))
|
||
return i;
|
||
++i;
|
||
}
|
||
|
||
return -1;
|
||
}
|
||
|
||
/* Utility to parse required, optional, and keyword arguments to Scheme
|
||
functions. Modelled on PyArg_ParseTupleAndKeywords, but no attempt is made
|
||
at similarity or functionality.
|
||
There is no result, if there's an error a Scheme exception is thrown.
|
||
|
||
Guile provides scm_c_bind_keyword_arguments, and feel free to use it.
|
||
This is for times when we want a bit more parsing.
|
||
|
||
BEGINNING_ARG_POS is the position of the first argument passed to this
|
||
routine. It should be one of the SCM_ARGn values. It could be > SCM_ARG1
|
||
if the caller chooses not to parse one or more required arguments.
|
||
|
||
KEYWORDS may be NULL if there are no keywords.
|
||
|
||
FORMAT:
|
||
s - string -> char *, malloc'd
|
||
t - boolean (gdb uses "t", for biT?) -> int
|
||
i - int
|
||
u - unsigned int
|
||
l - long
|
||
n - unsigned long
|
||
L - longest
|
||
U - unsigned longest
|
||
O - random scheme object
|
||
| - indicates the next set is for optional arguments
|
||
# - indicates the next set is for keyword arguments (must follow |)
|
||
. - indicates "rest" arguments are present, this character must appear last
|
||
|
||
FORMAT must match the definition from scm_c_{make,define}_gsubr.
|
||
Required and optional arguments appear in order in the format string.
|
||
Afterwards, keyword-based arguments are processed. There must be as many
|
||
remaining characters in the format string as their are keywords.
|
||
Except for "|#.", the number of characters in the format string must match
|
||
#required + #optional + #keywords.
|
||
|
||
The function is required to be defined in a compatible manner:
|
||
#required-args and #optional-arguments must match, and rest-arguments
|
||
must be specified if keyword args are desired, and/or regular "rest" args.
|
||
|
||
Example: For this function,
|
||
scm_c_define_gsubr ("execute", 2, 3, 1, foo);
|
||
the format string + keyword list could be any of:
|
||
1) "ss|ttt#tt", { "key1", "key2", NULL }
|
||
2) "ss|ttt.", { NULL }
|
||
3) "ss|ttt#t.", { "key1", NULL }
|
||
|
||
For required and optional args pass the SCM of the argument, and a
|
||
pointer to the value to hold the parsed result (type depends on format
|
||
char). After that pass the SCM containing the "rest" arguments followed
|
||
by pointers to values to hold parsed keyword arguments, and if specified
|
||
a pointer to hold the remaining contents of "rest".
|
||
|
||
For keyword arguments pass two pointers: the first is a pointer to an int
|
||
that will contain the position of the argument in the arg list, and the
|
||
second will contain result of processing the argument. The int pointed
|
||
to by the first value should be initialized to -1. It can then be used
|
||
to tell whether the keyword was present.
|
||
|
||
If both keyword and rest arguments are present, the caller must pass a
|
||
pointer to contain the new value of rest (after keyword args have been
|
||
removed).
|
||
|
||
There's currently no way, that I know of, to specify default values for
|
||
optional arguments in C-provided functions. At the moment they're a
|
||
work-in-progress. The caller should test SCM_UNBNDP for each optional
|
||
argument. Unbound optional arguments are ignored. */
|
||
|
||
void
|
||
gdbscm_parse_function_args (const char *func_name,
|
||
int beginning_arg_pos,
|
||
const SCM *keywords,
|
||
const char *format, ...)
|
||
{
|
||
va_list args;
|
||
const char *p;
|
||
int i, have_rest, num_keywords, length, position;
|
||
int have_optional = 0;
|
||
SCM status;
|
||
SCM rest = SCM_EOL;
|
||
/* Keep track of malloc'd strings. We need to free them upon error. */
|
||
VEC (char_ptr) *allocated_strings = NULL;
|
||
char *ptr;
|
||
|
||
have_rest = validate_arg_format (format);
|
||
num_keywords = count_keywords (keywords);
|
||
|
||
va_start (args, format);
|
||
|
||
p = format;
|
||
position = beginning_arg_pos;
|
||
|
||
/* Process required, optional arguments. */
|
||
|
||
while (*p && *p != '#' && *p != '.')
|
||
{
|
||
SCM arg;
|
||
void *arg_ptr;
|
||
|
||
if (*p == '|')
|
||
{
|
||
have_optional = 1;
|
||
++p;
|
||
continue;
|
||
}
|
||
|
||
arg = va_arg (args, SCM);
|
||
if (!have_optional || !SCM_UNBNDP (arg))
|
||
{
|
||
arg_ptr = va_arg (args, void *);
|
||
status = extract_arg (*p, arg, arg_ptr, func_name, position);
|
||
if (!gdbscm_is_false (status))
|
||
goto fail;
|
||
if (*p == 's')
|
||
VEC_safe_push (char_ptr, allocated_strings, *(char **) arg_ptr);
|
||
}
|
||
++p;
|
||
++position;
|
||
}
|
||
|
||
/* Process keyword arguments. */
|
||
|
||
if (have_rest || num_keywords > 0)
|
||
rest = va_arg (args, SCM);
|
||
|
||
if (num_keywords > 0)
|
||
{
|
||
SCM *keyword_args = XALLOCAVEC (SCM, num_keywords);
|
||
int *keyword_positions = XALLOCAVEC (int, num_keywords);
|
||
|
||
gdb_assert (*p == '#');
|
||
++p;
|
||
|
||
for (i = 0; i < num_keywords; ++i)
|
||
{
|
||
keyword_args[i] = SCM_UNSPECIFIED;
|
||
keyword_positions[i] = -1;
|
||
}
|
||
|
||
while (scm_is_pair (rest)
|
||
&& scm_is_keyword (scm_car (rest)))
|
||
{
|
||
SCM keyword = scm_car (rest);
|
||
|
||
i = lookup_keyword (keywords, keyword);
|
||
if (i < 0)
|
||
{
|
||
status = gdbscm_make_error (scm_arg_type_key, func_name,
|
||
_("Unrecognized keyword: ~a"),
|
||
scm_list_1 (keyword), keyword);
|
||
goto fail;
|
||
}
|
||
if (!scm_is_pair (scm_cdr (rest)))
|
||
{
|
||
status = gdbscm_make_error
|
||
(scm_arg_type_key, func_name,
|
||
_("Missing value for keyword argument"),
|
||
scm_list_1 (keyword), keyword);
|
||
goto fail;
|
||
}
|
||
keyword_args[i] = scm_cadr (rest);
|
||
keyword_positions[i] = position + 1;
|
||
rest = scm_cddr (rest);
|
||
position += 2;
|
||
}
|
||
|
||
for (i = 0; i < num_keywords; ++i)
|
||
{
|
||
int *arg_pos_ptr = va_arg (args, int *);
|
||
void *arg_ptr = va_arg (args, void *);
|
||
SCM arg = keyword_args[i];
|
||
|
||
if (! scm_is_eq (arg, SCM_UNSPECIFIED))
|
||
{
|
||
*arg_pos_ptr = keyword_positions[i];
|
||
status = extract_arg (p[i], arg, arg_ptr, func_name,
|
||
keyword_positions[i]);
|
||
if (!gdbscm_is_false (status))
|
||
goto fail;
|
||
if (p[i] == 's')
|
||
{
|
||
VEC_safe_push (char_ptr, allocated_strings,
|
||
*(char **) arg_ptr);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Process "rest" arguments. */
|
||
|
||
if (have_rest)
|
||
{
|
||
if (num_keywords > 0)
|
||
{
|
||
SCM *rest_ptr = va_arg (args, SCM *);
|
||
|
||
*rest_ptr = rest;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
if (! scm_is_null (rest))
|
||
{
|
||
status = gdbscm_make_error (scm_args_number_key, func_name,
|
||
_("Too many arguments"),
|
||
SCM_EOL, SCM_BOOL_F);
|
||
goto fail;
|
||
}
|
||
}
|
||
|
||
va_end (args);
|
||
VEC_free (char_ptr, allocated_strings);
|
||
return;
|
||
|
||
fail:
|
||
va_end (args);
|
||
for (i = 0; VEC_iterate (char_ptr, allocated_strings, i, ptr); ++i)
|
||
xfree (ptr);
|
||
VEC_free (char_ptr, allocated_strings);
|
||
gdbscm_throw (status);
|
||
}
|
||
|
||
/* Return longest L as a scheme object. */
|
||
|
||
SCM
|
||
gdbscm_scm_from_longest (LONGEST l)
|
||
{
|
||
return scm_from_int64 (l);
|
||
}
|
||
|
||
/* Convert scheme object L to LONGEST.
|
||
It is an error to call this if L is not an integer in range of LONGEST.
|
||
(because the underlying Scheme function will thrown an exception,
|
||
which is not part of our contract with the caller). */
|
||
|
||
LONGEST
|
||
gdbscm_scm_to_longest (SCM l)
|
||
{
|
||
return scm_to_int64 (l);
|
||
}
|
||
|
||
/* Return unsigned longest L as a scheme object. */
|
||
|
||
SCM
|
||
gdbscm_scm_from_ulongest (ULONGEST l)
|
||
{
|
||
return scm_from_uint64 (l);
|
||
}
|
||
|
||
/* Convert scheme object U to ULONGEST.
|
||
It is an error to call this if U is not an integer in range of ULONGEST
|
||
(because the underlying Scheme function will thrown an exception,
|
||
which is not part of our contract with the caller). */
|
||
|
||
ULONGEST
|
||
gdbscm_scm_to_ulongest (SCM u)
|
||
{
|
||
return scm_to_uint64 (u);
|
||
}
|
||
|
||
/* Same as scm_dynwind_free, but uses xfree. */
|
||
|
||
void
|
||
gdbscm_dynwind_xfree (void *ptr)
|
||
{
|
||
scm_dynwind_unwind_handler (xfree, ptr, SCM_F_WIND_EXPLICITLY);
|
||
}
|
||
|
||
/* Return non-zero if PROC is a procedure. */
|
||
|
||
int
|
||
gdbscm_is_procedure (SCM proc)
|
||
{
|
||
return gdbscm_is_true (scm_procedure_p (proc));
|
||
}
|
||
|
||
/* Same as xstrdup, but the string is allocated on the GC heap. */
|
||
|
||
char *
|
||
gdbscm_gc_xstrdup (const char *str)
|
||
{
|
||
size_t len = strlen (str);
|
||
char *result
|
||
= (char *) scm_gc_malloc_pointerless (len + 1, "gdbscm_gc_xstrdup");
|
||
|
||
strcpy (result, str);
|
||
return result;
|
||
}
|
||
|
||
/* Return a duplicate of ARGV living on the GC heap. */
|
||
|
||
const char * const *
|
||
gdbscm_gc_dup_argv (char **argv)
|
||
{
|
||
int i, len;
|
||
size_t string_space;
|
||
char *p, **result;
|
||
|
||
for (len = 0, string_space = 0; argv[len] != NULL; ++len)
|
||
string_space += strlen (argv[len]) + 1;
|
||
|
||
/* Allocating "pointerless" works because the pointers are all
|
||
self-contained within the object. */
|
||
result = (char **) scm_gc_malloc_pointerless (((len + 1) * sizeof (char *))
|
||
+ string_space,
|
||
"parameter enum list");
|
||
p = (char *) &result[len + 1];
|
||
|
||
for (i = 0; i < len; ++i)
|
||
{
|
||
result[i] = p;
|
||
strcpy (p, argv[i]);
|
||
p += strlen (p) + 1;
|
||
}
|
||
result[i] = NULL;
|
||
|
||
return (const char * const *) result;
|
||
}
|
||
|
||
/* Return non-zero if the version of Guile being used it at least
|
||
MAJOR.MINOR.MICRO. */
|
||
|
||
int
|
||
gdbscm_guile_version_is_at_least (int major, int minor, int micro)
|
||
{
|
||
if (major > gdbscm_guile_major_version)
|
||
return 0;
|
||
if (major < gdbscm_guile_major_version)
|
||
return 1;
|
||
if (minor > gdbscm_guile_minor_version)
|
||
return 0;
|
||
if (minor < gdbscm_guile_minor_version)
|
||
return 1;
|
||
if (micro > gdbscm_guile_micro_version)
|
||
return 0;
|
||
return 1;
|
||
}
|