mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 17:18:55 +00:00
use bound_minsym as result for lookup_minimal_symbol et al
This patch changes a few minimal symbol lookup functions to return a bound_minimal_symbol rather than a pointer to the minsym. This change helps prepare gdb for computing a minimal symbol's address at the point of use. Note that this changes even those functions that ostensibly search a single objfile. That was necessary because, in fact, those functions can search an objfile and its separate debug objfiles; and it is important for the caller to know in which objfile the minimal symbol was actually found. The bulk of this patch is mechanical. 2014-02-26 Tom Tromey <tromey@redhat.com> * ada-lang.c (ada_update_initial_language): Update. (ada_main_name, ada_has_this_exception_support): Update. * ada-tasks.c (ada_tasks_inferior_data_sniffer): Update. * aix-thread.c (pdc_symbol_addrs, pd_enable): Update. * arm-tdep.c (arm_skip_stub): Update. * auxv.c (ld_so_xfer_auxv): Update. * avr-tdep.c (avr_scan_prologue): Update. * ax-gdb.c (gen_var_ref): Update. * breakpoint.c (struct breakpoint_objfile_data) <overlay_msym, longjmp_msym, terminate_msym, exception_msym>: Change type to bound_minimal_symbol. (create_overlay_event_breakpoint) (create_longjmp_master_breakpoint) (create_std_terminate_master_breakpoint) (create_exception_master_breakpoint): Update. * bsd-uthread.c (bsd_uthread_lookup_address): Update. * c-exp.y (classify_name): Update. * coffread.c (coff_symfile_read): Update. * common/agent.c (agent_look_up_symbols): Update. * d-lang.c (d_main_name): Update. * dbxread.c (find_stab_function_addr, end_psymtab): Update. * dec-thread.c (enable_dec_thread): Update. * dwarf2loc.c (call_site_to_target_addr): Update. * elfread.c (elf_gnu_ifunc_resolve_by_got): Update. * eval.c (evaluate_subexp_standard): Update. * findvar.c (struct minsym_lookup_data) <result>: Change type to bound_minimal_symbol. <objfile>: Remove. (minsym_lookup_iterator_cb, default_read_var_value): Update. * frame.c (inside_main_func): Update. * frv-tdep.c (frv_frame_this_id): Update. * gcore.c (call_target_sbrk): Update. * glibc-tdep.c (glibc_skip_solib_resolver): Update. * gnu-v3-abi.c (gnuv3_get_typeid, gnuv3_skip_trampoline): Update. * go-lang.c (go_main_name): Update. * hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code) (hppa_hpux_find_import_stub_for_addr): Update. * hppa-tdep.c (hppa_extract_17, hppa_lookup_stub_minimal_symbol): Update. Change return type. * hppa-tdep.h (hppa_lookup_stub_minimal_symbol): Change return type. * jit.c (jit_breakpoint_re_set_internal): Update. * linux-fork.c (inferior_call_waitpid, checkpoint_command): Update. * linux-nat.c (get_signo): Update. * linux-thread-db.c (inferior_has_bug): Update * m32c-tdep.c (m32c_return_value) (m32c_m16c_address_to_pointer): Update. * m32r-tdep.c (m32r_frame_this_id): Update. * m68hc11-tdep.c (m68hc11_get_register_info): Update. * machoread.c (macho_resolve_oso_sym_with_minsym): Update. * minsyms.c (lookup_minimal_symbol_internal): Rename to lookup_minimal_symbol. Change return type. (lookup_minimal_symbol): Remove. (lookup_bound_minimal_symbol): Update. (lookup_minimal_symbol_text): Change return type. (lookup_minimal_symbol_solib_trampoline): Change return type. * minsyms.h (lookup_minimal_symbol, lookup_minimal_symbol_text) (lookup_minimal_symbol_solib_trampoline): Change return type. * mips-linux-tdep.c (mips_linux_skip_resolver): Update. * objc-lang.c (lookup_objc_class, lookup_child_selector) (value_nsstring, find_imps): Update. * obsd-tdep.c (obsd_skip_solib_resolver): Update. * p-lang.c (pascal_main_name): Update. * ppc-linux-tdep.c (ppc_linux_spe_context_lookup): Update. * ppc-sysv-tdep.c (convert_code_addr_to_desc_addr): Update. * proc-service.c (ps_pglobal_lookup): Update. * ravenscar-thread.c (get_running_thread_msymbol): Change return type. (has_ravenscar_runtime, get_running_thread_id): Update. * remote.c (remote_check_symbols): Update. * sol-thread.c (ps_pglobal_lookup): Update. * sol2-tdep.c (sol2_skip_solib_resolver): Update. * solib-dsbt.c (lm_base): Update. * solib-frv.c (lm_base, frv_relocate_section_addresses): Update. * solib-irix.c (locate_base): Update. * solib-som.c (som_solib_create_inferior_hook) (som_solib_desire_dynamic_linker_symbols, link_map_start): Update. * solib-spu.c (spu_enable_break): Update. * solib-svr4.c (elf_locate_base, enable_break): Update. * spu-tdep.c (spu_get_overlay_table, spu_catch_start) (flush_ea_cache): Update. * stabsread.c (define_symbol): Update. * symfile.c (simple_read_overlay_table): Update. * symtab.c (find_pc_sect_line): Update. * tracepoint.c (scope_info): Update. * tui-disasm.c (tui_get_begin_asm_address): Update. * value.c (value_static_field): Update.
This commit is contained in:
@@ -3146,10 +3146,10 @@ static const char *const longjmp_names[] =
|
||||
struct breakpoint_objfile_data
|
||||
{
|
||||
/* Minimal symbol for "_ovly_debug_event" (if any). */
|
||||
struct minimal_symbol *overlay_msym;
|
||||
struct bound_minimal_symbol overlay_msym;
|
||||
|
||||
/* Minimal symbol(s) for "longjmp", "siglongjmp", etc. (if any). */
|
||||
struct minimal_symbol *longjmp_msym[NUM_LONGJMP_NAMES];
|
||||
struct bound_minimal_symbol longjmp_msym[NUM_LONGJMP_NAMES];
|
||||
|
||||
/* True if we have looked for longjmp probes. */
|
||||
int longjmp_searched;
|
||||
@@ -3158,10 +3158,10 @@ struct breakpoint_objfile_data
|
||||
VEC (probe_p) *longjmp_probes;
|
||||
|
||||
/* Minimal symbol for "std::terminate()" (if any). */
|
||||
struct minimal_symbol *terminate_msym;
|
||||
struct bound_minimal_symbol terminate_msym;
|
||||
|
||||
/* Minimal symbol for "_Unwind_DebugHook" (if any). */
|
||||
struct minimal_symbol *exception_msym;
|
||||
struct bound_minimal_symbol exception_msym;
|
||||
|
||||
/* True if we have looked for exception probes. */
|
||||
int exception_searched;
|
||||
@@ -3226,24 +3226,24 @@ create_overlay_event_breakpoint (void)
|
||||
|
||||
bp_objfile_data = get_breakpoint_objfile_data (objfile);
|
||||
|
||||
if (msym_not_found_p (bp_objfile_data->overlay_msym))
|
||||
if (msym_not_found_p (bp_objfile_data->overlay_msym.minsym))
|
||||
continue;
|
||||
|
||||
if (bp_objfile_data->overlay_msym == NULL)
|
||||
if (bp_objfile_data->overlay_msym.minsym == NULL)
|
||||
{
|
||||
struct minimal_symbol *m;
|
||||
struct bound_minimal_symbol m;
|
||||
|
||||
m = lookup_minimal_symbol_text (func_name, objfile);
|
||||
if (m == NULL)
|
||||
if (m.minsym == NULL)
|
||||
{
|
||||
/* Avoid future lookups in this objfile. */
|
||||
bp_objfile_data->overlay_msym = &msym_not_found;
|
||||
bp_objfile_data->overlay_msym.minsym = &msym_not_found;
|
||||
continue;
|
||||
}
|
||||
bp_objfile_data->overlay_msym = m;
|
||||
}
|
||||
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->overlay_msym);
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->overlay_msym.minsym);
|
||||
b = create_internal_breakpoint (get_objfile_arch (objfile), addr,
|
||||
bp_overlay_event,
|
||||
&internal_breakpoint_ops);
|
||||
@@ -3342,25 +3342,25 @@ create_longjmp_master_breakpoint (void)
|
||||
const char *func_name;
|
||||
CORE_ADDR addr;
|
||||
|
||||
if (msym_not_found_p (bp_objfile_data->longjmp_msym[i]))
|
||||
if (msym_not_found_p (bp_objfile_data->longjmp_msym[i].minsym))
|
||||
continue;
|
||||
|
||||
func_name = longjmp_names[i];
|
||||
if (bp_objfile_data->longjmp_msym[i] == NULL)
|
||||
if (bp_objfile_data->longjmp_msym[i].minsym == NULL)
|
||||
{
|
||||
struct minimal_symbol *m;
|
||||
struct bound_minimal_symbol m;
|
||||
|
||||
m = lookup_minimal_symbol_text (func_name, objfile);
|
||||
if (m == NULL)
|
||||
if (m.minsym == NULL)
|
||||
{
|
||||
/* Prevent future lookups in this objfile. */
|
||||
bp_objfile_data->longjmp_msym[i] = &msym_not_found;
|
||||
bp_objfile_data->longjmp_msym[i].minsym = &msym_not_found;
|
||||
continue;
|
||||
}
|
||||
bp_objfile_data->longjmp_msym[i] = m;
|
||||
}
|
||||
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->longjmp_msym[i]);
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->longjmp_msym[i].minsym);
|
||||
b = create_internal_breakpoint (gdbarch, addr, bp_longjmp_master,
|
||||
&internal_breakpoint_ops);
|
||||
b->addr_string = xstrdup (func_name);
|
||||
@@ -3397,25 +3397,25 @@ create_std_terminate_master_breakpoint (void)
|
||||
|
||||
bp_objfile_data = get_breakpoint_objfile_data (objfile);
|
||||
|
||||
if (msym_not_found_p (bp_objfile_data->terminate_msym))
|
||||
if (msym_not_found_p (bp_objfile_data->terminate_msym.minsym))
|
||||
continue;
|
||||
|
||||
if (bp_objfile_data->terminate_msym == NULL)
|
||||
if (bp_objfile_data->terminate_msym.minsym == NULL)
|
||||
{
|
||||
struct minimal_symbol *m;
|
||||
struct bound_minimal_symbol m;
|
||||
|
||||
m = lookup_minimal_symbol (func_name, NULL, objfile);
|
||||
if (m == NULL || (MSYMBOL_TYPE (m) != mst_text
|
||||
&& MSYMBOL_TYPE (m) != mst_file_text))
|
||||
if (m.minsym == NULL || (MSYMBOL_TYPE (m.minsym) != mst_text
|
||||
&& MSYMBOL_TYPE (m.minsym) != mst_file_text))
|
||||
{
|
||||
/* Prevent future lookups in this objfile. */
|
||||
bp_objfile_data->terminate_msym = &msym_not_found;
|
||||
bp_objfile_data->terminate_msym.minsym = &msym_not_found;
|
||||
continue;
|
||||
}
|
||||
bp_objfile_data->terminate_msym = m;
|
||||
}
|
||||
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->terminate_msym);
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->terminate_msym.minsym);
|
||||
b = create_internal_breakpoint (get_objfile_arch (objfile), addr,
|
||||
bp_std_terminate_master,
|
||||
&internal_breakpoint_ops);
|
||||
@@ -3496,26 +3496,26 @@ create_exception_master_breakpoint (void)
|
||||
|
||||
/* Otherwise, try the hook function. */
|
||||
|
||||
if (msym_not_found_p (bp_objfile_data->exception_msym))
|
||||
if (msym_not_found_p (bp_objfile_data->exception_msym.minsym))
|
||||
continue;
|
||||
|
||||
gdbarch = get_objfile_arch (objfile);
|
||||
|
||||
if (bp_objfile_data->exception_msym == NULL)
|
||||
if (bp_objfile_data->exception_msym.minsym == NULL)
|
||||
{
|
||||
struct minimal_symbol *debug_hook;
|
||||
struct bound_minimal_symbol debug_hook;
|
||||
|
||||
debug_hook = lookup_minimal_symbol (func_name, NULL, objfile);
|
||||
if (debug_hook == NULL)
|
||||
if (debug_hook.minsym == NULL)
|
||||
{
|
||||
bp_objfile_data->exception_msym = &msym_not_found;
|
||||
bp_objfile_data->exception_msym.minsym = &msym_not_found;
|
||||
continue;
|
||||
}
|
||||
|
||||
bp_objfile_data->exception_msym = debug_hook;
|
||||
}
|
||||
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->exception_msym);
|
||||
addr = MSYMBOL_VALUE_ADDRESS (bp_objfile_data->exception_msym.minsym);
|
||||
addr = gdbarch_convert_from_func_ptr_addr (gdbarch, addr,
|
||||
¤t_target);
|
||||
b = create_internal_breakpoint (gdbarch, addr, bp_exception_master,
|
||||
|
||||
Reference in New Issue
Block a user