From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13298 invoked by alias); 18 Jun 2007 18:01:43 -0000 Received: (qmail 13279 invoked by uid 22791); 18 Jun 2007 18:01:41 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate4.de.ibm.com (HELO mtagate4.de.ibm.com) (195.212.29.153) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 18 Jun 2007 18:01:30 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.13.8/8.13.8) with ESMTP id l5II1RXc056056 for ; Mon, 18 Jun 2007 18:01:27 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 l5II1RSn3981450 for ; Mon, 18 Jun 2007 20:01:27 +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 l5II1Q1Z029675 for ; Mon, 18 Jun 2007 20:01:27 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id l5II1Q5v029668; Mon, 18 Jun 2007 20:01:26 +0200 Message-Id: <200706181801.l5II1Q5v029668@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Mon, 18 Jun 2007 20:01:26 +0200 Subject: Re: [rfc] Remove macro DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRES To: deuling@de.ibm.com (Markus Deuling) Date: Mon, 18 Jun 2007 18:01:00 -0000 From: "Ulrich Weigand" Cc: mark.kettenis@xs4all.nl (Mark Kettenis), gdb-patches@sourceware.org In-Reply-To: <46760403.8060805@de.ibm.com> from "Markus Deuling" at Jun 18, 2007 06:03:15 AM X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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/msg00338.txt.bz2 Markus Deuling wrote: > * gdbarch.sh (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS): Remove. > * sh-tdep.c (sh_extract_struct_value_address): Remove. > (sh_gdbarch_init): Remove > set_gdbarch_deprecated_extract_struct_value_address. > * sh64-tdep.c (sh64_extract_struct_value_address): Remove. > (sh64_gdbarch_init): Remove > set_gdbarch_deprecated_extract_struct_value_address. > * ia64-tdep.c (ia64_extract_struct_value_address): Remove. > (ia64_gdbarch_init): Remove > set_gdbarch_deprecated_extract_struct_value_address. > * frv-tdep.c (frv_extract_struct_value_address): Remove. > (frv_gdbarch_init): Remove > set_gdbarch_deprecated_extract_struct_value_address. > * gdbarch.c, gdbarch.h: Regenerate. I've committed this; I've also removed the comment in gdbarch.sh leading up to the removed function. Note that even the 'replacment' mentioned in that comment, extract_returned_value_address, is itself already obsolete -- the correct way to indicate the returned struct address is by using the RETURN_VALUE_ABI_RETURNS_ADDRESS or RETURN_VALUE_ABI_PRESERVES_ADDRESS return value convention. See below the version of the patch as I committed it. Bye, Ulrich diff -urNp gdb-orig/gdb/frv-tdep.c gdb-head/gdb/frv-tdep.c --- gdb-orig/gdb/frv-tdep.c 2007-06-18 19:51:09.625815000 +0200 +++ gdb-head/gdb/frv-tdep.c 2007-06-18 19:52:40.183483303 +0200 @@ -1049,14 +1049,6 @@ frv_extract_return_value (struct type *t } static CORE_ADDR -frv_extract_struct_value_address (struct regcache *regcache) -{ - ULONGEST addr; - regcache_cooked_read_unsigned (regcache, struct_return_regnum, &addr); - return addr; -} - -static CORE_ADDR frv_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp) { /* Require dword alignment. */ @@ -1502,7 +1494,6 @@ frv_gdbarch_init (struct gdbarch_info in set_gdbarch_extract_return_value (gdbarch, frv_extract_return_value); set_gdbarch_store_return_value (gdbarch, frv_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, frv_extract_struct_value_address); /* Frame stuff. */ set_gdbarch_unwind_pc (gdbarch, frv_unwind_pc); diff -urNp gdb-orig/gdb/gdbarch.c gdb-head/gdb/gdbarch.c --- gdb-orig/gdb/gdbarch.c 2007-06-18 19:51:09.650811000 +0200 +++ gdb-head/gdb/gdbarch.c 2007-06-18 19:52:40.245474387 +0200 @@ -188,7 +188,6 @@ struct gdbarch 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; @@ -311,7 +310,6 @@ struct gdbarch startup_gdbarch = 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 */ @@ -555,7 +553,6 @@ verify_gdbarch (struct gdbarch *current_ /* 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) @@ -725,24 +722,6 @@ gdbarch_dump (struct gdbarch *current_gd 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", @@ -2221,30 +2200,6 @@ set_gdbarch_deprecated_use_struct_conven 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 -urNp gdb-orig/gdb/gdbarch.h gdb-head/gdb/gdbarch.h --- gdb-orig/gdb/gdbarch.h 2007-06-18 19:51:09.671808000 +0200 +++ gdb-head/gdb/gdbarch.h 2007-06-18 19:52:40.301466333 +0200 @@ -427,49 +427,6 @@ extern void set_gdbarch_deprecated_use_s #define DEPRECATED_USE_STRUCT_CONVENTION(gcc_p, value_type) (gdbarch_deprecated_use_struct_convention (current_gdbarch, gcc_p, value_type)) #endif -/* As of 2004-01-17 only the 32-bit SPARC ABI has been identified as an - ABI suitable for the implementation of a robust extract - struct-convention return-value address method (the sparc saves the - address in the callers frame). All the other cases so far examined, - the DEPRECATED_EXTRACT_STRUCT_VALUE implementation has been - erreneous - the code was incorrectly assuming that the return-value - address, stored in a register, was preserved across the entire - function call. - For the moment retain DEPRECATED_EXTRACT_STRUCT_VALUE as a marker of - the ABIs that are still to be analyzed - perhaps this should simply - be deleted. The commented out extract_returned_value_address method - is provided as a starting point for the 32-bit SPARC. It, or - something like it, along with changes to both infcmd.c and stack.c - 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 - typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (CORE_ADDR ip); extern CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip); extern void set_gdbarch_skip_prologue (struct gdbarch *gdbarch, gdbarch_skip_prologue_ftype *skip_prologue); diff -urNp gdb-orig/gdb/gdbarch.sh gdb-head/gdb/gdbarch.sh --- gdb-orig/gdb/gdbarch.sh 2007-06-18 19:51:09.692805000 +0200 +++ gdb-head/gdb/gdbarch.sh 2007-06-18 19:52:40.357458279 +0200 @@ -517,28 +517,6 @@ f:=:void:extract_return_value:struct typ f:=:void:store_return_value:struct type *type, struct regcache *regcache, const gdb_byte *valbuf:type, regcache, valbuf:0 f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0 -# As of 2004-01-17 only the 32-bit SPARC ABI has been identified as an -# ABI suitable for the implementation of a robust extract -# struct-convention return-value address method (the sparc saves the -# address in the callers frame). All the other cases so far examined, -# the DEPRECATED_EXTRACT_STRUCT_VALUE implementation has been -# erreneous - the code was incorrectly assuming that the return-value -# address, stored in a register, was preserved across the entire -# function call. - -# For the moment retain DEPRECATED_EXTRACT_STRUCT_VALUE as a marker of -# the ABIs that are still to be analyzed - perhaps this should simply -# be deleted. The commented out extract_returned_value_address method -# is provided as a starting point for the 32-bit SPARC. It, or -# something like it, along with changes to both infcmd.c and stack.c -# 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 -F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache:regcache - -# f::CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 f::int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0 f::const gdb_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0: diff -urNp gdb-orig/gdb/ia64-tdep.c gdb-head/gdb/ia64-tdep.c --- gdb-orig/gdb/ia64-tdep.c 2007-06-18 19:51:09.705803000 +0200 +++ gdb-head/gdb/ia64-tdep.c 2007-06-18 19:52:40.404451520 +0200 @@ -2994,13 +2994,6 @@ ia64_extract_return_value (struct type * } } -CORE_ADDR -ia64_extract_struct_value_address (struct regcache *regcache) -{ - error (_("ia64_extract_struct_value_address called and cannot get struct value address")); - return 0; -} - static int is_float_or_hfa_type_recurse (struct type *t, struct type **etp) @@ -3551,7 +3544,6 @@ ia64_gdbarch_init (struct gdbarch_info i set_gdbarch_extract_return_value (gdbarch, ia64_extract_return_value); set_gdbarch_store_return_value (gdbarch, ia64_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, ia64_extract_struct_value_address); set_gdbarch_memory_insert_breakpoint (gdbarch, ia64_memory_insert_breakpoint); set_gdbarch_memory_remove_breakpoint (gdbarch, ia64_memory_remove_breakpoint); diff -urNp gdb-orig/gdb/sh64-tdep.c gdb-head/gdb/sh64-tdep.c --- gdb-orig/gdb/sh64-tdep.c 2007-06-18 19:51:09.728800000 +0200 +++ gdb-head/gdb/sh64-tdep.c 2007-06-18 19:52:40.462443179 +0200 @@ -962,17 +962,6 @@ sh64_analyze_prologue (struct gdbarch *g } static CORE_ADDR -sh64_extract_struct_value_address (struct regcache *regcache) -{ - /* FIXME: cagney/2004-01-17: Does the ABI guarantee that the return - address regster is preserved across function calls? Probably - not, making this function wrong. */ - ULONGEST val; - regcache_raw_read_unsigned (regcache, STRUCT_RETURN_REGNUM, &val); - return val; -} - -static CORE_ADDR sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp) { return sp & ~7; @@ -2515,8 +2504,6 @@ sh64_gdbarch_init (struct gdbarch_info i set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno); set_gdbarch_return_value (gdbarch, sh64_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, - sh64_extract_struct_value_address); set_gdbarch_skip_prologue (gdbarch, sh64_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); diff -urNp gdb-orig/gdb/sh-tdep.c gdb-head/gdb/sh-tdep.c --- gdb-orig/gdb/sh-tdep.c 2007-06-18 19:51:09.751797000 +0200 +++ gdb-head/gdb/sh-tdep.c 2007-06-18 19:52:40.518435125 +0200 @@ -815,18 +815,6 @@ sh_use_struct_convention (int gcc_p, str return 1; } -/* Extract from an array REGBUF containing the (raw) register state - the address in which a function should return its structure value, - as a CORE_ADDR (or an expression that can be used as one). */ -static CORE_ADDR -sh_extract_struct_value_address (struct regcache *regcache) -{ - ULONGEST addr; - - regcache_cooked_read_unsigned (regcache, STRUCT_RETURN_REGNUM, &addr); - return addr; -} - static CORE_ADDR sh_frame_align (struct gdbarch *ignore, CORE_ADDR sp) { @@ -2751,8 +2739,6 @@ sh_gdbarch_init (struct gdbarch_info inf set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno); set_gdbarch_return_value (gdbarch, sh_return_value_nofpu); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, - sh_extract_struct_value_address); set_gdbarch_skip_prologue (gdbarch, sh_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com