2011-10-09 22:21:48 +02:00
|
|
|
/* Virtual tail call frames unwinder for GDB.
|
|
|
|
|
2015-01-01 10:32:14 +01:00
|
|
|
Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
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 "frame.h"
|
|
|
|
#include "dwarf2-frame-tailcall.h"
|
|
|
|
#include "dwarf2loc.h"
|
|
|
|
#include "frame-unwind.h"
|
|
|
|
#include "block.h"
|
|
|
|
#include "hashtab.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "regcache.h"
|
|
|
|
#include "value.h"
|
2011-10-21 01:57:23 +02:00
|
|
|
#include "dwarf2-frame.h"
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
/* Contains struct tailcall_cache indexed by next_bottom_frame. */
|
|
|
|
static htab_t cache_htab;
|
|
|
|
|
|
|
|
/* Associate structure of the unwinder to call_site_chain. Lifetime of this
|
|
|
|
structure is maintained by REFC decremented by dealloc_cache, all of them
|
|
|
|
get deleted during reinit_frame_cache. */
|
|
|
|
struct tailcall_cache
|
|
|
|
{
|
|
|
|
/* It must be the first one of this struct. It is the furthest callee. */
|
|
|
|
struct frame_info *next_bottom_frame;
|
|
|
|
|
|
|
|
/* Reference count. The whole chain of virtual tail call frames shares one
|
|
|
|
tailcall_cache. */
|
|
|
|
int refc;
|
|
|
|
|
|
|
|
/* Associated found virtual taill call frames chain, it is never NULL. */
|
|
|
|
struct call_site_chain *chain;
|
|
|
|
|
|
|
|
/* Cached pretended_chain_levels result. */
|
|
|
|
int chain_levels;
|
|
|
|
|
|
|
|
/* Unwound PC from the top (caller) frame, as it is not contained
|
|
|
|
in CHAIN. */
|
|
|
|
CORE_ADDR prev_pc;
|
|
|
|
|
|
|
|
/* Compensate SP in caller frames appropriately. prev_sp and
|
|
|
|
entry_cfa_sp_offset are valid only if PREV_SP_P. PREV_SP is SP at the top
|
|
|
|
(caller) frame. ENTRY_CFA_SP_OFFSET is shift of SP in tail call frames
|
|
|
|
against next_bottom_frame SP. */
|
|
|
|
unsigned prev_sp_p : 1;
|
|
|
|
CORE_ADDR prev_sp;
|
|
|
|
LONGEST entry_cfa_sp_offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* hash_f for htab_create_alloc of cache_htab. */
|
|
|
|
|
|
|
|
static hashval_t
|
|
|
|
cache_hash (const void *arg)
|
|
|
|
{
|
|
|
|
const struct tailcall_cache *cache = arg;
|
|
|
|
|
|
|
|
return htab_hash_pointer (cache->next_bottom_frame);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* eq_f for htab_create_alloc of cache_htab. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
cache_eq (const void *arg1, const void *arg2)
|
|
|
|
{
|
|
|
|
const struct tailcall_cache *cache1 = arg1;
|
|
|
|
const struct tailcall_cache *cache2 = arg2;
|
|
|
|
|
|
|
|
return cache1->next_bottom_frame == cache2->next_bottom_frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create new tailcall_cache for NEXT_BOTTOM_FRAME, NEXT_BOTTOM_FRAME must not
|
|
|
|
yet have been indexed by cache_htab. Caller holds one reference of the new
|
|
|
|
tailcall_cache. */
|
|
|
|
|
|
|
|
static struct tailcall_cache *
|
|
|
|
cache_new_ref1 (struct frame_info *next_bottom_frame)
|
|
|
|
{
|
Replace some xmalloc-family functions with XNEW-family ones
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.
2015-08-26 23:16:07 +02:00
|
|
|
struct tailcall_cache *cache = XCNEW (struct tailcall_cache);
|
2011-10-09 22:21:48 +02:00
|
|
|
void **slot;
|
|
|
|
|
|
|
|
cache->next_bottom_frame = next_bottom_frame;
|
|
|
|
cache->refc = 1;
|
|
|
|
|
|
|
|
slot = htab_find_slot (cache_htab, cache, INSERT);
|
|
|
|
gdb_assert (*slot == NULL);
|
|
|
|
*slot = cache;
|
|
|
|
|
|
|
|
return cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create new reference to CACHE. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
cache_ref (struct tailcall_cache *cache)
|
|
|
|
{
|
|
|
|
gdb_assert (cache->refc > 0);
|
|
|
|
|
|
|
|
cache->refc++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Drop reference to CACHE, possibly fully freeing it and unregistering it from
|
|
|
|
cache_htab. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
cache_unref (struct tailcall_cache *cache)
|
|
|
|
{
|
|
|
|
gdb_assert (cache->refc > 0);
|
|
|
|
|
|
|
|
if (!--cache->refc)
|
|
|
|
{
|
|
|
|
gdb_assert (htab_find_slot (cache_htab, cache, NO_INSERT) != NULL);
|
|
|
|
htab_remove_elt (cache_htab, cache);
|
|
|
|
|
|
|
|
xfree (cache->chain);
|
|
|
|
xfree (cache);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return 1 if FI is a non-bottom (not the callee) tail call frame. Otherwise
|
|
|
|
return 0. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
frame_is_tailcall (struct frame_info *fi)
|
|
|
|
{
|
|
|
|
return frame_unwinder_is (fi, &dwarf2_tailcall_frame_unwind);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to find tailcall_cache in cache_htab if FI is a part of its virtual tail
|
|
|
|
call chain. Otherwise return NULL. No new reference is created. */
|
|
|
|
|
|
|
|
static struct tailcall_cache *
|
|
|
|
cache_find (struct frame_info *fi)
|
|
|
|
{
|
|
|
|
struct tailcall_cache *cache;
|
|
|
|
void **slot;
|
|
|
|
|
|
|
|
while (frame_is_tailcall (fi))
|
|
|
|
{
|
|
|
|
fi = get_next_frame (fi);
|
|
|
|
gdb_assert (fi != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
slot = htab_find_slot (cache_htab, &fi, NO_INSERT);
|
|
|
|
if (slot == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
cache = *slot;
|
|
|
|
gdb_assert (cache != NULL);
|
|
|
|
return cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Number of virtual frames between THIS_FRAME and CACHE->NEXT_BOTTOM_FRAME.
|
|
|
|
If THIS_FRAME is CACHE-> NEXT_BOTTOM_FRAME return -1. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
existing_next_levels (struct frame_info *this_frame,
|
|
|
|
struct tailcall_cache *cache)
|
|
|
|
{
|
|
|
|
int retval = (frame_relative_level (this_frame)
|
|
|
|
- frame_relative_level (cache->next_bottom_frame) - 1);
|
|
|
|
|
|
|
|
gdb_assert (retval >= -1);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The number of virtual tail call frames in CHAIN. With no virtual tail call
|
|
|
|
frames the function would return 0 (but CHAIN does not exist in such
|
|
|
|
case). */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pretended_chain_levels (struct call_site_chain *chain)
|
|
|
|
{
|
|
|
|
int chain_levels;
|
|
|
|
|
|
|
|
gdb_assert (chain != NULL);
|
|
|
|
|
|
|
|
if (chain->callers == chain->length && chain->callees == chain->length)
|
|
|
|
return chain->length;
|
|
|
|
|
|
|
|
chain_levels = chain->callers + chain->callees;
|
2015-06-01 14:02:34 +02:00
|
|
|
gdb_assert (chain_levels <= chain->length);
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
return chain_levels;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_this_id_ftype. THIS_CACHE must be already
|
|
|
|
initialized with tailcall_cache, THIS_FRAME must be a part of THIS_CACHE.
|
|
|
|
|
|
|
|
Specific virtual tail call frames are tracked by INLINE_DEPTH. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
tailcall_frame_this_id (struct frame_info *this_frame, void **this_cache,
|
|
|
|
struct frame_id *this_id)
|
|
|
|
{
|
|
|
|
struct tailcall_cache *cache = *this_cache;
|
|
|
|
struct frame_info *next_frame;
|
|
|
|
|
|
|
|
/* Tail call does not make sense for a sentinel frame. */
|
|
|
|
next_frame = get_next_frame (this_frame);
|
|
|
|
gdb_assert (next_frame != NULL);
|
|
|
|
|
|
|
|
*this_id = get_frame_id (next_frame);
|
|
|
|
(*this_id).code_addr = get_frame_pc (this_frame);
|
|
|
|
(*this_id).code_addr_p = 1;
|
2012-09-17 09:03:14 +02:00
|
|
|
(*this_id).artificial_depth = (cache->chain_levels
|
|
|
|
- existing_next_levels (this_frame, cache));
|
|
|
|
gdb_assert ((*this_id).artificial_depth > 0);
|
2011-10-09 22:21:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find PC to be unwound from THIS_FRAME. THIS_FRAME must be a part of
|
|
|
|
CACHE. */
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
pretend_pc (struct frame_info *this_frame, struct tailcall_cache *cache)
|
|
|
|
{
|
|
|
|
int next_levels = existing_next_levels (this_frame, cache);
|
|
|
|
struct call_site_chain *chain = cache->chain;
|
|
|
|
|
|
|
|
gdb_assert (chain != NULL);
|
|
|
|
|
|
|
|
next_levels++;
|
|
|
|
gdb_assert (next_levels >= 0);
|
|
|
|
|
|
|
|
if (next_levels < chain->callees)
|
|
|
|
return chain->call_site[chain->length - next_levels - 1]->pc;
|
|
|
|
next_levels -= chain->callees;
|
|
|
|
|
|
|
|
/* Otherwise CHAIN->CALLEES are already covered by CHAIN->CALLERS. */
|
|
|
|
if (chain->callees != chain->length)
|
|
|
|
{
|
|
|
|
if (next_levels < chain->callers)
|
|
|
|
return chain->call_site[chain->callers - next_levels - 1]->pc;
|
|
|
|
next_levels -= chain->callers;
|
|
|
|
}
|
|
|
|
|
|
|
|
gdb_assert (next_levels == 0);
|
|
|
|
return cache->prev_pc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_prev_register_ftype. If no specific register
|
|
|
|
override is supplied NULL is returned (this is incompatible with
|
|
|
|
frame_prev_register_ftype semantics). next_bottom_frame and tail call
|
|
|
|
frames unwind the NULL case differently. */
|
|
|
|
|
|
|
|
struct value *
|
|
|
|
dwarf2_tailcall_prev_register_first (struct frame_info *this_frame,
|
|
|
|
void **tailcall_cachep, int regnum)
|
|
|
|
{
|
|
|
|
struct gdbarch *this_gdbarch = get_frame_arch (this_frame);
|
|
|
|
struct tailcall_cache *cache = *tailcall_cachep;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
|
|
if (regnum == gdbarch_pc_regnum (this_gdbarch))
|
|
|
|
addr = pretend_pc (this_frame, cache);
|
|
|
|
else if (cache->prev_sp_p && regnum == gdbarch_sp_regnum (this_gdbarch))
|
|
|
|
{
|
|
|
|
int next_levels = existing_next_levels (this_frame, cache);
|
|
|
|
|
|
|
|
if (next_levels == cache->chain_levels - 1)
|
|
|
|
addr = cache->prev_sp;
|
|
|
|
else
|
2011-10-21 01:57:23 +02:00
|
|
|
addr = dwarf2_frame_cfa (this_frame) - cache->entry_cfa_sp_offset;
|
2011-10-09 22:21:48 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return frame_unwind_got_address (this_frame, regnum, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_prev_register_ftype for tail call frames. Register
|
|
|
|
set of virtual tail call frames is assumed to be the one of the top (caller)
|
|
|
|
frame - assume unchanged register value for NULL from
|
|
|
|
dwarf2_tailcall_prev_register_first. */
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
tailcall_frame_prev_register (struct frame_info *this_frame,
|
|
|
|
void **this_cache, int regnum)
|
|
|
|
{
|
|
|
|
struct tailcall_cache *cache = *this_cache;
|
|
|
|
struct value *val;
|
|
|
|
|
|
|
|
gdb_assert (this_frame != cache->next_bottom_frame);
|
|
|
|
|
|
|
|
val = dwarf2_tailcall_prev_register_first (this_frame, this_cache, regnum);
|
|
|
|
if (val)
|
|
|
|
return val;
|
|
|
|
|
|
|
|
return frame_unwind_got_register (this_frame, regnum, regnum);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_sniffer_ftype. It will never find a new chain, use
|
|
|
|
dwarf2_tailcall_sniffer_first for the bottom (callee) frame. It will find
|
|
|
|
all the predecessing virtual tail call frames, it will return false when
|
|
|
|
there exist no more tail call frames in this chain. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
tailcall_frame_sniffer (const struct frame_unwind *self,
|
|
|
|
struct frame_info *this_frame, void **this_cache)
|
|
|
|
{
|
|
|
|
struct frame_info *next_frame;
|
|
|
|
int next_levels;
|
|
|
|
struct tailcall_cache *cache;
|
|
|
|
|
|
|
|
/* Inner tail call element does not make sense for a sentinel frame. */
|
|
|
|
next_frame = get_next_frame (this_frame);
|
|
|
|
if (next_frame == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cache = cache_find (next_frame);
|
|
|
|
if (cache == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cache_ref (cache);
|
|
|
|
|
|
|
|
next_levels = existing_next_levels (this_frame, cache);
|
|
|
|
|
|
|
|
/* NEXT_LEVELS is -1 only in dwarf2_tailcall_sniffer_first. */
|
|
|
|
gdb_assert (next_levels >= 0);
|
|
|
|
gdb_assert (next_levels <= cache->chain_levels);
|
|
|
|
|
|
|
|
if (next_levels == cache->chain_levels)
|
|
|
|
{
|
|
|
|
cache_unref (cache);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*this_cache = cache;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The initial "sniffer" whether THIS_FRAME is a bottom (callee) frame of a new
|
|
|
|
chain to create. Keep TAILCALL_CACHEP NULL if it did not find any chain,
|
|
|
|
initialize it otherwise. No tail call chain is created if there are no
|
|
|
|
unambiguous virtual tail call frames to report.
|
|
|
|
|
|
|
|
ENTRY_CFA_SP_OFFSETP is NULL if no special SP handling is possible,
|
|
|
|
otherwise *ENTRY_CFA_SP_OFFSETP is the number of bytes to subtract from tail
|
|
|
|
call frames frame base to get the SP value there - to simulate return
|
|
|
|
address pushed on the stack. */
|
|
|
|
|
|
|
|
void
|
|
|
|
dwarf2_tailcall_sniffer_first (struct frame_info *this_frame,
|
|
|
|
void **tailcall_cachep,
|
|
|
|
const LONGEST *entry_cfa_sp_offsetp)
|
|
|
|
{
|
|
|
|
CORE_ADDR prev_pc = 0, prev_sp = 0; /* GCC warning. */
|
|
|
|
int prev_sp_p = 0;
|
2012-05-18 23:02:52 +02:00
|
|
|
CORE_ADDR this_pc;
|
2011-10-09 22:21:48 +02:00
|
|
|
struct gdbarch *prev_gdbarch;
|
|
|
|
struct call_site_chain *chain = NULL;
|
|
|
|
struct tailcall_cache *cache;
|
|
|
|
|
|
|
|
gdb_assert (*tailcall_cachep == NULL);
|
|
|
|
|
2013-03-10 19:06:26 +01:00
|
|
|
/* PC may be after the function if THIS_FRAME calls noreturn function,
|
|
|
|
get_frame_address_in_block will decrease it by 1 in such case. */
|
|
|
|
this_pc = get_frame_address_in_block (this_frame);
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
/* Catch any unwinding errors. */
|
Split TRY_CATCH into TRY + CATCH
This patch splits the TRY_CATCH macro into three, so that we go from
this:
~~~
volatile gdb_exception ex;
TRY_CATCH (ex, RETURN_MASK_ERROR)
{
}
if (ex.reason < 0)
{
}
~~~
to this:
~~~
TRY
{
}
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
~~~
Thus, we'll be getting rid of the local volatile exception object, and
declaring the caught exception in the catch block.
This allows reimplementing TRY/CATCH in terms of C++ exceptions when
building in C++ mode, while still allowing to build GDB in C mode
(using setjmp/longjmp), as a transition step.
TBC, after this patch, is it _not_ valid to have code between the TRY
and the CATCH blocks, like:
TRY
{
}
// some code here.
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
Just like it isn't valid to do that with C++'s native try/catch.
By switching to creating the exception object inside the CATCH block
scope, we can get rid of all the explicitly allocated volatile
exception objects all over the tree, and map the CATCH block more
directly to C++'s catch blocks.
The majority of the TRY_CATCH -> TRY+CATCH+END_CATCH conversion was
done with a script, rerun from scratch at every rebase, no manual
editing involved. After the mechanical conversion, a few places
needed manual intervention, to fix preexisting cases where we were
using the exception object outside of the TRY_CATCH block, and cases
where we were using "else" after a 'if (ex.reason) < 0)' [a CATCH
after this patch]. The result was folded into this patch so that GDB
still builds at each incremental step.
END_CATCH is necessary for two reasons:
First, because we name the exception object in the CATCH block, which
requires creating a scope, which in turn must be closed somewhere.
Declaring the exception variable in the initializer field of a for
block, like:
#define CATCH(EXCEPTION, mask) \
for (struct gdb_exception EXCEPTION; \
exceptions_state_mc_catch (&EXCEPTION, MASK); \
EXCEPTION = exception_none)
would avoid needing END_CATCH, but alas, in C mode, we build with C90,
which doesn't allow mixed declarations and code.
Second, because when TRY/CATCH are wired to real C++ try/catch, as
long as we need to handle cleanup chains, even if there's no CATCH
block that wants to catch the exception, we need for stop at every
frame in the unwind chain and run cleanups, then rethrow. That will
be done in END_CATCH.
After we require C++, we'll still need TRY/CATCH/END_CATCH until
cleanups are completely phased out -- TRY/CATCH in C++ mode will
save/restore the current cleanup chain, like in C mode, and END_CATCH
catches otherwise uncaugh exceptions, runs cleanups and rethrows, so
that C++ cleanups and exceptions can coexist.
IMO, this still makes the TRY/CATCH code look a bit more like a
newcomer would expect, so IMO worth it even if we weren't considering
C++.
gdb/ChangeLog.
2015-03-07 Pedro Alves <palves@redhat.com>
* common/common-exceptions.c (struct catcher) <exception>: No
longer a pointer to volatile exception. Now an exception value.
<mask>: Delete field.
(exceptions_state_mc_init): Remove all parameters. Adjust.
(exceptions_state_mc): No longer pop the catcher here.
(exceptions_state_mc_catch): New function.
(throw_exception): Adjust.
* common/common-exceptions.h (exceptions_state_mc_init): Remove
all parameters.
(exceptions_state_mc_catch): Declare.
(TRY_CATCH): Rename to ...
(TRY): ... this. Remove EXCEPTION and MASK parameters.
(CATCH, END_CATCH): New.
All callers adjusted.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
Adjust all callers of TRY_CATCH to use TRY/CATCH/END_CATCH
instead.
2015-03-07 16:14:14 +01:00
|
|
|
TRY
|
2011-10-09 22:21:48 +02:00
|
|
|
{
|
2011-10-21 01:57:23 +02:00
|
|
|
int sp_regnum;
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
prev_gdbarch = frame_unwind_arch (this_frame);
|
|
|
|
|
|
|
|
/* Simulate frame_unwind_pc without setting this_frame->prev_pc.p. */
|
2011-10-21 01:57:23 +02:00
|
|
|
prev_pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
/* call_site_find_chain can throw an exception. */
|
|
|
|
chain = call_site_find_chain (prev_gdbarch, prev_pc, this_pc);
|
|
|
|
|
|
|
|
if (entry_cfa_sp_offsetp == NULL)
|
|
|
|
break;
|
|
|
|
sp_regnum = gdbarch_sp_regnum (prev_gdbarch);
|
|
|
|
if (sp_regnum == -1)
|
|
|
|
break;
|
|
|
|
prev_sp = frame_unwind_register_unsigned (this_frame, sp_regnum);
|
|
|
|
prev_sp_p = 1;
|
|
|
|
}
|
Split TRY_CATCH into TRY + CATCH
This patch splits the TRY_CATCH macro into three, so that we go from
this:
~~~
volatile gdb_exception ex;
TRY_CATCH (ex, RETURN_MASK_ERROR)
{
}
if (ex.reason < 0)
{
}
~~~
to this:
~~~
TRY
{
}
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
~~~
Thus, we'll be getting rid of the local volatile exception object, and
declaring the caught exception in the catch block.
This allows reimplementing TRY/CATCH in terms of C++ exceptions when
building in C++ mode, while still allowing to build GDB in C mode
(using setjmp/longjmp), as a transition step.
TBC, after this patch, is it _not_ valid to have code between the TRY
and the CATCH blocks, like:
TRY
{
}
// some code here.
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
Just like it isn't valid to do that with C++'s native try/catch.
By switching to creating the exception object inside the CATCH block
scope, we can get rid of all the explicitly allocated volatile
exception objects all over the tree, and map the CATCH block more
directly to C++'s catch blocks.
The majority of the TRY_CATCH -> TRY+CATCH+END_CATCH conversion was
done with a script, rerun from scratch at every rebase, no manual
editing involved. After the mechanical conversion, a few places
needed manual intervention, to fix preexisting cases where we were
using the exception object outside of the TRY_CATCH block, and cases
where we were using "else" after a 'if (ex.reason) < 0)' [a CATCH
after this patch]. The result was folded into this patch so that GDB
still builds at each incremental step.
END_CATCH is necessary for two reasons:
First, because we name the exception object in the CATCH block, which
requires creating a scope, which in turn must be closed somewhere.
Declaring the exception variable in the initializer field of a for
block, like:
#define CATCH(EXCEPTION, mask) \
for (struct gdb_exception EXCEPTION; \
exceptions_state_mc_catch (&EXCEPTION, MASK); \
EXCEPTION = exception_none)
would avoid needing END_CATCH, but alas, in C mode, we build with C90,
which doesn't allow mixed declarations and code.
Second, because when TRY/CATCH are wired to real C++ try/catch, as
long as we need to handle cleanup chains, even if there's no CATCH
block that wants to catch the exception, we need for stop at every
frame in the unwind chain and run cleanups, then rethrow. That will
be done in END_CATCH.
After we require C++, we'll still need TRY/CATCH/END_CATCH until
cleanups are completely phased out -- TRY/CATCH in C++ mode will
save/restore the current cleanup chain, like in C mode, and END_CATCH
catches otherwise uncaugh exceptions, runs cleanups and rethrows, so
that C++ cleanups and exceptions can coexist.
IMO, this still makes the TRY/CATCH code look a bit more like a
newcomer would expect, so IMO worth it even if we weren't considering
C++.
gdb/ChangeLog.
2015-03-07 Pedro Alves <palves@redhat.com>
* common/common-exceptions.c (struct catcher) <exception>: No
longer a pointer to volatile exception. Now an exception value.
<mask>: Delete field.
(exceptions_state_mc_init): Remove all parameters. Adjust.
(exceptions_state_mc): No longer pop the catcher here.
(exceptions_state_mc_catch): New function.
(throw_exception): Adjust.
* common/common-exceptions.h (exceptions_state_mc_init): Remove
all parameters.
(exceptions_state_mc_catch): Declare.
(TRY_CATCH): Rename to ...
(TRY): ... this. Remove EXCEPTION and MASK parameters.
(CATCH, END_CATCH): New.
All callers adjusted.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
Adjust all callers of TRY_CATCH to use TRY/CATCH/END_CATCH
instead.
2015-03-07 16:14:14 +01:00
|
|
|
CATCH (except, RETURN_MASK_ERROR)
|
2011-10-09 22:21:48 +02:00
|
|
|
{
|
|
|
|
if (entry_values_debug)
|
|
|
|
exception_print (gdb_stdout, except);
|
|
|
|
return;
|
|
|
|
}
|
Split TRY_CATCH into TRY + CATCH
This patch splits the TRY_CATCH macro into three, so that we go from
this:
~~~
volatile gdb_exception ex;
TRY_CATCH (ex, RETURN_MASK_ERROR)
{
}
if (ex.reason < 0)
{
}
~~~
to this:
~~~
TRY
{
}
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
~~~
Thus, we'll be getting rid of the local volatile exception object, and
declaring the caught exception in the catch block.
This allows reimplementing TRY/CATCH in terms of C++ exceptions when
building in C++ mode, while still allowing to build GDB in C mode
(using setjmp/longjmp), as a transition step.
TBC, after this patch, is it _not_ valid to have code between the TRY
and the CATCH blocks, like:
TRY
{
}
// some code here.
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
Just like it isn't valid to do that with C++'s native try/catch.
By switching to creating the exception object inside the CATCH block
scope, we can get rid of all the explicitly allocated volatile
exception objects all over the tree, and map the CATCH block more
directly to C++'s catch blocks.
The majority of the TRY_CATCH -> TRY+CATCH+END_CATCH conversion was
done with a script, rerun from scratch at every rebase, no manual
editing involved. After the mechanical conversion, a few places
needed manual intervention, to fix preexisting cases where we were
using the exception object outside of the TRY_CATCH block, and cases
where we were using "else" after a 'if (ex.reason) < 0)' [a CATCH
after this patch]. The result was folded into this patch so that GDB
still builds at each incremental step.
END_CATCH is necessary for two reasons:
First, because we name the exception object in the CATCH block, which
requires creating a scope, which in turn must be closed somewhere.
Declaring the exception variable in the initializer field of a for
block, like:
#define CATCH(EXCEPTION, mask) \
for (struct gdb_exception EXCEPTION; \
exceptions_state_mc_catch (&EXCEPTION, MASK); \
EXCEPTION = exception_none)
would avoid needing END_CATCH, but alas, in C mode, we build with C90,
which doesn't allow mixed declarations and code.
Second, because when TRY/CATCH are wired to real C++ try/catch, as
long as we need to handle cleanup chains, even if there's no CATCH
block that wants to catch the exception, we need for stop at every
frame in the unwind chain and run cleanups, then rethrow. That will
be done in END_CATCH.
After we require C++, we'll still need TRY/CATCH/END_CATCH until
cleanups are completely phased out -- TRY/CATCH in C++ mode will
save/restore the current cleanup chain, like in C mode, and END_CATCH
catches otherwise uncaugh exceptions, runs cleanups and rethrows, so
that C++ cleanups and exceptions can coexist.
IMO, this still makes the TRY/CATCH code look a bit more like a
newcomer would expect, so IMO worth it even if we weren't considering
C++.
gdb/ChangeLog.
2015-03-07 Pedro Alves <palves@redhat.com>
* common/common-exceptions.c (struct catcher) <exception>: No
longer a pointer to volatile exception. Now an exception value.
<mask>: Delete field.
(exceptions_state_mc_init): Remove all parameters. Adjust.
(exceptions_state_mc): No longer pop the catcher here.
(exceptions_state_mc_catch): New function.
(throw_exception): Adjust.
* common/common-exceptions.h (exceptions_state_mc_init): Remove
all parameters.
(exceptions_state_mc_catch): Declare.
(TRY_CATCH): Rename to ...
(TRY): ... this. Remove EXCEPTION and MASK parameters.
(CATCH, END_CATCH): New.
All callers adjusted.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
Adjust all callers of TRY_CATCH to use TRY/CATCH/END_CATCH
instead.
2015-03-07 16:14:14 +01:00
|
|
|
END_CATCH
|
2011-10-09 22:21:48 +02:00
|
|
|
|
|
|
|
/* Ambiguous unwind or unambiguous unwind verified as matching. */
|
|
|
|
if (chain == NULL || chain->length == 0)
|
|
|
|
{
|
|
|
|
xfree (chain);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cache = cache_new_ref1 (this_frame);
|
|
|
|
*tailcall_cachep = cache;
|
|
|
|
cache->chain = chain;
|
|
|
|
cache->prev_pc = prev_pc;
|
|
|
|
cache->chain_levels = pretended_chain_levels (chain);
|
|
|
|
cache->prev_sp_p = prev_sp_p;
|
|
|
|
if (cache->prev_sp_p)
|
|
|
|
{
|
|
|
|
cache->prev_sp = prev_sp;
|
|
|
|
cache->entry_cfa_sp_offset = *entry_cfa_sp_offsetp;
|
|
|
|
}
|
|
|
|
gdb_assert (cache->chain_levels > 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_dealloc_cache_ftype. It can be called even for the
|
|
|
|
bottom chain frame from dwarf2_frame_dealloc_cache which is not a real
|
|
|
|
TAILCALL_FRAME. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
tailcall_frame_dealloc_cache (struct frame_info *self, void *this_cache)
|
|
|
|
{
|
|
|
|
struct tailcall_cache *cache = this_cache;
|
|
|
|
|
|
|
|
cache_unref (cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of frame_prev_arch_ftype. We assume all the virtual tail
|
|
|
|
call frames have gdbarch of the bottom (callee) frame. */
|
|
|
|
|
|
|
|
static struct gdbarch *
|
|
|
|
tailcall_frame_prev_arch (struct frame_info *this_frame,
|
|
|
|
void **this_prologue_cache)
|
|
|
|
{
|
|
|
|
struct tailcall_cache *cache = *this_prologue_cache;
|
|
|
|
|
|
|
|
return get_frame_arch (cache->next_bottom_frame);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Virtual tail call frame unwinder if dwarf2_tailcall_sniffer_first finds
|
|
|
|
a chain to create. */
|
|
|
|
|
|
|
|
const struct frame_unwind dwarf2_tailcall_frame_unwind =
|
|
|
|
{
|
|
|
|
TAILCALL_FRAME,
|
|
|
|
default_frame_unwind_stop_reason,
|
|
|
|
tailcall_frame_this_id,
|
|
|
|
tailcall_frame_prev_register,
|
|
|
|
NULL,
|
|
|
|
tailcall_frame_sniffer,
|
|
|
|
tailcall_frame_dealloc_cache,
|
|
|
|
tailcall_frame_prev_arch
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
|
|
extern initialize_file_ftype _initialize_tailcall_frame;
|
|
|
|
|
|
|
|
void
|
|
|
|
_initialize_tailcall_frame (void)
|
|
|
|
{
|
|
|
|
cache_htab = htab_create_alloc (50, cache_hash, cache_eq, NULL, xcalloc,
|
|
|
|
xfree);
|
|
|
|
}
|