From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19311 invoked by alias); 2 Feb 2003 17:38:53 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 19302 invoked from network); 2 Feb 2003 17:38:50 -0000 Received: from unknown (HELO walton.kettenis.dyndns.org) (62.163.169.212) by 172.16.49.205 with SMTP; 2 Feb 2003 17:38:50 -0000 Received: from elgar.kettenis.dyndns.org (elgar.kettenis.dyndns.org [192.168.0.2]) by walton.kettenis.dyndns.org (8.12.6/8.12.5) with ESMTP id h12HcaXU000324; Sun, 2 Feb 2003 18:38:36 +0100 (CET) (envelope-from kettenis@elgar.kettenis.dyndns.org) Received: from elgar.kettenis.dyndns.org (localhost [127.0.0.1]) by elgar.kettenis.dyndns.org (8.12.6/8.12.6) with ESMTP id h12HcZ9g009261; Sun, 2 Feb 2003 18:38:36 +0100 (CET) (envelope-from kettenis@elgar.kettenis.dyndns.org) Received: (from kettenis@localhost) by elgar.kettenis.dyndns.org (8.12.6/8.12.6/Submit) id h12HcZqp009258; Sun, 2 Feb 2003 18:38:35 +0100 (CET) To: Andrew Cagney Cc: Jason Molenda , gdb-patches@sources.redhat.com, jjohnstn@redhat.com Subject: Re: PATCH RFA: Fix MI stack frame output for synthetic frames References: <20021108142248.A65720@molenda.com> <3DCC3CEE.5040902@redhat.com> <20021109004723.A20334@molenda.com> <3E3CB218.1020706@redhat.com> From: Mark Kettenis Date: Sun, 02 Feb 2003 17:38:00 -0000 In-Reply-To: Andrew Cagney's message of "Sun, 02 Feb 2003 00:52:24 -0500" Message-ID: <861y2qtwf8.fsf@elgar.kettenis.dyndns.org> X-SW-Source: 2003-02/txt/msg00045.txt.bz2 Andrew Cagney writes: > > [gdb/ChangeLog] > > 2002-11-09 Jason Molenda (jason-cl@molenda.com) > > > > * stack.c (print_frame_info_base): Output complete FRAME tuple > > for synthesized frames. > I've (finally ...) tested it and checked it in. (renamed > inferior-mischief.c to mi-syn-frame.c though - booring). > > Passes fine on x86. I suspect other targets won't be so lucky. Something must've gone wrong with your testing :-(. The stack.c change lost us a "frame-begin" annotation when printing a DUMMY_FRAME or a SIGTRAMP_FRAME. The latter provoked a FAIL: gdb.base/annota1.exp: backtrace @ signal handler on my system. Anyway, I propose the attached fix. OK to check that in? Index: ChangeLog from Mark Kettenis * stack.c (print_frame_info): Restore call to annotate_frame_begin lost in the previous patch. Index: stack.c =================================================================== RCS file: /cvs/src/src/gdb/stack.c,v retrieving revision 1.64 diff -u -p -r1.64 stack.c --- stack.c 2 Feb 2003 05:51:08 -0000 1.64 +++ stack.c 2 Feb 2003 17:37:44 -0000 @@ -203,6 +203,8 @@ print_frame_info (struct frame_info *fi, struct cleanup *uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "frame"); + annotate_frame_begin (level == -1 ? 0 : level, get_frame_pc (fi)); + /* Do this regardless of SOURCE because we don't have any source to list for this frame. */ if (level >= 0) @@ -216,7 +218,7 @@ print_frame_info (struct frame_info *fi, ui_out_field_core_addr (uiout, "addr", fi->pc); annotate_frame_address_end (); } - + if (get_frame_type (fi) == DUMMY_FRAME) { annotate_function_call ();