From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29542 invoked by alias); 13 Jun 2007 19:20:50 -0000 Received: (qmail 29532 invoked by uid 22791); 13 Jun 2007 19:20:49 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate3.de.ibm.com (HELO mtagate3.de.ibm.com) (195.212.29.152) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 13 Jun 2007 19:20:38 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.13.8/8.13.8) with ESMTP id l5DJKXfQ111540 for ; Wed, 13 Jun 2007 19:20:33 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.3) with ESMTP id l5DJKXHj4002008 for ; Wed, 13 Jun 2007 21:20:33 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l5DJKXbe014561 for ; Wed, 13 Jun 2007 21:20:33 +0200 Received: from [9.152.248.39] (dyn-9-152-248-39.boeblingen.de.ibm.com [9.152.248.39]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id l5DJKW7a014551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 13 Jun 2007 21:20:33 +0200 Message-ID: <4670432F.1060006@de.ibm.com> Date: Wed, 13 Jun 2007 19:20:00 -0000 From: Markus Deuling User-Agent: Thunderbird 1.5.0.10 (X11/20070301) MIME-Version: 1.0 To: GDB Patches CC: Ulrich Weigand Subject: [rfc] Remove macro DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRES Content-Type: multipart/mixed; boundary="------------030101060607060700030201" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-06/txt/msg00267.txt.bz2 This is a multi-part message in MIME format. --------------030101060607060700030201 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 369 Hello, this patch removes DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRES from gdbarch.sh. This macro hasn't been used anywhere anymore. Build and tested on x86. ChangeLog: * gdbarch.sh (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRES): Remove. * gdbarch.c, gdbarch.h: Regenerate. Is this ok to commit ? -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------030101060607060700030201 Content-Type: text/plain; name="diff-remove-EXTRACT_STRUCT_VALUE_ADDRESS" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-remove-EXTRACT_STRUCT_VALUE_ADDRESS" Content-length: 6422 diff -urN src/gdb/gdbarch.c dev/gdb/gdbarch.c --- src/gdb/gdbarch.c 2007-06-13 20:02:38.000000000 +0200 +++ dev/gdb/gdbarch.c 2007-06-13 21:10:01.000000000 +0200 @@ -189,7 +189,6 @@ gdbarch_extract_return_value_ftype *extract_return_value; gdbarch_store_return_value_ftype *store_return_value; gdbarch_deprecated_use_struct_convention_ftype *deprecated_use_struct_convention; - gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address; gdbarch_skip_prologue_ftype *skip_prologue; gdbarch_inner_than_ftype *inner_than; gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; @@ -313,7 +312,6 @@ 0, /* extract_return_value */ 0, /* store_return_value */ 0, /* deprecated_use_struct_convention */ - 0, /* deprecated_extract_struct_value_address */ 0, /* skip_prologue */ 0, /* inner_than */ 0, /* breakpoint_from_pc */ @@ -560,7 +558,6 @@ /* Skip verify of integer_to_address, has predicate */ /* Skip verify of return_value, has predicate */ /* Skip verify of deprecated_use_struct_convention, invalid_p == 0 */ - /* Skip verify of deprecated_extract_struct_value_address, has predicate */ if (current_gdbarch->skip_prologue == 0) fprintf_unfiltered (log, "\n\tskip_prologue"); if (current_gdbarch->inner_than == 0) @@ -733,24 +730,6 @@ fprintf_unfiltered (file, "gdbarch_dump: decr_pc_after_break = 0x%s\n", paddr_nz (current_gdbarch->decr_pc_after_break)); -#ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P()", - XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_extract_struct_value_address_p() = %d\n", - gdbarch_deprecated_extract_struct_value_address_p (current_gdbarch)); -#ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regcache)", - XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (regcache))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_extract_struct_value_address = <0x%lx>\n", - (long) current_gdbarch->deprecated_extract_struct_value_address); #ifdef DEPRECATED_FP_REGNUM fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_FP_REGNUM # %s\n", @@ -2274,30 +2253,6 @@ gdbarch->deprecated_use_struct_convention = deprecated_use_struct_convention; } -int -gdbarch_deprecated_extract_struct_value_address_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_extract_struct_value_address != NULL; -} - -CORE_ADDR -gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, struct regcache *regcache) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_extract_struct_value_address != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_extract_struct_value_address called\n"); - return gdbarch->deprecated_extract_struct_value_address (regcache); -} - -void -set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, - gdbarch_deprecated_extract_struct_value_address_ftype deprecated_extract_struct_value_address) -{ - gdbarch->deprecated_extract_struct_value_address = deprecated_extract_struct_value_address; -} - CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) { diff -urN src/gdb/gdbarch.h dev/gdb/gdbarch.h --- src/gdb/gdbarch.h 2007-06-13 20:02:38.000000000 +0200 +++ dev/gdb/gdbarch.h 2007-06-13 21:09:51.000000000 +0200 @@ -495,32 +495,8 @@ will be needed for that case to work. NB: It is passed the callers frame since it is only after the callee has returned that this function is used. - M::CORE_ADDR:extract_returned_value_address:struct frame_info *caller_frame:caller_frame */ - -#if defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS) -/* Legacy for systems yet to multi-arch DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS */ -#if !defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P) -#define DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_extract_struct_value_address_p (struct gdbarch *gdbarch); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P) -#error "Non multi-arch definition of DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS" -#endif -#if !defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P) -#define DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P() (gdbarch_deprecated_extract_struct_value_address_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_extract_struct_value_address_ftype) (struct regcache *regcache); -extern CORE_ADDR gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, struct regcache *regcache); -extern void set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS) -#error "Non multi-arch definition of DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS" -#endif -#if !defined (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS) -#define DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regcache) (gdbarch_deprecated_extract_struct_value_address (current_gdbarch, regcache)) -#endif + M::CORE_ADDR:extract_returned_value_address:struct frame_info *caller_frame:caller_frame + */ typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (CORE_ADDR ip); extern CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip); diff -urN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh --- src/gdb/gdbarch.sh 2007-06-13 20:02:38.000000000 +0200 +++ dev/gdb/gdbarch.sh 2007-06-13 21:09:41.000000000 +0200 @@ -538,7 +538,6 @@ # function is used. #M::CORE_ADDR:extract_returned_value_address:struct frame_info *caller_frame:caller_frame -F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache:regcache # f::CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 --------------030101060607060700030201--