From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15536 invoked by alias); 30 Apr 2004 22:01:02 -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 15529 invoked from network); 30 Apr 2004 22:00:59 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 30 Apr 2004 22:00:59 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i3UM0xKI007763 for ; Fri, 30 Apr 2004 18:00:59 -0400 Received: from localhost.redhat.com (to-dhcp51.toronto.redhat.com [172.16.14.151]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i3UM0wv16456; Fri, 30 Apr 2004 18:00:58 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id F24372B9D; Fri, 30 Apr 2004 18:01:00 -0400 (EDT) Message-ID: <4092CC9C.4070003@gnu.org> Date: Fri, 30 Apr 2004 22:01:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [obish] Eliminate SIGTRAMP_START / SIGTRAMP_END Content-Type: multipart/mixed; boundary="------------040306010605000704030405" X-SW-Source: 2004-04/txt/msg00720.txt.bz2 This is a multi-part message in MIME format. --------------040306010605000704030405 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 275 Hello, This patch eliminates the deprecated SIGTRAMP_START / SIGTRAMP_END macros. It does use a small slight of hand, the two remaining definitions were convered into DEPRECATED_IN_SIGTRAMP macros -- two steps forward, one step back. I'll commit in a day or so, Andrew --------------040306010605000704030405 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 4596 2004-04-30 Andrew Cagney * gdbarch.sh (DEPRECATED_SIGTRAMP_START) (DEPRECATED_SIGTRAMP_END): Delete. * gdbarch.h, gdbarch.c: Re-generate. * arch-utils.c (legacy_pc_in_sigtramp): Simplify. * config/vax/tm-vaxbsd.h: Update copyright. (DEPRECATED_SIGTRAMP_START, DEPRECATED_SIGTRAMP_END): Delete. (DEPRECATED_IN_SIGTRAMP): Define. * config/m68k/tm-nbsd.h: Update copyright. (DEPRECATED_SIGTRAMP_START, DEPRECATED_SIGTRAMP_END): Delete. (DEPRECATED_IN_SIGTRAMP): Define. Index: arch-utils.c =================================================================== RCS file: /cvs/src/src/gdb/arch-utils.c,v retrieving revision 1.114 diff -p -u -r1.114 arch-utils.c --- arch-utils.c 23 Mar 2004 15:16:39 -0000 1.114 +++ arch-utils.c 30 Apr 2004 21:50:33 -0000 @@ -298,14 +298,10 @@ generic_register_byte (int regnum) int legacy_pc_in_sigtramp (CORE_ADDR pc, char *name) { -#if !defined (DEPRECATED_IN_SIGTRAMP) - if (DEPRECATED_SIGTRAMP_START_P ()) - return ((pc) >= DEPRECATED_SIGTRAMP_START (pc) - && (pc) < DEPRECATED_SIGTRAMP_END (pc)); - else - return name && strcmp ("_sigtramp", name) == 0; -#else +#if defined (DEPRECATED_IN_SIGTRAMP) return DEPRECATED_IN_SIGTRAMP (pc, name); +#else + return name && strcmp ("_sigtramp", name) == 0; #endif } Index: gdbarch.sh =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.sh,v retrieving revision 1.308 diff -p -u -r1.308 gdbarch.sh --- gdbarch.sh 30 Apr 2004 14:40:54 -0000 1.308 +++ gdbarch.sh 30 Apr 2004 21:50:34 -0000 @@ -719,12 +719,10 @@ f:2:IN_SOLIB_CALL_TRAMPOLINE:int:in_soli # Some systems also have trampoline code for returning from shared libs. f:2:IN_SOLIB_RETURN_TRAMPOLINE:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name:::generic_in_solib_return_trampoline::0 -# NOTE: cagney/2004-03-23: DEPRECATED_SIGTRAMP_START, -# DEPRECATED_SIGTRAMP_END, and DEPRECATED_PC_IN_SIGTRAMP have all been +# NOTE: cagney/2004-03-23: DEPRECATED_PC_IN_SIGTRAMP have all been # superseeded by signal trampoline frame sniffers. F::DEPRECATED_PC_IN_SIGTRAMP:int:deprecated_pc_in_sigtramp:CORE_ADDR pc, char *name:pc, name:::legacy_pc_in_sigtramp -F:2:DEPRECATED_SIGTRAMP_START:CORE_ADDR:deprecated_sigtramp_start:CORE_ADDR pc:pc -F:2:DEPRECATED_SIGTRAMP_END:CORE_ADDR:deprecated_sigtramp_end:CORE_ADDR pc:pc + # A target might have problems with watchpoints as soon as the stack # frame of the current function has been destroyed. This mostly happens # as the first action in a funtion's epilogue. in_function_epilogue_p() Index: config/m68k/tm-nbsd.h =================================================================== RCS file: /cvs/src/src/gdb/config/m68k/tm-nbsd.h,v retrieving revision 1.6 diff -p -u -r1.6 tm-nbsd.h --- config/m68k/tm-nbsd.h 23 Mar 2004 15:16:42 -0000 1.6 +++ config/m68k/tm-nbsd.h 30 Apr 2004 21:50:34 -0000 @@ -1,5 +1,6 @@ /* Macro definitions for m68k running under NetBSD. - Copyright 1994, 1996, 2001 Free Software Foundation, Inc. + + Copyright 1994, 1996, 2001, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -33,8 +34,8 @@ #define STACK_END_ADDR USRSTACK /* For NetBSD, sigtramp is 32 bytes before STACK_END_ADDR. */ -#define DEPRECATED_SIGTRAMP_START(pc) (STACK_END_ADDR - 32) -#define DEPRECATED_SIGTRAMP_END(pc) (STACK_END_ADDR) +#define DEPRECATED_IN_SIGTRAMP(PC,FUNC_NAME) \ +((PC) >= (STACK_END_ADDR - 32) && (PC) < (STACK_END_ADDR)) #include "m68k/tm-m68k.h" Index: config/vax/tm-vaxbsd.h =================================================================== RCS file: /cvs/src/src/gdb/config/vax/tm-vaxbsd.h,v retrieving revision 1.4 diff -p -u -r1.4 tm-vaxbsd.h --- config/vax/tm-vaxbsd.h 23 Mar 2004 15:16:42 -0000 1.4 +++ config/vax/tm-vaxbsd.h 30 Apr 2004 21:50:34 -0000 @@ -1,6 +1,7 @@ /* Definitions to make GDB run on a vax under 4.2bsd. - Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1996, 1998, 1999, 2000, 2002 - Free Software Foundation, Inc. + + Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1996, 1998, 1999, + 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -29,7 +30,7 @@ /* On the VAX, sigtramp is in the u area. Can't check the exact addresses because for cross-debugging we don't have VAX include files around. This should be close enough. */ -#define DEPRECATED_SIGTRAMP_START(pc) STACK_END_ADDR -#define DEPRECATED_SIGTRAMP_END(pc) 0x80000000 +#define DEPRECATED_IN_SIGTRAMP(PC,FUNC_NAME) \ +((PC) >= (STACK_END_ADDR) && (PC) < (0x80000000)) #endif /* TM_VAXBSD_H */ --------------040306010605000704030405--