From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19778 invoked by alias); 10 Apr 2003 13:19:30 -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 19770 invoked from network); 10 Apr 2003 13:19:30 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 10 Apr 2003 13:19:30 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu-dmz.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id h3ADJTe26780 for ; Thu, 10 Apr 2003 09:19:29 -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 h3ADJTW07268 for ; Thu, 10 Apr 2003 09:19:29 -0400 Received: from cygbert.vinschen.de (vpn50-37.rdu.redhat.com [172.16.50.37]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id h3ADJR517586 for ; Thu, 10 Apr 2003 06:19:27 -0700 Received: (from corinna@localhost) by cygbert.vinschen.de (8.11.6/8.9.3/Linux sendmail 8.9.3) id h3ADJOS16622 for gdb-patches@sources.redhat.com; Thu, 10 Apr 2003 15:19:24 +0200 Date: Thu, 10 Apr 2003 13:19:00 -0000 From: Corinna Vinschen To: gdb-patches@sources.redhat.com Subject: Re: [RFA] i386-tdep.c: Remove call to inside_entry_file Message-ID: <20030410131924.GA16613@cygbert.vinschen.de> Reply-To: gdb-patches@sources.redhat.com Mail-Followup-To: gdb-patches@sources.redhat.com References: <20030401154401.GA13001@cygbert.vinschen.de> <86u1db8tu8.fsf@elgar.kettenis.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86u1db8tu8.fsf@elgar.kettenis.dyndns.org> User-Agent: Mutt/1.4.1i X-SW-Source: 2003-04/txt/msg00194.txt.bz2 On Sun, Apr 06, 2003 at 06:38:07PM +0200, Mark Kettenis wrote: > Therefore, I think it's best to apply your alternative patch. Your > second version is herewith approved. Thanks. I've applied a changed version which additionally defines a new frame_chain_valid function for Cygwin. This exactly eliminates all FAILs in gdb.asm/asm-source.exp. Corinna 2003-04-10 Corinna Vinschen * i386-cygwin-tdep.c (i386_cygwin_frame_chain): New function. (i386_cygwin_init_abi): Set i386_cygwin_frame_chain as new frame_chain function. * Makefile.in: Add dependencies due to above change. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.360 retrieving revision 1.361 diff -p -u -r1.360 -r1.361 --- Makefile.in 6 Apr 2003 01:13:58 -0000 1.360 +++ Makefile.in 10 Apr 2003 13:15:50 -0000 1.361 @@ -1798,7 +1798,7 @@ i386gnu-tdep.o: i386gnu-tdep.c $(defs_h) i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ $(regcache_h) $(target_h) $(i386_tdep_h) $(osabi_h) i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(gdb_string_h) \ - $(i386_tdep_h) $(osabi_h) + $(i386_tdep_h) $(osabi_h) $(gdbcore_h) $(frame_h) $(dummy_frame_h) i386nbsd-tdep.o: i386nbsd-tdep.c $(defs_h) $(gdbtypes_h) $(gdbcore_h) \ $(regcache_h) $(arch_utils_h) $(i386_tdep_h) $(i387_tdep_h) \ $(nbsd_tdep_h) $(solib_svr4_h) $(osabi_h) Index: i386-cygwin-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/i386-cygwin-tdep.c,v retrieving revision 1.1 retrieving revision 1.2 diff -p -u -r1.1 -r1.2 --- i386-cygwin-tdep.c 21 Mar 2003 10:07:17 -0000 1.1 +++ i386-cygwin-tdep.c 10 Apr 2003 13:15:50 -0000 1.2 @@ -20,8 +20,37 @@ Foundation, Inc., 59 Temple Place - Suit #include "defs.h" #include "gdb_string.h" +#include "gdbcore.h" #include "i386-tdep.h" #include "osabi.h" +#include "frame.h" +#include "dummy-frame.h" + +static int +i386_cygwin_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe) +{ + /* In the context where this is used, we get the saved PC before we've + successfully unwound far enough to be sure what we've got (it may + be a signal handler caller). If we're dealing with a signal + handler caller, this will return valid, which is fine. If not, + it'll make the correct test. */ + return ((get_frame_type (thisframe) == SIGTRAMP_FRAME) || chain != 0); +} +/* Return the chain-pointer for FRAME. In the case of the i386, the + frame's nominal address is the address of a 4-byte word containing + the calling frame's address. */ +static CORE_ADDR +i386_cygwin_frame_chain (struct frame_info *frame) +{ + if (pc_in_dummy_frame (get_frame_pc (frame))) + return get_frame_base (frame); + + if (get_frame_type (frame) == SIGTRAMP_FRAME + || i386_frameless_signal_p (frame)) + return get_frame_base (frame); + + return read_memory_unsigned_integer (get_frame_base (frame), 4); +} static void i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) @@ -29,6 +58,8 @@ i386_cygwin_init_abi (struct gdbarch_inf struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); tdep->struct_return = reg_struct_return; + set_gdbarch_deprecated_frame_chain (gdbarch, i386_cygwin_frame_chain); + set_gdbarch_deprecated_frame_chain_valid (gdbarch, i386_cygwin_frame_chain_valid); } static enum gdb_osabi -- Corinna Vinschen Cygwin Developer Red Hat, Inc. mailto:vinschen@redhat.com