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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 87532232c66f496830f12163fb032bb6b14ec079..ba4ed96646f9fc987f79bd22c43cd913c4659e95 100644 (file)
--- 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 2fb691c25910575f1a103081c4eb38495ed40a26..25fb92d201c7c9b7022001220f24d1d647055816 100644 (file)
--- 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 7e2326ace1af07114a7d6b3e623bc1a5dd68acf7..183d8a4b795635e9a096ffa28b44188ce4b6ee31 100644 (file)
--- 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 226703b59380c4b613b550366278328f26b124ec..3abdca746907534192d8a13242bc2cc9a9b6b002 100644 (file)
--- 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 46137445f8aa8aa3a682cf4c2e9b644cf3b1630a..b9b3a78283c20aff4eb2b14e5dec69cae56b342f 100644 (file)
--- 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 f36e651a375f0739e3dfb158d80d021dd364bec1..b9a3033d87dea9d0f116072eeca53432ee903b4b 100644 (file)
--- 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 c0fb2bed878372d68425833f54d9bfcef6d5be7f..df138d04020e7f15e026ae140dec57b2e21c9429 100644 (file)
--- 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 1d3856daa5ca675e69e2363bd71f11bb8fda4b04..506cdab2a9e644aa59e28e56f09a597713b2b641 100644 (file)
--- 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);