From dffd081f7fd71e19db3769c2e1c7505f96ef20b5 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 15 Oct 2025 20:07:55 -0400 Subject: [PATCH] gdb: rename find_pc_function -> find_symbol_for_pc Change-Id: I2069be1a6d7c3250cf330574c941bf851c89bab4 Approved-by: Kevin Buettner --- gdb/blockframe.c | 4 ++-- gdb/btrace.c | 2 +- gdb/cli/cli-cmds.c | 4 ++-- gdb/dwarf2/loc.c | 2 +- gdb/eval.c | 2 +- gdb/guile/scm-frame.c | 2 +- gdb/infcall.c | 2 +- gdb/infcmd.c | 6 +++--- gdb/infrun.c | 4 ++-- gdb/python/py-finishbreakpoint.c | 2 +- gdb/solib-frv.c | 2 +- gdb/sparc-tdep.c | 4 ++-- gdb/symtab.c | 2 +- gdb/symtab.h | 2 +- gdb/tracepoint.c | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 5a3e342ee51..7c421a0ad3f 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -145,7 +145,7 @@ find_pc_sect_function (CORE_ADDR pc, struct obj_section *section) Backward compatibility, no section */ struct symbol * -find_pc_function (CORE_ADDR pc) +find_symbol_for_pc (CORE_ADDR pc) { return find_pc_sect_function (pc, find_pc_mapped_section (pc)); } @@ -419,7 +419,7 @@ find_function_entry_range_from_pc (CORE_ADDR pc, const char **name, struct type * find_function_type (CORE_ADDR pc) { - struct symbol *sym = find_pc_function (pc); + struct symbol *sym = find_symbol_for_pc (pc); if (sym != NULL && sym->value_block ()->entry_pc () == pc) return sym->type (); diff --git a/gdb/btrace.c b/gdb/btrace.c index ed7e41d3b79..b5516a1499c 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -557,7 +557,7 @@ ftrace_update_function (struct btrace_thread_info *btinfo, only a minimal symbol. */ if (pc.has_value ()) { - fun = find_pc_function (*pc); + fun = find_symbol_for_pc (*pc); bound_minimal_symbol bmfun = lookup_minimal_symbol_by_pc (*pc); mfun = bmfun.minsym; diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index d3536547c33..1007af46cba 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1039,7 +1039,7 @@ edit_command (const char *arg, int from_tty) paddress (get_current_arch (), sal.pc)); gdbarch = sal.symtab->compunit ()->objfile ()->arch (); - sym = find_pc_function (sal.pc); + sym = find_symbol_for_pc (sal.pc); if (sym) gdb_printf ("%ps is in %ps (%ps:%ps).\n", styled_string (address_style.style (), @@ -1475,7 +1475,7 @@ list_command (const char *arg, int from_tty) paddress (get_current_arch (), sal.pc)); gdbarch = sal.symtab->compunit ()->objfile ()->arch (); - sym = find_pc_function (sal.pc); + sym = find_symbol_for_pc (sal.pc); if (sym) gdb_printf ("%s is in %s (%s:%d).\n", paddress (gdbarch, sal.pc), diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 37c85d8d192..cb4a39e65ad 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -759,7 +759,7 @@ call_site_target::iterate_over_addresses (gdbarch *call_site_gdbarch, static struct symbol * func_addr_to_tail_call_list (struct gdbarch *gdbarch, CORE_ADDR addr) { - struct symbol *sym = find_pc_function (addr); + struct symbol *sym = find_symbol_for_pc (addr); struct type *type; if (sym == NULL || sym->value_block ()->entry_pc () != addr) diff --git a/gdb/eval.c b/gdb/eval.c index 07fa0af4722..5455164dc63 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2054,7 +2054,7 @@ eval_op_objc_msgcall (struct type *expect_type, struct expression *exp, (exp->gdbarch, addr, current_inferior ()->top_target ()); /* Is it a high_level symbol? */ - sym = find_pc_function (addr); + sym = find_symbol_for_pc (addr); if (sym != NULL) method = value_of_variable (sym, 0); } diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index db35ae52596..c77633cb59a 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -665,7 +665,7 @@ gdbscm_frame_function (SCM self) if (frame != NULL) { found = true; - sym = find_pc_function (get_frame_address_in_block (frame)); + sym = find_symbol_for_pc (get_frame_address_in_block (frame)); } } catch (const gdb_exception &except) diff --git a/gdb/infcall.c b/gdb/infcall.c index c4b4c8f0bea..3b7542cf70c 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -480,7 +480,7 @@ static const char * get_function_name (CORE_ADDR funaddr, char *buf, int buf_size) { { - struct symbol *symbol = find_pc_function (funaddr); + struct symbol *symbol = find_symbol_for_pc (funaddr); if (symbol) return symbol->print_name (); diff --git a/gdb/infcmd.c b/gdb/infcmd.c index e4b3e5b61f8..7747f03b63b 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -743,7 +743,7 @@ set_step_frame (thread_info *tp) set_step_info (tp, frame, sal); CORE_ADDR pc = get_frame_pc (frame); - tp->control.step_start_function = find_pc_function (pc); + tp->control.step_start_function = find_symbol_for_pc (pc); } /* Step until outside of current statement. */ @@ -1352,7 +1352,7 @@ until_next_command (int from_tty) not). */ pc = get_frame_pc (frame); - func = find_pc_function (pc); + func = find_symbol_for_pc (pc); if (!func) { @@ -1834,7 +1834,7 @@ finish_command (const char *arg, int from_tty) /* Find the function we will return from. */ frame_info_ptr callee_frame = get_selected_frame (nullptr); - sm->function = find_pc_function (get_frame_pc (callee_frame)); + sm->function = find_symbol_for_pc (get_frame_pc (callee_frame)); sm->return_buf = 0; /* Initialize buffer address is not available. */ /* Determine the return convention. If it is RETURN_VALUE_STRUCT_CONVENTION, diff --git a/gdb/infrun.c b/gdb/infrun.c index b3c408feb30..b5d2e43d536 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -7865,7 +7865,7 @@ process_event_stop_test (struct execution_control_state *ecs) && ((ecs->event_thread->control.step_stack_frame_id != outer_frame_id) || (ecs->event_thread->control.step_start_function - != find_pc_function (ecs->event_thread->stop_pc ()))))) + != find_symbol_for_pc (ecs->event_thread->stop_pc ()))))) { CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); CORE_ADDR real_stop_pc; @@ -9350,7 +9350,7 @@ print_stop_location (const target_waitstatus &ws) && (tp->control.step_frame_id == get_frame_id (get_current_frame ())) && (tp->control.step_start_function - == find_pc_function (tp->stop_pc ()))) + == find_symbol_for_pc (tp->stop_pc ()))) { symtab_and_line sal = find_frame_sal (get_selected_frame (nullptr)); if (sal.symtab != tp->current_symtab) diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index 70e1684524d..75224b6d2d7 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -251,7 +251,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) { if ((pc = get_frame_pc_if_available (frame))) { - struct symbol *function = find_pc_function (*pc); + struct symbol *function = find_symbol_for_pc (*pc); if (function != nullptr) { struct type *ret_type = diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c index beb880228fc..d5c83f4573b 100644 --- a/gdb/solib-frv.c +++ b/gdb/solib-frv.c @@ -904,7 +904,7 @@ frv_fdpic_find_canonical_descriptor (CORE_ADDR entry_point) /* Attempt to find the name of the function. If the name is available, it'll be used as an aid in finding matching functions in the dynamic symbol table. */ - sym = find_pc_function (entry_point); + sym = find_symbol_for_pc (entry_point); if (sym == 0) name = 0; else diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index 914a568c98b..6ac02def8c0 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -1249,7 +1249,7 @@ sparc32_frame_cache (const frame_info_ptr &this_frame, void **this_cache) cache = sparc_frame_cache (this_frame, this_cache); - sym = find_pc_function (cache->pc); + sym = find_symbol_for_pc (cache->pc); if (sym) { cache->struct_return_p = sparc32_struct_return_from_sym (sym); @@ -1552,7 +1552,7 @@ static int sparc32_dwarf2_struct_return_p (const frame_info_ptr &this_frame) { CORE_ADDR pc = get_frame_address_in_block (this_frame); - struct symbol *sym = find_pc_function (pc); + struct symbol *sym = find_symbol_for_pc (pc); if (sym) return sparc32_struct_return_from_sym (sym); diff --git a/gdb/symtab.c b/gdb/symtab.c index b0cea7a06b5..9109103da41 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4108,7 +4108,7 @@ find_function_alias_target (bound_minimal_symbol msymbol) if (!msymbol_is_function (msymbol.objfile, msymbol.minsym, &func_addr)) return NULL; - symbol *sym = find_pc_function (func_addr); + symbol *sym = find_symbol_for_pc (func_addr); if (sym != NULL && sym->loc_class () == LOC_BLOCK && sym->value_block ()->entry_pc () == func_addr) diff --git a/gdb/symtab.h b/gdb/symtab.h index 64028bf271f..ea34228df12 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2206,7 +2206,7 @@ extern struct type *lookup_enum (const char *, const struct block *); return value will not be an inlined function; the containing function will be returned instead. */ -extern struct symbol *find_pc_function (CORE_ADDR); +extern struct symbol *find_symbol_for_pc (CORE_ADDR); /* lookup the function corresponding to the address and section. The return value will not be an inlined function; the containing diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 879e4a6b33e..ade745a0865 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -217,7 +217,7 @@ set_traceframe_context (const frame_info_ptr &trace_frame) && (trace_pc = get_frame_pc_if_available (trace_frame))) { traceframe_sal = find_pc_line (*trace_pc, 0); - traceframe_fun = find_pc_function (*trace_pc); + traceframe_fun = find_symbol_for_pc (*trace_pc); /* Save linenumber as "$trace_line", a debugger variable visible to users. */