[commit] deprecated_frame_in_dummy() to get_frame_type()

[Andrew Cagney <ac131313@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

FYI,

I committed the attached as pretty obvious.  It should stop the panics 
that nickk reported (thanks!).

(Nick, btw, I can count :-)

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 1773 bytes --]

2002-11-27  Andrew Cagney  <cagney@redhat.com>

	* generic/gdbtk-stack.c (get_frame_name): Use get_frame_type
	instead of deprecated_frame_in_dummy.
	* generic/gdbtk-cmds.c (gdb_loc): Ditto.

Index: gdbtk/generic/gdbtk-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
retrieving revision 1.60
diff -u -r1.60 gdbtk-cmds.c
--- gdbtk/generic/gdbtk-cmds.c	19 Nov 2002 19:33:46 -0000	1.60
+++ gdbtk/generic/gdbtk-cmds.c	27 Nov 2002 15:25:25 -0000
@@ -2273,7 +2273,7 @@
 	  sal = find_pc_line (selected_frame->pc,
 			      selected_frame->next != NULL
 			      && !(get_frame_type (selected_frame->next) == SIGTRAMP_FRAME)
-			      && !deprecated_frame_in_dummy (selected_frame->next));
+			      && !(get_frame_type (selected_frame->next) == DUMMY_FRAME));
 	}
       else
         {
Index: gdbtk/generic/gdbtk-stack.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-stack.c,v
retrieving revision 1.12
diff -u -r1.12 gdbtk-stack.c
--- gdbtk/generic/gdbtk-stack.c	24 Nov 2002 18:44:36 -0000	1.12
+++ gdbtk/generic/gdbtk-stack.c	27 Nov 2002 15:25:25 -0000
@@ -522,7 +522,7 @@
   enum language funlang = language_unknown;
   Tcl_Obj *objv[1];
 
-  if (deprecated_frame_in_dummy (fi))
+  if (get_frame_type (fi) == DUMMY_FRAME)
     {
       objv[0] = Tcl_NewStringObj ("<function called from gdb>\n", -1);
       Tcl_ListObjAppendElement (interp, list, objv[0]);
@@ -539,7 +539,7 @@
     find_pc_line (fi->pc,
 		  fi->next != NULL
 		  && !(get_frame_type (fi) == SIGTRAMP_FRAME)
-		  && !deprecated_frame_in_dummy (fi->next));
+		  && !(get_frame_type (fi) == DUMMY_FRAME));
 
   func = find_pc_function (fi->pc);
   if (func)

[-- Attachment #3: mailbox-message://ac131313@movemail/fsf/gdb/misc#3495483 --]
[-- Type: message/rfc822, Size: 3631 bytes --]

From: "Nick Kelsey" <nickk@ubicom.com>
To: <gdb@sources.redhat.com>
Subject: Change to breakpoint.c breaks insight on trunk
Date: Tue, 26 Nov 2002 17:17:31 -0800
Message-ID: <001b01c295b2$c2ec0440$0a00a8c0@nkelseyhome>

Hi all,

Recently a new debug assert was added:

  /* This function is used by two files: get_frame_type(), after first
     checking that !USE_GENERIC_DUMMY_FRAMES; and sparc-tdep.c, which
     doesn't yet use generic dummy frames anyway.  */
  gdb_assert (!USE_GENERIC_DUMMY_FRAMES);

It is also used by gdbtk-cmds.c and gdbtk-stack.c - someone can't count :-)

For targets where USE_GENERIC_DUMMY_FRAMES is used, insight trips up on the
assert every time.

Nick