From 464e0365d26d6de5eaa70d14c69a3028ed222deb Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 17 Jan 2004 18:45:25 +0000 Subject: [PATCH] 2004-01-17 Andrew Cagney * mcore-tdep.c: Update copyright. (mcore_extract_struct_value_address): Delete function. Update comments. (mcore_gdbarch_init): Update. * mn10300-tdep.c: Update copyright. (mn10300_extract_struct_value_address): Delete function. (mn10300_gdbarch_init): Update. * v850-tdep.c: Update copyright. (v850_extract_struct_value_address): Delete. (v850_gdbarch_init): Update. * ns32k-tdep.c: Update copyright. (ns32k_extract_struct_value_address): Delete. (ns32k_gdbarch_init): Update. * hppa-tdep.c (hppa_extract_struct_value_address): Delete. (hppa_gdbarch_init): Update. * vax-tdep.c: Update copyright. (vax_extract_struct_value_address): Delete. (vax_gdbarch_init): Update. --- gdb/ChangeLog | 19 +++++++++++++++++++ gdb/hppa-tdep.c | 23 ----------------------- gdb/mcore-tdep.c | 31 +++++++++---------------------- gdb/mn10300-tdep.c | 13 ++----------- gdb/ns32k-tdep.c | 13 +++---------- gdb/v850-tdep.c | 13 +++---------- gdb/vax-tdep.c | 15 +++------------ 7 files changed, 39 insertions(+), 88 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a3c9b6da2c3..f0477c0fd72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,24 @@ 2004-01-17 Andrew Cagney + * mcore-tdep.c: Update copyright. + (mcore_extract_struct_value_address): Delete function. Update + comments. + (mcore_gdbarch_init): Update. + * mn10300-tdep.c: Update copyright. + (mn10300_extract_struct_value_address): Delete function. + (mn10300_gdbarch_init): Update. + * v850-tdep.c: Update copyright. + (v850_extract_struct_value_address): Delete. + (v850_gdbarch_init): Update. + * ns32k-tdep.c: Update copyright. + (ns32k_extract_struct_value_address): Delete. + (ns32k_gdbarch_init): Update. + * hppa-tdep.c (hppa_extract_struct_value_address): Delete. + (hppa_gdbarch_init): Update. + * vax-tdep.c: Update copyright. + (vax_extract_struct_value_address): Delete. + (vax_gdbarch_init): Update. + * gdbarch.sh (DEPRECATED_NPC_REGNUM): Delete. * gdbarch.h, gdbarch.c: Re-generate. * procfs.c (procfs_fetch_registers): Delete reference to diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 46736778845..2241e7e66b7 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -194,7 +194,6 @@ int hppa32_use_struct_convention (int gcc_p, struct type *type); int hppa64_use_struct_convention (int gcc_p, struct type *type); void hppa32_store_return_value (struct type *type, char *valbuf); void hppa64_store_return_value (struct type *type, char *valbuf); -CORE_ADDR hppa_extract_struct_value_address (char *regbuf); int hppa_cannot_store_register (int regnum); void hppa_init_extra_frame_info (int fromleaf, struct frame_info *frame); CORE_ADDR hppa_frame_chain (struct frame_info *frame); @@ -5009,26 +5008,6 @@ hppa_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) { write_register (28, addr); } - -CORE_ADDR -hppa_extract_struct_value_address (char *regbuf) -{ - /* 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). */ - /* FIXME: brobecker 2002-12-26. - The current implementation is historical, but we should eventually - implement it in a more robust manner as it relies on the fact that - the address size is equal to the size of an int* _on the host_... - One possible implementation that crossed my mind is to use - extract_address. */ - /* FIXME: cagney/2003-09-27: This function can probably go. ELZ - writes: We cannot assume on the pa that r28 still contains the - address of the returned structure. Usually this will be - overwritten by the callee. */ - return (*(int *)(regbuf + DEPRECATED_REGISTER_BYTE (28))); -} - /* Return True if REGNUM is not a register available to the user through ptrace(). */ @@ -5208,8 +5187,6 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_max_register_raw_size (gdbarch, tdep->bytes_per_address); set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 8); set_gdbarch_deprecated_store_struct_return (gdbarch, hppa_store_struct_return); - set_gdbarch_deprecated_extract_struct_value_address - (gdbarch, hppa_extract_struct_value_address); set_gdbarch_cannot_store_register (gdbarch, hppa_cannot_store_register); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, hppa_init_extra_frame_info); set_gdbarch_deprecated_frame_chain (gdbarch, hppa_frame_chain); diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 5382f7ebc02..5e08e25a20c 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -1,5 +1,7 @@ /* Target-machine dependent code for Motorola MCore for GDB, the GNU debugger - Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + + Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software + Foundation, Inc. This file is part of GDB. @@ -917,16 +919,13 @@ mcore_push_return_address (CORE_ADDR pc, CORE_ADDR sp) argument. For gdb, this leaves us two routes, based on what - USE_STRUCT_CONVENTION (mcore_use_struct_convention) returns. - If this macro returns 1, gdb will call STORE_STRUCT_RETURN and - EXTRACT_STRUCT_VALUE_ADDRESS. - - If USE_STRUCT_CONVENTION retruns 0, then gdb uses STORE_RETURN_VALUE - and EXTRACT_RETURN_VALUE to store/fetch the functions return value. */ + USE_STRUCT_CONVENTION (mcore_use_struct_convention) returns. If + this macro returns 1, gdb will call STORE_STRUCT_RETURN to store + the return value. -/* Should we use EXTRACT_STRUCT_VALUE_ADDRESS instead of - EXTRACT_RETURN_VALUE? GCC_P is true if compiled with gcc - and TYPE is the type (which is known to be struct, union or array). */ + If USE_STRUCT_CONVENTION returns 0, then gdb uses + STORE_RETURN_VALUE and EXTRACT_RETURN_VALUE to store/fetch the + functions return value. */ static int mcore_use_struct_convention (int gcc_p, struct type *type) @@ -934,16 +933,6 @@ mcore_use_struct_convention (int gcc_p, struct type *type) return (TYPE_LENGTH (type) > 8); } -/* Where is the return value saved? For MCore, a pointer to - this buffer was passed as a hidden first argument, so - just return that address. */ - -static CORE_ADDR -mcore_extract_struct_value_address (char *regbuf) -{ - return extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (FIRST_ARGREG), DEPRECATED_REGISTER_SIZE); -} - /* Given a function which returns a value of type TYPE, extract the the function's return value and place the result into VALBUF. REGBUF is the register contents of the target. */ @@ -1085,8 +1074,6 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_extract_return_value (gdbarch, mcore_extract_return_value); set_gdbarch_deprecated_store_struct_return (gdbarch, mcore_store_struct_return); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, - mcore_extract_struct_value_address); set_gdbarch_skip_prologue (gdbarch, mcore_skip_prologue); set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_deprecated_frame_args_address (gdbarch, mcore_frame_args_address); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 904a37576ba..ec7d19e3516 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1,7 +1,7 @@ /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software - Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free + Software Foundation, Inc. This file is part of GDB. @@ -130,13 +130,6 @@ mn10300_extract_return_value (struct type *type, char *regbuf, char *valbuf) memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (0), TYPE_LENGTH (type)); } -static CORE_ADDR -mn10300_extract_struct_value_address (char *regbuf) -{ - return extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (4), - DEPRECATED_REGISTER_RAW_SIZE (4)); -} - static void mn10300_store_return_value (struct type *type, char *valbuf) { @@ -1182,8 +1175,6 @@ mn10300_gdbarch_init (struct gdbarch_info info, set_gdbarch_deprecated_frame_chain (gdbarch, mn10300_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, mn10300_frame_saved_pc); set_gdbarch_deprecated_extract_return_value (gdbarch, mn10300_extract_return_value); - set_gdbarch_deprecated_extract_struct_value_address - (gdbarch, mn10300_extract_struct_value_address); set_gdbarch_deprecated_store_return_value (gdbarch, mn10300_store_return_value); set_gdbarch_deprecated_store_struct_return (gdbarch, mn10300_store_struct_return); set_gdbarch_deprecated_pop_frame (gdbarch, mn10300_pop_frame); diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index b0a133c3313..6726c8cc5f1 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -1,6 +1,7 @@ /* Target dependent code for the NS32000, for GDB. - Copyright 1986, 1988, 1991, 1992, 1994, 1995, 1998, 1999, 2000, 2001, - 2002, 2003 Free Software Foundation, Inc. + + Copyright 1986, 1988, 1991, 1992, 1994, 1995, 1998, 1999, 2000, + 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -495,12 +496,6 @@ ns32k_store_return_value (struct type *valtype, char *valbuf) TYPE_LENGTH (valtype)); } -static CORE_ADDR -ns32k_extract_struct_value_address (char *regbuf) -{ - return (extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (0), DEPRECATED_REGISTER_RAW_SIZE (0))); -} - void ns32k_gdbarch_init_32082 (struct gdbarch *gdbarch) { @@ -582,8 +577,6 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_store_struct_return (gdbarch, ns32k_store_struct_return); set_gdbarch_deprecated_extract_return_value (gdbarch, ns32k_extract_return_value); set_gdbarch_deprecated_store_return_value (gdbarch, ns32k_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, - ns32k_extract_struct_value_address); /* Call dummy info */ set_gdbarch_deprecated_push_dummy_frame (gdbarch, ns32k_push_dummy_frame); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 44ea93b3032..385c95c3244 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1,6 +1,7 @@ /* Target-dependent code for the NEC V850 for GDB, the GNU debugger. - Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + + Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free + Software Foundation, Inc. This file is part of GDB. @@ -1088,13 +1089,6 @@ v850_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) return breakpoint; } -static CORE_ADDR -v850_extract_struct_value_address (char *regbuf) -{ - return extract_unsigned_integer (regbuf + v850_register_byte (E_V0_REGNUM), - v850_register_raw_size (E_V0_REGNUM)); -} - static void v850_store_return_value (struct type *type, char *valbuf) { @@ -1272,7 +1266,6 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_pop_frame (gdbarch, v850_pop_frame); set_gdbarch_deprecated_store_struct_return (gdbarch, v850_store_struct_return); set_gdbarch_deprecated_store_return_value (gdbarch, v850_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, v850_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, v850_use_struct_convention); set_gdbarch_deprecated_call_dummy_words (gdbarch, call_dummy_nil); set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, 0); diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index e7f68998adb..939c3271343 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -1,6 +1,7 @@ /* Print VAX instructions for GDB, the GNU debugger. - Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000, 2002, 2003 - Free Software Foundation, Inc. + + Copyright 1986, 1989, 1991, 1992, 1995, 1996, 1998, 1999, 2000, + 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -41,8 +42,6 @@ static gdbarch_frame_num_args_ftype vax_frame_num_args; static gdbarch_deprecated_frame_chain_ftype vax_frame_chain; static gdbarch_deprecated_extract_return_value_ftype vax_extract_return_value; -static gdbarch_deprecated_extract_struct_value_address_ftype - vax_extract_struct_value_address; static gdbarch_deprecated_push_dummy_frame_ftype vax_push_dummy_frame; @@ -275,13 +274,6 @@ vax_store_return_value (struct type *valtype, char *valbuf) { deprecated_write_register_bytes (0, valbuf, TYPE_LENGTH (valtype)); } - -static CORE_ADDR -vax_extract_struct_value_address (char *regbuf) -{ - return (extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (0), - DEPRECATED_REGISTER_RAW_SIZE (0))); -} static const unsigned char * vax_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) @@ -391,7 +383,6 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_store_struct_return (gdbarch, vax_store_struct_return); set_gdbarch_deprecated_extract_return_value (gdbarch, vax_extract_return_value); set_gdbarch_deprecated_store_return_value (gdbarch, vax_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, vax_extract_struct_value_address); /* Call dummy info */ set_gdbarch_deprecated_push_dummy_frame (gdbarch, vax_push_dummy_frame); -- 2.30.2