summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/gdbtk/ChangeLog5
-rw-r--r--gdb/gdbtk/generic/gdbtk-stack.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index aafb6b980d1..eb39b08dd98 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-11 Andrew Cagney <cagney@redhat.com>
+
+ * generic/gdbtk-stack.c (get_frame_name): Use get_frame_pc and
+ get_next_frame.
+
2003-03-18 Keith Seitz <keiths@redhat.com>
From Nick Kelsey <nickk@ubicom.com>:
diff --git a/gdb/gdbtk/generic/gdbtk-stack.c b/gdb/gdbtk/generic/gdbtk-stack.c
index 38b8d1bb854..a5915ba74b6 100644
--- a/gdb/gdbtk/generic/gdbtk-stack.c
+++ b/gdb/gdbtk/generic/gdbtk-stack.c
@@ -544,15 +544,15 @@ get_frame_name (Tcl_Interp *interp, Tcl_Obj *list, struct frame_info *fi)
}
sal =
- find_pc_line (fi->pc,
- fi->next != NULL
+ find_pc_line (get_frame_pc (fi),
+ get_next_frame (fi) != NULL
&& !(get_frame_type (fi) == SIGTRAMP_FRAME)
&& !(get_frame_type (fi) == DUMMY_FRAME));
- func = find_pc_function (fi->pc);
+ func = find_pc_function (get_frame_pc (fi));
if (func)
{
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc);
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
if (msymbol != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol)
> BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
@@ -569,7 +569,7 @@ get_frame_name (Tcl_Interp *interp, Tcl_Obj *list, struct frame_info *fi)
}
else
{
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc);
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
if (msymbol != NULL)
{
funname = GDBTK_SYMBOL_SOURCE_NAME (msymbol);
@@ -608,7 +608,7 @@ get_frame_name (Tcl_Interp *interp, Tcl_Obj *list, struct frame_info *fi)
#ifdef PC_SOLIB
if (!funname)
{
- char *lib = PC_SOLIB (fi->pc);
+ char *lib = PC_SOLIB (get_frame_pc (fi));
if (lib)
{
Tcl_AppendStringsToObj (objv[0], " from ", lib, (char *) NULL);