mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
8d7493201c
This patch is part of the make-gdb-buildable-in-C++ effort. The idea is to change some calls to the xmalloc family of functions to calls to the equivalents in the XNEW family. This avoids adding an explicit cast, so it keeps the code a bit more readable. Some of them also map relatively well to a C++ equivalent (XNEW (struct foo) -> new foo), so it will be possible to do scripted replacements if needed. I only changed calls that were obviously allocating memory for one or multiple "objects". Allocation of variable sizes (such as strings or buffer handling) will be for later (and won't use XNEW). - xmalloc (sizeof (struct foo)) -> XNEW (struct foo) - xmalloc (num * sizeof (struct foo)) -> XNEWVEC (struct foo, num) - xcalloc (1, sizeof (struct foo)) -> XCNEW (struct foo) - xcalloc (num, sizeof (struct foo)) -> XCNEWVEC (struct foo, num) - xrealloc (p, num * sizeof (struct foo) -> XRESIZEVEC (struct foo, p, num) - obstack_alloc (ob, sizeof (struct foo)) -> XOBNEW (ob, struct foo) - obstack_alloc (ob, num * sizeof (struct foo)) -> XOBNEWVEC (ob, struct foo, num) - alloca (sizeof (struct foo)) -> XALLOCA (struct foo) - alloca (num * sizeof (struct foo)) -> XALLOCAVEC (struct foo, num) Some instances of xmalloc followed by memset to zero the buffer were replaced by XCNEW or XCNEWVEC. I regtested on x86-64, Ubuntu 14.04, but the patch touches many architecture-specific files. For those I'll have to rely on the buildbot or people complaining that I broke their gdb. gdb/ChangeLog: * aarch64-linux-nat.c (aarch64_add_process): Likewise. * aarch64-tdep.c (aarch64_gdbarch_init): Likewise. * ada-exp.y (write_ambiguous_var): Likewise. * ada-lang.c (resolve_subexp): Likewise. (user_select_syms): Likewise. (assign_aggregate): Likewise. (ada_evaluate_subexp): Likewise. (cache_symbol): Likewise. * addrmap.c (allocate_key): Likewise. (addrmap_create_mutable): Likewise. * aix-thread.c (sync_threadlists): Likewise. * alpha-tdep.c (alpha_push_dummy_call): Likewise. (alpha_gdbarch_init): Likewise. * amd64-windows-tdep.c (amd64_windows_push_arguments): Likewise. * arm-linux-nat.c (arm_linux_add_process): Likewise. * arm-linux-tdep.c (arm_linux_displaced_step_copy_insn): Likewise. * arm-tdep.c (push_stack_item): Likewise. (arm_displaced_step_copy_insn): Likewise. (arm_gdbarch_init): Likewise. (_initialize_arm_tdep): Likewise. * avr-tdep.c (push_stack_item): Likewise. * ax-general.c (new_agent_expr): Likewise. * block.c (block_initialize_namespace): Likewise. * breakpoint.c (alloc_counted_command_line): Likewise. (update_dprintf_command_list): Likewise. (parse_breakpoint_sals): Likewise. (decode_static_tracepoint_spec): Likewise. (until_break_command): Likewise. (clear_command): Likewise. (update_global_location_list): Likewise. (get_breakpoint_objfile_data) Likewise. * btrace.c (ftrace_new_function): Likewise. (btrace_set_insn_history): Likewise. (btrace_set_call_history): Likewise. * buildsym.c (add_symbol_to_list): Likewise. (record_pending_block): Likewise. (start_subfile): Likewise. (start_buildsym_compunit): Likewise. (push_subfile): Likewise. (end_symtab_get_static_block): Likewise. (buildsym_init): Likewise. * cli/cli-cmds.c (source_command): Likewise. * cli/cli-decode.c (add_cmd): Likewise. * cli/cli-script.c (build_command_line): Likewise. (setup_user_args): Likewise. (realloc_body_list): Likewise. (process_next_line): Likewise. (copy_command_lines): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (read_pe_exported_syms): Likewise. * coffread.c (coff_locate_sections): Likewise. (coff_symtab_read): Likewise. (coff_read_struct_type): Likewise. * common/cleanups.c (make_my_cleanup2): Likewise. * common/common-exceptions.c (throw_it): Likewise. * common/filestuff.c (make_cleanup_close): Likewise. * common/format.c (parse_format_string): Likewise. * common/queue.h (DEFINE_QUEUE_P): Likewise. * compile/compile-object-load.c (munmap_list_add): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * compile/compile.c (append_args): Likewise. * corefile.c (specify_exec_file_hook): Likewise. * cp-support.c (make_symbol_overload_list): Likewise. * cris-tdep.c (push_stack_item): Likewise. (cris_gdbarch_init): Likewise. * ctf.c (ctf_trace_file_writer_new): Likewise. * dbxread.c (init_header_files): Likewise. (add_new_header_file): Likewise. (init_bincl_list): Likewise. (dbx_end_psymtab): Likewise. (start_psymtab): Likewise. (dbx_end_psymtab): Likewise. * dcache.c (dcache_init): Likewise. * dictionary.c (dict_create_hashed): Likewise. (dict_create_hashed_expandable): Likewise. (dict_create_linear): Likewise. (dict_create_linear_expandable): Likewise. * dtrace-probe.c (dtrace_process_dof_probe): Likewise. * dummy-frame.c (register_dummy_frame_dtor): Likewise. * dwarf2-frame-tailcall.c (cache_new_ref1): Likewise. * dwarf2-frame.c (dwarf2_build_frame_info): Likewise. (decode_frame_entry_1): Likewise. * dwarf2expr.c (new_dwarf_expr_context): Likewise. * dwarf2loc.c (dwarf2_compile_expr_to_ax): Likewise. * dwarf2read.c (dwarf2_has_info): Likewise. (create_signatured_type_table_from_index): Likewise. (dwarf2_read_index): Likewise. (dw2_get_file_names_reader): Likewise. (create_all_type_units): Likewise. (read_cutu_die_from_dwo): Likewise. (init_tu_and_read_dwo_dies): Likewise. (init_cutu_and_read_dies): Likewise. (create_all_comp_units): Likewise. (queue_comp_unit): Likewise. (inherit_abstract_dies): Likewise. (read_call_site_scope): Likewise. (dwarf2_add_field): Likewise. (dwarf2_add_typedef): Likewise. (dwarf2_add_member_fn): Likewise. (attr_to_dynamic_prop): Likewise. (abbrev_table_alloc_abbrev): Likewise. (abbrev_table_read_table): Likewise. (add_include_dir): Likewise. (add_file_name): Likewise. (dwarf_decode_line_header): Likewise. (dwarf2_const_value_attr): Likewise. (dwarf_alloc_block): Likewise. (parse_macro_definition): Likewise. (set_die_type): Likewise. (write_psymtabs_to_index): Likewise. (create_cus_from_index): Likewise. (dwarf2_create_include_psymtab): Likewise. (process_psymtab_comp_unit_reader): Likewise. (build_type_psymtab_dependencies): Likewise. (read_comp_units_from_section): Likewise. (compute_compunit_symtab_includes): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (load_partial_dies): Likewise. (dwarf2_symbol_mark_computed): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_read_minimal_symbols): Likewise. * environ.c (make_environ): Likewise. * eval.c (evaluate_subexp_standard): Likewise. * event-loop.c (create_file_handler): Likewise. (create_async_signal_handler): Likewise. (create_async_event_handler): Likewise. (create_timer): Likewise. * exec.c (build_section_table): Likewise. * fbsd-nat.c (fbsd_remember_child): Likewise. * fork-child.c (fork_inferior): Likewise. * frv-tdep.c (new_variant): Likewise. * gdbarch.sh (gdbarch_alloc): Likewise. (append_name): Likewise. * gdbtypes.c (rank_function): Likewise. (copy_type_recursive): Likewise. (add_dyn_prop): Likewise. * gnu-nat.c (make_proc): Likewise. (make_inf): Likewise. (gnu_write_inferior): Likewise. * gnu-v3-abi.c (build_gdb_vtable_type): Likewise. (build_std_type_info_type): Likewise. * guile/scm-param.c (compute_enum_list): Likewise. * guile/scm-utils.c (gdbscm_parse_function_args): Likewise. * guile/scm-value.c (gdbscm_value_call): Likewise. * h8300-tdep.c (h8300_gdbarch_init): Likewise. * hppa-tdep.c (hppa_init_objfile_priv_data): Likewise. (read_unwind_info): Likewise. * ia64-tdep.c (ia64_gdbarch_init): Likewise. * infcall.c (dummy_frame_context_saver_setup): Likewise. (call_function_by_hand_dummy): Likewise. * infcmd.c (step_once): Likewise. (finish_forward): Likewise. (attach_command): Likewise. (notice_new_inferior): Likewise. * inferior.c (add_inferior_silent): Likewise. * infrun.c (add_displaced_stepping_state): Likewise. (save_infcall_control_state): Likewise. (save_inferior_ptid): Likewise. (_initialize_infrun): Likewise. * jit.c (bfd_open_from_target_memory): Likewise. (jit_gdbarch_data_init): Likewise. * language.c (add_language): Likewise. * linespec.c (decode_line_2): Likewise. * linux-nat.c (add_to_pid_list): Likewise. (add_initial_lwp): Likewise. * linux-thread-db.c (add_thread_db_info): Likewise. (record_thread): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_gdbarch_init): Likewise. * m68hc11-tdep.c (m68hc11_gdbarch_init): Likewise. * m68k-tdep.c (m68k_gdbarch_init): Likewise. * m88k-tdep.c (m88k_analyze_prologue): Likewise. * macrocmd.c (macro_define_command): Likewise. * macroexp.c (gather_arguments): Likewise. * macroscope.c (sal_macro_scope): Likewise. * macrotab.c (new_macro_table): Likewise. * mdebugread.c (push_parse_stack): Likewise. (parse_partial_symbols): Likewise. (parse_symbol): Likewise. (psymtab_to_symtab_1): Likewise. (new_block): Likewise. (new_psymtab): Likewise. (mdebug_build_psymtabs): Likewise. (add_pending): Likewise. (elfmdebug_build_psymtabs): Likewise. * mep-tdep.c (mep_gdbarch_init): Likewise. * mi/mi-main.c (mi_execute_command): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. * minidebug.c (lzma_open): Likewise. * minsyms.c (terminate_minimal_symbol_table): Likewise. * mips-linux-nat.c (mips_linux_insert_watchpoint): Likewise. * mips-tdep.c (mips_gdbarch_init): Likewise. * mn10300-tdep.c (mn10300_gdbarch_init): Likewise. * msp430-tdep.c (msp430_gdbarch_init): Likewise. * mt-tdep.c (mt_registers_info): Likewise. * nat/aarch64-linux.c (aarch64_linux_new_thread): Likewise. * nat/linux-btrace.c (linux_enable_bts): Likewise. (linux_enable_pt): Likewise. * nat/linux-osdata.c (linux_xfer_osdata_processes): Likewise. (linux_xfer_osdata_processgroups): Likewise. * nios2-tdep.c (nios2_gdbarch_init): Likewise. * nto-procfs.c (procfs_meminfo): Likewise. * objc-lang.c (start_msglist): Likewise. (selectors_info): Likewise. (classes_info): Likewise. (find_methods): Likewise. * objfiles.c (allocate_objfile): Likewise. (update_section_map): Likewise. * osabi.c (gdbarch_register_osabi): Likewise. (gdbarch_register_osabi_sniffer): Likewise. * parse.c (start_arglist): Likewise. * ppc-linux-nat.c (hwdebug_find_thread_points_by_tid): Likewise. (hwdebug_insert_point): Likewise. * printcmd.c (display_command): Likewise. (ui_printf): Likewise. * procfs.c (create_procinfo): Likewise. (load_syscalls): Likewise. (proc_get_LDT_entry): Likewise. (proc_update_threads): Likewise. * prologue-value.c (make_pv_area): Likewise. (pv_area_store): Likewise. * psymtab.c (extend_psymbol_list): Likewise. (init_psymbol_list): Likewise. (allocate_psymtab): Likewise. * python/py-inferior.c (add_thread_object): Likewise. * python/py-param.c (compute_enum_values): Likewise. * python/py-value.c (valpy_call): Likewise. * python/py-varobj.c (py_varobj_iter_next): Likewise. * python/python.c (ensure_python_env): Likewise. * record-btrace.c (record_btrace_start_replaying): Likewise. * record-full.c (record_full_reg_alloc): Likewise. (record_full_mem_alloc): Likewise. (record_full_end_alloc): Likewise. (record_full_core_xfer_partial): Likewise. * regcache.c (get_thread_arch_aspace_regcache): Likewise. * remote-fileio.c (remote_fileio_init_fd_map): Likewise. * remote-notif.c (remote_notif_state_allocate): Likewise. * remote.c (demand_private_info): Likewise. (remote_notif_stop_alloc_reply): Likewise. (remote_enable_btrace): Likewise. * reverse.c (save_bookmark_command): Likewise. * rl78-tdep.c (rl78_gdbarch_init): Likewise. * rx-tdep.c (rx_gdbarch_init): Likewise. * s390-linux-nat.c (s390_insert_watchpoint): Likewise. * ser-go32.c (dos_get_tty_state): Likewise. (dos_copy_tty_state): Likewise. * ser-mingw.c (ser_windows_open): Likewise. (ser_console_wait_handle): Likewise. (ser_console_get_tty_state): Likewise. (make_pipe_state): Likewise. (net_windows_open): Likewise. * ser-unix.c (hardwire_get_tty_state): Likewise. (hardwire_copy_tty_state): Likewise. * solib-aix.c (solib_aix_new_lm_info): Likewise. * solib-dsbt.c (dsbt_current_sos): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (frv_current_sos): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_bfd_fopen): Likewise. * solib-svr4.c (lm_info_read): Likewise. (svr4_copy_library_list): Likewise. (svr4_default_sos): Likewise. * source.c (find_source_lines): Likewise. (line_info): Likewise. (add_substitute_path_rule): Likewise. * spu-linux-nat.c (spu_bfd_open): Likewise. * spu-tdep.c (info_spu_dma_cmdlist): Likewise. * stabsread.c (dbx_lookup_type): Likewise. (read_type): Likewise. (read_member_functions): Likewise. (read_struct_fields): Likewise. (read_baseclasses): Likewise. (read_args): Likewise. (_initialize_stabsread): Likewise. * stack.c (func_command): Likewise. * stap-probe.c (handle_stap_probe): Likewise. * symfile.c (addrs_section_sort): Likewise. (addr_info_make_relative): Likewise. (load_section_callback): Likewise. (add_symbol_file_command): Likewise. (init_filename_language_table): Likewise. * symtab.c (create_filename_seen_cache): Likewise. (sort_search_symbols_remove_dups): Likewise. (search_symbols): Likewise. * target.c (make_cleanup_restore_target_terminal): Likewise. * thread.c (new_thread): Likewise. (enable_thread_stack_temporaries): Likewise. (make_cleanup_restore_current_thread): Likewise. (thread_apply_all_command): Likewise. * tic6x-tdep.c (tic6x_gdbarch_init): Likewise. * top.c (gdb_readline_wrapper): Likewise. * tracefile-tfile.c (tfile_trace_file_writer_new): Likewise. * tracepoint.c (trace_find_line_command): Likewise. (all_tracepoint_actions_and_cleanup): Likewise. (make_cleanup_restore_current_traceframe): Likewise. (get_uploaded_tp): Likewise. (get_uploaded_tsv): Likewise. * tui/tui-data.c (tui_alloc_generic_win_info): Likewise. (tui_alloc_win_info): Likewise. (tui_alloc_content): Likewise. (tui_add_content_elements): Likewise. * tui/tui-disasm.c (tui_find_disassembly_address): Likewise. (tui_set_disassem_content): Likewise. * ui-file.c (ui_file_new): Likewise. (stdio_file_new): Likewise. (tee_file_new): Likewise. * utils.c (make_cleanup_restore_integer): Likewise. (add_internal_problem_command): Likewise. * v850-tdep.c (v850_gdbarch_init): Likewise. * valops.c (find_oload_champ): Likewise. * value.c (allocate_value_lazy): Likewise. (record_latest_value): Likewise. (create_internalvar): Likewise. * varobj.c (install_variable): Likewise. (new_variable): Likewise. (new_root_variable): Likewise. (cppush): Likewise. (_initialize_varobj): Likewise. * windows-nat.c (windows_make_so): Likewise. * x86-nat.c (x86_add_process): Likewise. * xcoffread.c (arrange_linetable): Likewise. (allocate_include_entry): Likewise. (process_linenos): Likewise. (SYMBOL_DUP): Likewise. (xcoff_start_psymtab): Likewise. (xcoff_end_psymtab): Likewise. * xml-support.c (gdb_xml_parse_attr_ulongest): Likewise. * xtensa-tdep.c (xtensa_register_type): Likewise. * gdbarch.c: Regenerate. * gdbarch.h: Regenerate. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Likewise. (compile_bytecodes): Likewise. * dll.c (loaded_dll): Likewise. * event-loop.c (append_callback_event): Likewise. (create_file_handler): Likewise. (create_file_event): Likewise. * hostio.c (handle_open): Likewise. * inferiors.c (add_thread): Likewise. (add_process): Likewise. * linux-aarch64-low.c (aarch64_linux_new_process): Likewise. * linux-arm-low.c (arm_new_process): Likewise. (arm_new_thread): Likewise. * linux-low.c (add_to_pid_list): Likewise. (linux_add_process): Likewise. (handle_extended_wait): Likewise. (add_lwp): Likewise. (enqueue_one_deferred_signal): Likewise. (enqueue_pending_signal): Likewise. (linux_resume_one_lwp_throw): Likewise. (linux_resume_one_thread): Likewise. (linux_read_memory): Likewise. (linux_write_memory): Likewise. * linux-mips-low.c (mips_linux_new_process): Likewise. (mips_linux_new_thread): Likewise. (mips_add_watchpoint): Likewise. * linux-x86-low.c (initialize_low_arch): Likewise. * lynx-low.c (lynx_add_process): Likewise. * mem-break.c (set_raw_breakpoint_at): Likewise. (set_breakpoint): Likewise. (add_condition_to_breakpoint): Likewise. (add_commands_to_breakpoint): Likewise. (clone_agent_expr): Likewise. (clone_one_breakpoint): Likewise. * regcache.c (new_register_cache): Likewise. * remote-utils.c (look_up_one_symbol): Likewise. * server.c (queue_stop_reply): Likewise. (start_inferior): Likewise. (queue_stop_reply_callback): Likewise. (handle_target_event): Likewise. * spu-low.c (fetch_ppc_memory): Likewise. (store_ppc_memory): Likewise. * target.c (set_target_ops): Likewise. * thread-db.c (thread_db_load_search): Likewise. (try_thread_db_load_1): Likewise. * tracepoint.c (add_tracepoint): Likewise. (add_tracepoint_action): Likewise. (create_trace_state_variable): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtro): Likewise. (add_while_stepping_state): Likewise. * win32-low.c (child_add_thread): Likewise. (get_image_name): Likewise.
643 lines
16 KiB
C
643 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 = 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 = 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;
|
||
}
|