From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17865 invoked by alias); 8 Aug 2002 21:06:01 -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 17852 invoked from network); 8 Aug 2002 21:05:58 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 8 Aug 2002 21:05:58 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id g78Kqkl17719 for ; Thu, 8 Aug 2002 16:52:46 -0400 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g78L5uu31977 for ; Thu, 8 Aug 2002 17:05:57 -0400 Received: from romulus.sfbay.redhat.com (IDENT:oFlszaquW5Jq8Og30fFB9WgKi12CF5j9@romulus.sfbay.redhat.com [172.16.27.251]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id g78L5te08112 for ; Thu, 8 Aug 2002 14:05:55 -0700 Received: (from kev@localhost) by romulus.sfbay.redhat.com (8.11.6/8.11.6) id g78L5ra24864 for gdb-patches@sources.redhat.com; Thu, 8 Aug 2002 14:05:53 -0700 Date: Thu, 08 Aug 2002 14:06:00 -0000 From: Kevin Buettner Message-Id: <1020808210553.ZM24863@localhost.localdomain> To: gdb-patches@sources.redhat.com Subject: [RFA] Revise assertion in frame_saved_regs_register_unwind() MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-08/txt/msg00189.txt.bz2 In the course of rewriting mips_get_saved_register(), I found that that an assertion in blockframe.c was erroneously failing. See comment in patch for details. Also, note that set_unwind_by_pc() sets the unwinder to frame_saved_regs_register_unwind() for the non-generic dummy frame case. (This patch is a prerequisite for my upcoming mips_get_saved_register() rewrite.) Okay to commit? * blockframe.c (frame_saved_regs_register_unwind): Revise PC_IN_CALL_DUMMY_ASSERTION to only apply when generic dummy frames are in use. Index: blockframe.c =================================================================== RCS file: /cvs/src/src/gdb/blockframe.c,v retrieving revision 1.34 diff -u -p -r1.34 blockframe.c --- blockframe.c 24 Jul 2002 14:38:55 -0000 1.34 +++ blockframe.c 8 Aug 2002 20:54:14 -0000 @@ -1410,7 +1410,11 @@ frame_saved_regs_register_unwind (struct /* There is always a frame at this point. And THIS is the frame we're interested in. */ gdb_assert (frame != NULL); - gdb_assert (!PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame)); + /* If we're using generic dummy frames, we'd better not be in a call + dummy. (generic_call_dummy_register_unwind ought to have been called + instead.) */ + gdb_assert (!(USE_GENERIC_DUMMY_FRAMES + && PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))); /* Load the saved_regs register cache. */ if (frame->saved_regs == NULL)