From: Andrew Cagney Date: Sun, 20 Jun 2004 17:18:07 +0000 (+0000) Subject: 2004-06-20 Andrew Cagney X-Git-Tag: csl-arm-2004-q3~1148 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5622e8d3cc3ba6ed60cbfee39a9c094074e27a1;p=external%2Fbinutils.git 2004-06-20 Andrew Cagney * gdbarch.sh (DEPRECATED_USE_STRUCT_CONVENTION): Deprecated. * gdbarch.h, gdbarch.c: Re-generate. * values.c (using_struct_return): Update call. * mcore-tdep.c: Update comment. * infcall.c (call_function_by_hand): Update comment. * xstormy16-tdep.c (xstormy16_gdbarch_init): Update. * arch-utils.h (always_use_struct_convention): Update. * v850-tdep.c (v850_gdbarch_init): Update. * sh64-tdep.c (sh64_gdbarch_init): Update. * sh-tdep.c (sh_gdbarch_init): Update. * rs6000-tdep.c (rs6000_gdbarch_init): Update. * mips-tdep.c (mips_gdbarch_init): Update. * mcore-tdep.c (mcore_gdbarch_init): Update. * m32r-tdep.c (m32r_gdbarch_init): Update. * ia64-tdep.c (ia64_gdbarch_init): Update. * h8300-tdep.c (h8300_gdbarch_init): Update. * frv-tdep.c (frv_gdbarch_init): Update. * cris-tdep.c (cris_gdbarch_init): Update. * arm-tdep.c (arm_gdbarch_init): Update. * alpha-tdep.c (alpha_gdbarch_init): Update. Index: doc/ChangeLog 2004-06-20 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Deprecate USE_STRUCT_CONVENTION. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a23071c..bf5798e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,26 @@ +2004-06-20 Andrew Cagney + + * gdbarch.sh (DEPRECATED_USE_STRUCT_CONVENTION): Deprecated. + * gdbarch.h, gdbarch.c: Re-generate. + * values.c (using_struct_return): Update call. + * mcore-tdep.c: Update comment. + * infcall.c (call_function_by_hand): Update comment. + * xstormy16-tdep.c (xstormy16_gdbarch_init): Update. + * arch-utils.h (always_use_struct_convention): Update. + * v850-tdep.c (v850_gdbarch_init): Update. + * sh64-tdep.c (sh64_gdbarch_init): Update. + * sh-tdep.c (sh_gdbarch_init): Update. + * rs6000-tdep.c (rs6000_gdbarch_init): Update. + * mips-tdep.c (mips_gdbarch_init): Update. + * mcore-tdep.c (mcore_gdbarch_init): Update. + * m32r-tdep.c (m32r_gdbarch_init): Update. + * ia64-tdep.c (ia64_gdbarch_init): Update. + * h8300-tdep.c (h8300_gdbarch_init): Update. + * frv-tdep.c (frv_gdbarch_init): Update. + * cris-tdep.c (cris_gdbarch_init): Update. + * arm-tdep.c (arm_gdbarch_init): Update. + * alpha-tdep.c (alpha_gdbarch_init): Update. + 2004-06-18 Michael Chastain * PROBLEMS: Add more specific information, and a work-around, diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index f0ab8c0..08c9e4a 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1550,7 +1550,7 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Call info. */ - set_gdbarch_use_struct_convention (gdbarch, always_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); set_gdbarch_extract_return_value (gdbarch, alpha_extract_return_value); set_gdbarch_store_return_value (gdbarch, alpha_store_return_value); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, alpha_extract_struct_value_address); diff --git a/gdb/alphafbsd-tdep.c b/gdb/alphafbsd-tdep.c index 661cf02..8bd4879 100644 --- a/gdb/alphafbsd-tdep.c +++ b/gdb/alphafbsd-tdep.c @@ -98,7 +98,7 @@ alphafbsd_init_abi (struct gdbarch_info info, /* Hook into the MDEBUG frame unwinder. */ alpha_mdebug_init_abi (info, gdbarch); - set_gdbarch_use_struct_convention (gdbarch, alphafbsd_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, alphafbsd_use_struct_convention); tdep->dynamic_sigtramp_offset = alphafbsd_sigtramp_offset; tdep->sigcontext_addr = alphafbsd_sigcontext_addr; diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index df6f0a6..de5ab3c 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -41,7 +41,7 @@ extern gdbarch_store_return_value_ftype legacy_store_return_value; /* To return any structure or union type by value, store it at the address passed as an invisible first argument to the function. */ -extern gdbarch_use_struct_convention_ftype always_use_struct_convention; +extern gdbarch_deprecated_use_struct_convention_ftype always_use_struct_convention; /* Typical remote_translate_xfer_address */ extern gdbarch_remote_translate_xfer_address_ftype generic_remote_translate_xfer_address; diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 60101dd..9367898 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -2762,7 +2762,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Returning results. */ set_gdbarch_extract_return_value (gdbarch, arm_extract_return_value); set_gdbarch_store_return_value (gdbarch, arm_store_return_value); - set_gdbarch_use_struct_convention (gdbarch, arm_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, arm_use_struct_convention); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, arm_extract_struct_value_address); /* Single stepping. */ diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 85cc947..87d2382 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3795,7 +3795,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_return_value (gdbarch, cris_return_value); set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, cris_reg_struct_has_addr); - set_gdbarch_use_struct_convention (gdbarch, always_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); /* There are 32 registers (some of which may not be implemented). */ set_gdbarch_num_regs (gdbarch, 32); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 6934004..4ab6104 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-06-20 Andrew Cagney + + * gdbint.texinfo (Target Architecture Definition): Deprecate + USE_STRUCT_CONVENTION. + 2004-06-19 Michael Chastain gdb.texinfo (Bug Reporting): Mention session recording, diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index dbcb0b7..5d1ba7f 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3893,8 +3893,8 @@ frame. The value returned must match the dummy frame stack value previously saved using @code{SAVE_DUMMY_FRAME_TOS}. @xref{SAVE_DUMMY_FRAME_TOS}. -@item USE_STRUCT_CONVENTION (@var{gcc_p}, @var{type}) -@findex USE_STRUCT_CONVENTION +@item DEPRECATED_USE_STRUCT_CONVENTION (@var{gcc_p}, @var{type}) +@findex DEPRECATED_USE_STRUCT_CONVENTION If defined, this must be an expression that is nonzero if a value of the given @var{type} being returned from a function must have space allocated for it on the stack. @var{gcc_p} is true if the function diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 634a8b6..77f1374 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -1498,7 +1498,7 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frameless_function_invocation (gdbarch, frv_frameless_function_invocation); - set_gdbarch_use_struct_convention (gdbarch, always_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); set_gdbarch_extract_return_value (gdbarch, frv_extract_return_value); set_gdbarch_deprecated_store_struct_return (gdbarch, frv_store_struct_return); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 84d5b6d..edb6bd7 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -186,7 +186,7 @@ struct gdbarch gdbarch_store_return_value_ftype *store_return_value; gdbarch_deprecated_extract_return_value_ftype *deprecated_extract_return_value; gdbarch_deprecated_store_return_value_ftype *deprecated_store_return_value; - gdbarch_use_struct_convention_ftype *use_struct_convention; + gdbarch_deprecated_use_struct_convention_ftype *deprecated_use_struct_convention; gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address; gdbarch_deprecated_frame_init_saved_regs_ftype *deprecated_frame_init_saved_regs; gdbarch_deprecated_init_extra_frame_info_ftype *deprecated_init_extra_frame_info; @@ -332,7 +332,7 @@ struct gdbarch startup_gdbarch = 0, /* store_return_value */ 0, /* deprecated_extract_return_value */ 0, /* deprecated_store_return_value */ - 0, /* use_struct_convention */ + 0, /* deprecated_use_struct_convention */ 0, /* deprecated_extract_struct_value_address */ 0, /* deprecated_frame_init_saved_regs */ 0, /* deprecated_init_extra_frame_info */ @@ -459,7 +459,7 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->address_to_pointer = unsigned_address_to_pointer; current_gdbarch->extract_return_value = legacy_extract_return_value; current_gdbarch->store_return_value = legacy_store_return_value; - current_gdbarch->use_struct_convention = generic_use_struct_convention; + current_gdbarch->deprecated_use_struct_convention = generic_use_struct_convention; current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; current_gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address; @@ -604,7 +604,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of return_value, has predicate */ /* Skip verify of extract_return_value, invalid_p == 0 */ /* Skip verify of store_return_value, invalid_p == 0 */ - /* Skip verify of use_struct_convention, invalid_p == 0 */ + /* Skip verify of deprecated_use_struct_convention, invalid_p == 0 */ /* Skip verify of deprecated_extract_struct_value_address, has predicate */ /* Skip verify of deprecated_frame_init_saved_regs, has predicate */ /* Skip verify of deprecated_init_extra_frame_info, has predicate */ @@ -1422,6 +1422,16 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_target_read_fp /*DEPRECATED_TARGET_READ_FP ()*/); #endif +#ifdef DEPRECATED_USE_STRUCT_CONVENTION + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_USE_STRUCT_CONVENTION(gcc_p, value_type)", + XSTRING (DEPRECATED_USE_STRUCT_CONVENTION (gcc_p, value_type))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_USE_STRUCT_CONVENTION = <0x%08lx>\n", + (long) current_gdbarch->deprecated_use_struct_convention + /*DEPRECATED_USE_STRUCT_CONVENTION ()*/); +#endif #ifdef DWARF2_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2078,16 +2088,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: unwind_sp = 0x%08lx\n", (long) current_gdbarch->unwind_sp); -#ifdef USE_STRUCT_CONVENTION - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "USE_STRUCT_CONVENTION(gcc_p, value_type)", - XSTRING (USE_STRUCT_CONVENTION (gcc_p, value_type))); - fprintf_unfiltered (file, - "gdbarch_dump: USE_STRUCT_CONVENTION = <0x%08lx>\n", - (long) current_gdbarch->use_struct_convention - /*USE_STRUCT_CONVENTION ()*/); -#endif #ifdef VALUE_TO_REGISTER fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -3545,20 +3545,20 @@ set_gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, } int -gdbarch_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type) +gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->use_struct_convention != NULL); + gdb_assert (gdbarch->deprecated_use_struct_convention != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_use_struct_convention called\n"); - return gdbarch->use_struct_convention (gcc_p, value_type); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_use_struct_convention called\n"); + return gdbarch->deprecated_use_struct_convention (gcc_p, value_type); } void -set_gdbarch_use_struct_convention (struct gdbarch *gdbarch, - gdbarch_use_struct_convention_ftype use_struct_convention) +set_gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, + gdbarch_deprecated_use_struct_convention_ftype deprecated_use_struct_convention) { - gdbarch->use_struct_convention = use_struct_convention; + gdbarch->deprecated_use_struct_convention = deprecated_use_struct_convention; } int diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 01c5e1e..99b8ebe 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1101,8 +1101,10 @@ typedef enum return_value_convention (gdbarch_return_value_ftype) (struct gdbarc extern enum return_value_convention gdbarch_return_value (struct gdbarch *gdbarch, struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf); extern void set_gdbarch_return_value (struct gdbarch *gdbarch, gdbarch_return_value_ftype *return_value); -/* The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE and - USE_STRUCT_CONVENTION have all been folded into RETURN_VALUE. */ +/* The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, + DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and + DEPRECATED_USE_STRUCT_CONVENTION have all been folded into + RETURN_VALUE. */ typedef void (gdbarch_extract_return_value_ftype) (struct type *type, struct regcache *regcache, void *valbuf); extern void gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, void *valbuf); @@ -1144,14 +1146,14 @@ extern void set_gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, #define DEPRECATED_STORE_RETURN_VALUE(type, valbuf) (gdbarch_deprecated_store_return_value (current_gdbarch, type, valbuf)) #endif -typedef int (gdbarch_use_struct_convention_ftype) (int gcc_p, struct type *value_type); -extern int gdbarch_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type); -extern void set_gdbarch_use_struct_convention (struct gdbarch *gdbarch, gdbarch_use_struct_convention_ftype *use_struct_convention); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (USE_STRUCT_CONVENTION) -#error "Non multi-arch definition of USE_STRUCT_CONVENTION" +typedef int (gdbarch_deprecated_use_struct_convention_ftype) (int gcc_p, struct type *value_type); +extern int gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type); +extern void set_gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, gdbarch_deprecated_use_struct_convention_ftype *deprecated_use_struct_convention); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_USE_STRUCT_CONVENTION) +#error "Non multi-arch definition of DEPRECATED_USE_STRUCT_CONVENTION" #endif -#if !defined (USE_STRUCT_CONVENTION) -#define USE_STRUCT_CONVENTION(gcc_p, value_type) (gdbarch_use_struct_convention (current_gdbarch, gcc_p, value_type)) +#if !defined (DEPRECATED_USE_STRUCT_CONVENTION) +#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 diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index f3c438b..cd716f6 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -543,14 +543,16 @@ F:DEPRECATED_STORE_STRUCT_RETURN:void:deprecated_store_struct_return:CORE_ADDR a M::enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf:valtype, regcache, readbuf, writebuf -# The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE and -# USE_STRUCT_CONVENTION have all been folded into RETURN_VALUE. +# The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, +# DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and +# DEPRECATED_USE_STRUCT_CONVENTION have all been folded into +# RETURN_VALUE. f:EXTRACT_RETURN_VALUE:void:extract_return_value:struct type *type, struct regcache *regcache, void *valbuf:type, regcache, valbuf:::legacy_extract_return_value::0 f:STORE_RETURN_VALUE:void:store_return_value:struct type *type, struct regcache *regcache, const void *valbuf:type, regcache, valbuf:::legacy_store_return_value::0 f:DEPRECATED_EXTRACT_RETURN_VALUE:void:deprecated_extract_return_value:struct type *type, char *regbuf, char *valbuf:type, regbuf, valbuf f:DEPRECATED_STORE_RETURN_VALUE:void:deprecated_store_return_value:struct type *type, char *valbuf:type, valbuf -f:USE_STRUCT_CONVENTION:int:use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type:::generic_use_struct_convention::0 +f:DEPRECATED_USE_STRUCT_CONVENTION: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 diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 1534a80..300b99b 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1320,7 +1320,7 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frameless_function_invocation (gdbarch, legacy_frameless_look_for_prologue); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, h8300_extract_struct_value_address); - set_gdbarch_use_struct_convention (gdbarch, always_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); set_gdbarch_breakpoint_from_pc (gdbarch, h8300_breakpoint_from_pc); set_gdbarch_push_dummy_code (gdbarch, h8300_push_dummy_code); set_gdbarch_push_dummy_call (gdbarch, h8300_push_dummy_call); diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index d53aec2..0f948a1 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -99,7 +99,6 @@ static gdbarch_register_type_ftype ia64_register_type; static gdbarch_breakpoint_from_pc_ftype ia64_breakpoint_from_pc; static gdbarch_skip_prologue_ftype ia64_skip_prologue; static gdbarch_extract_return_value_ftype ia64_extract_return_value; -static gdbarch_use_struct_convention_ftype ia64_use_struct_convention; static struct type *is_float_or_hfa_type (struct type *t); static struct type *builtin_type_ia64_ext; @@ -3334,7 +3333,7 @@ ia64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_skip_prologue (gdbarch, ia64_skip_prologue); - set_gdbarch_use_struct_convention (gdbarch, ia64_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, ia64_use_struct_convention); set_gdbarch_extract_return_value (gdbarch, ia64_extract_return_value); set_gdbarch_store_return_value (gdbarch, ia64_store_return_value); diff --git a/gdb/infcall.c b/gdb/infcall.c index 77c71eb..8d89101 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -953,9 +953,9 @@ the function call).", name); else { /* NOTE: cagney/2003-10-20: Unlike "gdbarch_return_value", the - EXTRACT_RETURN_VALUE and USE_STRUCT_CONVENTION methods do - not handle the edge case of a function returning a small - structure / union in registers. */ + EXTRACT_RETURN_VALUE and DEPRECATED_USE_STRUCT_CONVENTION + methods do not handle the edge case of a function returning + a small structure / union in registers. */ retval = allocate_value (value_type); EXTRACT_RETURN_VALUE (value_type, retbuf, VALUE_CONTENTS_RAW (retval)); } diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c index 32feafc..8ea87ae 100644 --- a/gdb/m32r-tdep.c +++ b/gdb/m32r-tdep.c @@ -930,7 +930,7 @@ m32r_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_push_dummy_call (gdbarch, m32r_push_dummy_call); set_gdbarch_store_return_value (gdbarch, m32r_store_return_value); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, m32r_extract_struct_value_address); - set_gdbarch_use_struct_convention (gdbarch, m32r_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, m32r_use_struct_convention); set_gdbarch_skip_prologue (gdbarch, m32r_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 1c9eafe..f8f7b8e 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -916,11 +916,11 @@ 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 to store - the return value. + DEPRECATED_USE_STRUCT_CONVENTION (mcore_use_struct_convention) + returns. If this macro returns 1, gdb will call + STORE_STRUCT_RETURN to store the return value. - If USE_STRUCT_CONVENTION returns 0, then gdb uses + If DEPRECATED_USE_STRUCT_CONVENTION returns 0, then gdb uses STORE_RETURN_VALUE and EXTRACT_RETURN_VALUE to store/fetch the functions return value. */ @@ -1074,7 +1074,7 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Stack grows down. */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_use_struct_convention (gdbarch, mcore_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, mcore_use_struct_convention); set_gdbarch_believe_pcc_promotion (gdbarch, 1); /* MCore will never pass a sturcture by reference. It will always be split between registers and stack. */ diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 77bac42..c13b18e 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -5645,8 +5645,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_ptr_bit (gdbarch, 32); set_gdbarch_long_long_bit (gdbarch, 64); - set_gdbarch_use_struct_convention (gdbarch, - always_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); break; case MIPS_ABI_EABI32: set_gdbarch_push_dummy_call (gdbarch, mips_eabi_push_dummy_call); @@ -5662,8 +5661,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_long_bit (gdbarch, 64); set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, mips_eabi_reg_struct_has_addr); - set_gdbarch_use_struct_convention (gdbarch, - mips_eabi_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, mips_eabi_use_struct_convention); break; case MIPS_ABI_EABI64: set_gdbarch_push_dummy_call (gdbarch, mips_eabi_push_dummy_call); @@ -5679,8 +5677,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_long_bit (gdbarch, 64); set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, mips_eabi_reg_struct_has_addr); - set_gdbarch_use_struct_convention (gdbarch, - mips_eabi_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, mips_eabi_use_struct_convention); break; case MIPS_ABI_N32: set_gdbarch_push_dummy_call (gdbarch, mips_n32n64_push_dummy_call); diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 1bed464..4a65688 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -3028,8 +3028,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 8); if (!sysv_abi) - set_gdbarch_use_struct_convention (gdbarch, - rs6000_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, rs6000_use_struct_convention); if (!sysv_abi) { diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 866a351..86380ce 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -2215,7 +2215,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_print_registers_info (gdbarch, sh_print_registers_info); set_gdbarch_breakpoint_from_pc (gdbarch, sh_breakpoint_from_pc); - set_gdbarch_use_struct_convention (gdbarch, sh_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, sh_use_struct_convention); set_gdbarch_print_insn (gdbarch, gdb_print_insn_sh); set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno); diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 217422e..5809a01 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -2875,7 +2875,7 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_dummy_write_sp (gdbarch, deprecated_write_sp); set_gdbarch_deprecated_store_struct_return (gdbarch, sh64_store_struct_return); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, sh64_extract_struct_value_address); - set_gdbarch_use_struct_convention (gdbarch, sh64_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, sh64_use_struct_convention); set_gdbarch_deprecated_pop_frame (gdbarch, sh64_pop_frame); set_gdbarch_elf_make_msymbol_special (gdbarch, sh64_elf_make_msymbol_special); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 4482809..4ca2624 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1225,7 +1225,7 @@ 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_use_struct_convention (gdbarch, v850_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, v850_use_struct_convention); set_gdbarch_breakpoint_from_pc (gdbarch, v850_breakpoint_from_pc); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); diff --git a/gdb/values.c b/gdb/values.c index de3ce9f..1b8e9b4 100644 --- a/gdb/values.c +++ b/gdb/values.c @@ -1256,7 +1256,7 @@ using_struct_return (struct type *value_type, int gcc_p) if (code == TYPE_CODE_STRUCT || code == TYPE_CODE_UNION || code == TYPE_CODE_ARRAY) - return USE_STRUCT_CONVENTION (gcc_p, value_type); + return DEPRECATED_USE_STRUCT_CONVENTION (gcc_p, value_type); else return 0; } diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 6f747c8..384b8f1 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1167,8 +1167,7 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_store_struct_return (gdbarch, xstormy16_store_struct_return); set_gdbarch_deprecated_store_return_value (gdbarch, xstormy16_store_return_value); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, xstormy16_extract_struct_value_address); - set_gdbarch_use_struct_convention (gdbarch, - xstormy16_use_struct_convention); + set_gdbarch_deprecated_use_struct_convention (gdbarch, xstormy16_use_struct_convention); set_gdbarch_breakpoint_from_pc (gdbarch, xstormy16_breakpoint_from_pc); set_gdbarch_char_signed (gdbarch, 0);