aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog10
-rw-r--r--gdb/ada-lang.c2
-rw-r--r--gdb/breakpoint.c2
-rw-r--r--gdb/breakpoint.h11
-rw-r--r--gdb/sparc-tdep.c4
-rw-r--r--gdb/stack.c6
-rw-r--r--gdb/tui/ChangeLog5
-rw-r--r--gdb/tui/tuiStack.c2
8 files changed, 33 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8753223..ba4ed96 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-10 Andrew Cagney <ac131313@redhat.com>
+
+ * breakpoint.h (deprecated_frame_in_dummy): Rename frame_in_dummy.
+ * stack.c (print_frame_info_base): Update.
+ (print_frame_info_base, frame_info): Update.
+ * sparc-tdep.c (sparc_init_extra_frame_info): Update.
+ (sparc_frame_saved_pc): Update.
+ * ada-lang.c (find_printable_frame): Update.
+ * breakpoint.c (deprecated_frame_in_dummy): Update.
+
2002-11-09 Mark Kettenis <kettenis@gnu.org>
* i386-linux-nat.c (ORIG_EAX): Define to -1 if not already
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 2fb691c..25fb92d 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5040,7 +5040,7 @@ find_printable_frame (struct frame_info *fi, int level)
find_pc_line (fi->pc,
fi->next != NULL
&& !fi->next->signal_handler_caller
- && !frame_in_dummy (fi->next));
+ && !deprecated_frame_in_dummy (fi->next));
if (sal.symtab && !is_ada_runtime_file (sal.symtab->filename))
{
#if defined(__alpha__) && defined(__osf__) && !defined(VXWORKS_TARGET)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 7e2326a..183d8a4 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1688,7 +1688,7 @@ breakpoint_inserted_here_p (CORE_ADDR pc)
bp_call_dummy breakpoint. */
int
-frame_in_dummy (struct frame_info *frame)
+deprecated_frame_in_dummy (struct frame_info *frame)
{
struct breakpoint *b;
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 226703b..3abdca7 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -528,7 +528,16 @@ extern enum breakpoint_here breakpoint_here_p (CORE_ADDR);
extern int breakpoint_inserted_here_p (CORE_ADDR);
-extern int frame_in_dummy (struct frame_info *);
+/* FIXME: cagney/2002-11-10: The current [generic] dummy-frame code
+ implements a functional superset of this function. The only reason
+ it hasn't been removed is because some architectures still don't
+ use the new framework. Once they have been fixed, this can go. */
+/* FIXME: cagney/2002-11-10: There should be a function (hmm,
+ something like, enum { NORMAL_FRAME, DUMMY_FRAME, SIGTRAMP_FRAME }
+ get_frame_type() ...) that the caller can use to determine the
+ frame's type. This could replace this function, PC_IN_CALL_DUMMY,
+ and fi->signal_handler_caller. */
+extern int deprecated_frame_in_dummy (struct frame_info *);
extern int breakpoint_thread_match (CORE_ADDR, ptid_t);
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 4613744..b9b3a78 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -315,7 +315,7 @@ sparc_init_extra_frame_info (int fromleaf, struct frame_info *fi)
it later. */
if (fi->next->next != NULL
&& (fi->next->next->signal_handler_caller
- || frame_in_dummy (fi->next->next))
+ || deprecated_frame_in_dummy (fi->next->next))
&& frameless_look_for_prologue (fi->next))
{
/* A frameless function interrupted by a signal did not change
@@ -488,7 +488,7 @@ sparc_frame_saved_pc (struct frame_info *frame)
else if (frame->extra_info->in_prologue ||
(frame->next != NULL &&
(frame->next->signal_handler_caller ||
- frame_in_dummy (frame->next)) &&
+ deprecated_frame_in_dummy (frame->next)) &&
frameless_look_for_prologue (frame)))
{
/* A frameless function interrupted by a signal did not save
diff --git a/gdb/stack.c b/gdb/stack.c
index f36e651..b9a3033 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -350,7 +350,7 @@ print_frame_info_base (struct frame_info *fi, int level, int source, int args)
to check for a bp_call_dummy breakpoint. */
if (PC_IN_CALL_DUMMY (fi->pc, sp, fi->frame))
#else
- if (frame_in_dummy (fi))
+ if (deprecated_frame_in_dummy (fi))
#endif
{
annotate_frame_begin (level == -1 ? 0 : level, fi->pc);
@@ -394,7 +394,7 @@ print_frame_info_base (struct frame_info *fi, int level, int source, int args)
find_pc_line (fi->pc,
fi->next != NULL
&& !fi->next->signal_handler_caller
- && !frame_in_dummy (fi->next));
+ && !deprecated_frame_in_dummy (fi->next));
location_print = (source == LOCATION
|| source == LOC_AND_ADDRESS
@@ -794,7 +794,7 @@ frame_info (char *addr_exp, int from_tty)
sal = find_pc_line (fi->pc,
fi->next != NULL
&& !fi->next->signal_handler_caller
- && !frame_in_dummy (fi->next));
+ && !deprecated_frame_in_dummy (fi->next));
func = get_frame_function (fi);
s = find_pc_symtab (fi->pc);
if (func)
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index c0fb2bed..df138d0 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-10 Andrew Cagney <ac131313@redhat.com>
+
+ * tuiStack.c (tuiShowFrameInfo): Replace frame_in_dummy with
+ deprecated_frame_in_dummy.
+
2002-10-26 Stephane Carrez <stcarrez@nerim.fr>
* tuiIO.c (tui_prep_terminal): Save the prompt registered in readline.
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index 1d3856d..506cdab 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -352,7 +352,7 @@ tuiShowFrameInfo (struct frame_info *fi)
sal = find_pc_line (fi->pc,
(fi->next != (struct frame_info *) NULL &&
!fi->next->signal_handler_caller &&
- !frame_in_dummy (fi->next)));
+ !deprecated_frame_in_dummy (fi->next)));
sourceAlreadyDisplayed = sal.symtab != 0
&& tuiSourceIsDisplayed (sal.symtab->filename);