diff options
author | Andrew Cagney <cagney@redhat.com> | 2003-03-02 04:02:25 +0000 |
---|---|---|
committer | Andrew Cagney <cagney@redhat.com> | 2003-03-02 04:02:25 +0000 |
commit | f30ee0bc4fb42c24d8c05592dbfcaaaaa01ec167 (patch) | |
tree | ffb566897a3cfa9f670b7209fc5614e6edd91dc5 /gdb | |
parent | 42fa7c0fc9c237c7e5fc33d3e7b0b358833a0c58 (diff) | |
download | fsf-binutils-gdb-f30ee0bc4fb42c24d8c05592dbfcaaaaa01ec167.zip fsf-binutils-gdb-f30ee0bc4fb42c24d8c05592dbfcaaaaa01ec167.tar.gz fsf-binutils-gdb-f30ee0bc4fb42c24d8c05592dbfcaaaaa01ec167.tar.bz2 |
2003-03-01 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_FRAME_INIT_SAVED_REGS): Rename
FRAME_INIT_SAVED_REGS.
* gdbarch.h, gdbarch.c: Regenerate.
* stack.c (frame_info): Update.
* sh-tdep.c (sh_find_callers_reg, sh64_get_saved_pr): Update.
(sh_init_extra_frame_info, sh64_init_extra_frame_info): Update.
(sh64_get_saved_register, sh_pop_frame, sh64_pop_frame): Update.
* ns32k-tdep.c (ns32k_pop_frame): Update.
* mips-tdep.c (mips_pop_frame): Update.
* m68hc11-tdep.c (m68hc11_pop_frame): Update.
* ia64-tdep.c (ia64_frame_chain): Update.
(ia64_frame_saved_pc, ia64_get_saved_register): Update.
(ia64_frameless_function_invocation): Update.
(ia64_init_extra_frame_info): Update.
(ia64_pop_frame_regular): Update.
* frame.h (struct frame_info): Update comment.
(DEPRECATED_FRAME_INIT_SAVED_REGS): Rename macro.
* frame.c (frame_saved_regs_register_unwind): Update.
(frame_saved_regs_register_unwind): Update.
(deprecated_generic_get_saved_register): Update.
* cris-tdep.c: Update comment.
* config/sparc/tm-sparc.h (DEPRECATED_FRAME_INIT_SAVED_REGS):
Rename macro.
* xstormy16-tdep.c (xstormy16_gdbarch_init): Update.
* x86-64-tdep.c (x86_64_init_abi): Update.
* vax-tdep.c (vax_gdbarch_init): Update.
* v850-tdep.c (v850_gdbarch_init): Update.
* sparc-tdep.c (sparc_gdbarch_init): Update.
* sh-tdep.c (sh_gdbarch_init): Update.
* s390-tdep.c (s390_gdbarch_init): Update.
* rs6000-tdep.c (rs6000_gdbarch_init): Update.
* ppc-linux-tdep.c (ppc_linux_init_abi): Update.
* ns32k-tdep.c (ns32k_gdbarch_init): Update.
* mn10300-tdep.c (mn10300_gdbarch_init): Update.
* mips-tdep.c (mips_gdbarch_init): Update.
* mcore-tdep.c (mcore_gdbarch_init): Update.
* m68k-tdep.c (m68k_gdbarch_init): Update.
* m68hc11-tdep.c (m68hc11_gdbarch_init): Update.
* ia64-tdep.c (ia64_gdbarch_init): Update.
* i386-tdep.c (i386_gdbarch_init): Update.
* frv-tdep.c (frv_gdbarch_init): Update.
* avr-tdep.c (avr_gdbarch_init): Update.
* arm-tdep.c (arm_gdbarch_init): Update.
* alpha-tdep.c (alpha_gdbarch_init): Update.
2003-03-01 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Rename
FRAME_INIT_SAVED_REGS to DEPRECATED_FRAME_INIT_SAVED_REGS.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 47 | ||||
-rw-r--r-- | gdb/alpha-tdep.c | 3 | ||||
-rw-r--r-- | gdb/arm-tdep.c | 1 | ||||
-rw-r--r-- | gdb/avr-tdep.c | 5 | ||||
-rw-r--r-- | gdb/config/sparc/tm-sparc.h | 2 | ||||
-rw-r--r-- | gdb/cris-tdep.c | 9 | ||||
-rw-r--r-- | gdb/doc/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/doc/gdbint.texinfo | 9 | ||||
-rw-r--r-- | gdb/frame.c | 13 | ||||
-rw-r--r-- | gdb/frame.h | 4 | ||||
-rw-r--r-- | gdb/frv-tdep.c | 3 | ||||
-rw-r--r-- | gdb/gdbarch.c | 70 | ||||
-rw-r--r-- | gdb/gdbarch.h | 42 | ||||
-rwxr-xr-x | gdb/gdbarch.sh | 4 | ||||
-rw-r--r-- | gdb/h8300-tdep.c | 2 | ||||
-rw-r--r-- | gdb/i386-tdep.c | 2 | ||||
-rw-r--r-- | gdb/ia64-tdep.c | 17 | ||||
-rw-r--r-- | gdb/m68hc11-tdep.c | 4 | ||||
-rw-r--r-- | gdb/m68k-tdep.c | 2 | ||||
-rw-r--r-- | gdb/mcore-tdep.c | 2 | ||||
-rw-r--r-- | gdb/mips-tdep.c | 4 | ||||
-rw-r--r-- | gdb/mn10300-tdep.c | 2 | ||||
-rw-r--r-- | gdb/ns32k-tdep.c | 4 | ||||
-rw-r--r-- | gdb/ppc-linux-tdep.c | 2 | ||||
-rw-r--r-- | gdb/rs6000-tdep.c | 2 | ||||
-rw-r--r-- | gdb/s390-tdep.c | 2 | ||||
-rw-r--r-- | gdb/sh-tdep.c | 34 | ||||
-rw-r--r-- | gdb/sparc-tdep.c | 2 | ||||
-rw-r--r-- | gdb/stack.c | 4 | ||||
-rw-r--r-- | gdb/v850-tdep.c | 2 | ||||
-rw-r--r-- | gdb/vax-tdep.c | 3 | ||||
-rw-r--r-- | gdb/x86-64-tdep.c | 2 | ||||
-rw-r--r-- | gdb/xstormy16-tdep.c | 2 |
33 files changed, 183 insertions, 130 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec67fe3..d82575c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,52 @@ 2003-03-01 Andrew Cagney <cagney@redhat.com> + * gdbarch.sh (DEPRECATED_FRAME_INIT_SAVED_REGS): Rename + FRAME_INIT_SAVED_REGS. + * gdbarch.h, gdbarch.c: Regenerate. + * stack.c (frame_info): Update. + * sh-tdep.c (sh_find_callers_reg, sh64_get_saved_pr): Update. + (sh_init_extra_frame_info, sh64_init_extra_frame_info): Update. + (sh64_get_saved_register, sh_pop_frame, sh64_pop_frame): Update. + * ns32k-tdep.c (ns32k_pop_frame): Update. + * mips-tdep.c (mips_pop_frame): Update. + * m68hc11-tdep.c (m68hc11_pop_frame): Update. + * ia64-tdep.c (ia64_frame_chain): Update. + (ia64_frame_saved_pc, ia64_get_saved_register): Update. + (ia64_frameless_function_invocation): Update. + (ia64_init_extra_frame_info): Update. + (ia64_pop_frame_regular): Update. + * frame.h (struct frame_info): Update comment. + (DEPRECATED_FRAME_INIT_SAVED_REGS): Rename macro. + * frame.c (frame_saved_regs_register_unwind): Update. + (frame_saved_regs_register_unwind): Update. + (deprecated_generic_get_saved_register): Update. + * cris-tdep.c: Update comment. + * config/sparc/tm-sparc.h (DEPRECATED_FRAME_INIT_SAVED_REGS): + Rename macro. + * xstormy16-tdep.c (xstormy16_gdbarch_init): Update. + * x86-64-tdep.c (x86_64_init_abi): Update. + * vax-tdep.c (vax_gdbarch_init): Update. + * v850-tdep.c (v850_gdbarch_init): Update. + * sparc-tdep.c (sparc_gdbarch_init): Update. + * sh-tdep.c (sh_gdbarch_init): Update. + * s390-tdep.c (s390_gdbarch_init): Update. + * rs6000-tdep.c (rs6000_gdbarch_init): Update. + * ppc-linux-tdep.c (ppc_linux_init_abi): Update. + * ns32k-tdep.c (ns32k_gdbarch_init): Update. + * mn10300-tdep.c (mn10300_gdbarch_init): Update. + * mips-tdep.c (mips_gdbarch_init): Update. + * mcore-tdep.c (mcore_gdbarch_init): Update. + * m68k-tdep.c (m68k_gdbarch_init): Update. + * m68hc11-tdep.c (m68hc11_gdbarch_init): Update. + * ia64-tdep.c (ia64_gdbarch_init): Update. + * i386-tdep.c (i386_gdbarch_init): Update. + * frv-tdep.c (frv_gdbarch_init): Update. + * avr-tdep.c (avr_gdbarch_init): Update. + * arm-tdep.c (arm_gdbarch_init): Update. + * alpha-tdep.c (alpha_gdbarch_init): Update. + +2003-03-01 Andrew Cagney <cagney@redhat.com> + * main.c (captured_main): Add OPT_WINDOWS and OPT_NOWINDOWS to option enum and switch. When no windows, set the interpreter to INTERP_CONSOLE. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index ab647ac..33dd4b8 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -69,7 +69,6 @@ static gdbarch_skip_prologue_ftype alpha_skip_prologue; static gdbarch_saved_pc_after_call_ftype alpha_saved_pc_after_call; static gdbarch_frame_chain_ftype alpha_frame_chain; static gdbarch_frame_saved_pc_ftype alpha_frame_saved_pc; -static gdbarch_frame_init_saved_regs_ftype alpha_frame_init_saved_regs; static gdbarch_push_arguments_ftype alpha_push_arguments; static gdbarch_pop_frame_ftype alpha_pop_frame; @@ -1845,7 +1844,7 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_chain (gdbarch, alpha_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, alpha_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, alpha_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, alpha_frame_init_saved_regs); set_gdbarch_use_struct_convention (gdbarch, alpha_use_struct_convention); set_gdbarch_deprecated_extract_return_value (gdbarch, alpha_extract_return_value); diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 2bbada2..903983d 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -2914,6 +2914,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_locals_address (gdbarch, arm_frame_locals_address); set_gdbarch_frame_num_args (gdbarch, arm_frame_num_args); set_gdbarch_frame_args_skip (gdbarch, 0); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, arm_frame_init_saved_regs); set_gdbarch_frame_init_saved_regs (gdbarch, arm_frame_init_saved_regs); set_gdbarch_pop_frame (gdbarch, arm_pop_frame); diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 52cef67..0438750 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -418,7 +418,8 @@ avr_convert_from_func_ptr_addr (CORE_ADDR addr) return addr * 2; } -/* avr_scan_prologue is also used as the frame_init_saved_regs(). +/* avr_scan_prologue is also used as the + deprecated_frame_init_saved_regs(). Put here the code to store, into fi->saved_regs, the addresses of the saved registers of frame described by FRAME_INFO. This @@ -1187,7 +1188,7 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_use_struct_convention (gdbarch, generic_use_struct_convention); set_gdbarch_store_struct_return (gdbarch, avr_store_struct_return); - set_gdbarch_frame_init_saved_regs (gdbarch, avr_scan_prologue); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, avr_scan_prologue); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, avr_init_extra_frame_info); set_gdbarch_skip_prologue (gdbarch, avr_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h index cbce176..f38252e 100644 --- a/gdb/config/sparc/tm-sparc.h +++ b/gdb/config/sparc/tm-sparc.h @@ -466,7 +466,7 @@ void sparc_get_saved_register (char *raw_buffer, sparc_get_saved_register (RAW_BUFFER, OPTIMIZED, ADDRP, \ FRAME, REGNUM, LVAL) -#define FRAME_INIT_SAVED_REGS(FP) /*no-op */ +#define DEPRECATED_FRAME_INIT_SAVED_REGS(FP) /*no-op */ #define DEPRECATED_INIT_EXTRA_FRAME_INFO(FROMLEAF, FCI) \ sparc_init_extra_frame_info (FROMLEAF, FCI) diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 50792ff..2adef31 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -1146,9 +1146,10 @@ cris_frameless_function_invocation (struct frame_info *fi) return frameless_look_for_prologue (fi); } -/* See frame.h. Determines the address of all registers in the current stack - frame storing each in frame->saved_regs. Space for frame->saved_regs shall - be allocated by FRAME_INIT_SAVED_REGS using frame_saved_regs_zalloc. */ +/* See frame.h. Determines the address of all registers in the + current stack frame storing each in frame->saved_regs. Space for + frame->saved_regs shall be allocated by + DEPRECATED_FRAME_INIT_SAVED_REGS using frame_saved_regs_zalloc. */ void cris_frame_init_saved_regs (struct frame_info *fi) @@ -4291,7 +4292,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) (gdbarch, cris_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, cris_use_struct_convention); - set_gdbarch_frame_init_saved_regs (gdbarch, cris_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, cris_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, cris_init_extra_frame_info); set_gdbarch_skip_prologue (gdbarch, cris_skip_prologue); set_gdbarch_prologue_frameless_p (gdbarch, generic_prologue_frameless_p); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index c55f37d6..909e7f5 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,4 +1,9 @@ -2003-02-26 Andrew Cagney <cagney@redhat.com> +2003-03-01 Andrew Cagney <cagney@redhat.com> + + * gdbint.texinfo (Target Architecture Definition): Rename + FRAME_INIT_SAVED_REGS to DEPRECATED_FRAME_INIT_SAVED_REGS. + +2003-03-01 Andrew Cagney <cagney@redhat.com> * gdbint.texinfo: Rename INIT_EXTRA_FRAME_INFO to DEPRECATED_INIT_EXTRA_FRAME_INFO. diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 6c56029..35acd14 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3252,12 +3252,13 @@ chain pointers, dummy frames, and frames whose PC values are inside the startup file (e.g.@: @file{crt0.o}), inside @code{main}, or inside @code{_start}. -@item FRAME_INIT_SAVED_REGS(@var{frame}) -@findex FRAME_INIT_SAVED_REGS +@item DEPRECATED_FRAME_INIT_SAVED_REGS(@var{frame}) +@findex DEPRECATED_FRAME_INIT_SAVED_REGS See @file{frame.h}. Determines the address of all registers in the current stack frame storing each in @code{frame->saved_regs}. Space for @code{frame->saved_regs} shall be allocated by -@code{FRAME_INIT_SAVED_REGS} using @code{frame_saved_regs_zalloc}. +@code{DEPRECATED_FRAME_INIT_SAVED_REGS} using +@code{frame_saved_regs_zalloc}. @code{FRAME_FIND_SAVED_REGS} and @code{EXTRA_FRAME_INFO} are deprecated. @@ -4096,7 +4097,7 @@ Some mechanisms do not work with multi-arch. They include: @item EXTRA_FRAME_INFO Delete. @item FRAME_FIND_SAVED_REGS -Replaced with @code{FRAME_INIT_SAVED_REGS} +Replaced with @code{DEPRECATED_FRAME_INIT_SAVED_REGS} @end table @noindent diff --git a/gdb/frame.c b/gdb/frame.c index 8fb0cc4..f4e0a14 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -609,12 +609,13 @@ frame_saved_regs_register_unwind (struct frame_info *frame, void **cache, && (get_frame_type (frame) == DUMMY_FRAME))); /* Only (older) architectures that implement the - FRAME_INIT_SAVED_REGS method should be using this function. */ - gdb_assert (FRAME_INIT_SAVED_REGS_P ()); + DEPRECATED_FRAME_INIT_SAVED_REGS method should be using this + function. */ + gdb_assert (DEPRECATED_FRAME_INIT_SAVED_REGS_P ()); /* Load the saved_regs register cache. */ if (get_frame_saved_regs (frame) == NULL) - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); if (get_frame_saved_regs (frame) != NULL && get_frame_saved_regs (frame)[regnum] != 0) @@ -795,7 +796,7 @@ deprecated_generic_get_saved_register (char *raw_buffer, int *optimized, if (!target_has_registers) error ("No registers."); - gdb_assert (FRAME_INIT_SAVED_REGS_P ()); + gdb_assert (DEPRECATED_FRAME_INIT_SAVED_REGS_P ()); /* Normal systems don't optimize out things with register numbers. */ if (optimized != NULL) @@ -831,7 +832,7 @@ deprecated_generic_get_saved_register (char *raw_buffer, int *optimized, return; } - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); if (get_frame_saved_regs (frame) != NULL && get_frame_saved_regs (frame)[regnum] != 0) { @@ -1464,7 +1465,7 @@ deprecated_set_frame_type (struct frame_info *frame, enum frame_type type) #ifdef FRAME_FIND_SAVED_REGS /* XXX - deprecated. This is a compatibility function for targets - that do not yet implement FRAME_INIT_SAVED_REGS. */ + that do not yet implement DEPRECATED_FRAME_INIT_SAVED_REGS. */ /* Find the addresses in which registers are saved in FRAME. */ void diff --git a/gdb/frame.h b/gdb/frame.h index 72dcc61..bd20ba7 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -381,7 +381,7 @@ struct frame_info special, the address here is the sp for the previous frame, not the address where the sp was saved. */ /* Allocated by frame_saved_regs_zalloc () which is called / - initialized by FRAME_INIT_SAVED_REGS(). */ + initialized by DEPRECATED_FRAME_INIT_SAVED_REGS(). */ CORE_ADDR *saved_regs; /*NUM_REGS + NUM_PSEUDO_REGS*/ #ifdef EXTRA_FRAME_INFO @@ -465,7 +465,7 @@ extern void generic_save_dummy_frame_tos (CORE_ADDR sp); #ifdef FRAME_FIND_SAVED_REGS /* XXX - deprecated */ -#define FRAME_INIT_SAVED_REGS(FI) deprecated_get_frame_saved_regs (FI, NULL) +#define DEPRECATED_FRAME_INIT_SAVED_REGS(FI) deprecated_get_frame_saved_regs (FI, NULL) extern void deprecated_get_frame_saved_regs (struct frame_info *, struct frame_saved_regs *); #endif diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index dc1169c..c085b2a 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -38,7 +38,6 @@ static gdbarch_breakpoint_from_pc_ftype frv_breakpoint_from_pc; static gdbarch_frame_chain_ftype frv_frame_chain; static gdbarch_frame_saved_pc_ftype frv_frame_saved_pc; static gdbarch_skip_prologue_ftype frv_skip_prologue; -static gdbarch_frame_init_saved_regs_ftype frv_frame_init_saved_regs; static gdbarch_deprecated_extract_return_value_ftype frv_extract_return_value; static gdbarch_deprecated_extract_struct_value_address_ftype frv_extract_struct_value_address; static gdbarch_use_struct_convention_ftype frv_use_struct_convention; @@ -1084,7 +1083,7 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_chain (gdbarch, frv_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, frv_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, frv_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, frv_frame_init_saved_regs); set_gdbarch_use_struct_convention (gdbarch, frv_use_struct_convention); set_gdbarch_deprecated_extract_return_value (gdbarch, frv_extract_return_value); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 4768152..1dcdb93 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -225,7 +225,7 @@ struct gdbarch gdbarch_extract_struct_value_address_ftype *extract_struct_value_address; gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address; gdbarch_use_struct_convention_ftype *use_struct_convention; - gdbarch_frame_init_saved_regs_ftype *frame_init_saved_regs; + gdbarch_deprecated_frame_init_saved_regs_ftype *deprecated_frame_init_saved_regs; gdbarch_deprecated_init_extra_frame_info_ftype *deprecated_init_extra_frame_info; gdbarch_skip_prologue_ftype *skip_prologue; gdbarch_prologue_frameless_p_ftype *prologue_frameless_p; @@ -736,7 +736,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of extract_struct_value_address, has predicate */ /* Skip verify of deprecated_extract_struct_value_address, has predicate */ /* Skip verify of use_struct_convention, invalid_p == 0 */ - /* Skip verify of frame_init_saved_regs, has predicate */ + /* Skip verify of deprecated_frame_init_saved_regs, has predicate */ /* Skip verify of deprecated_init_extra_frame_info, has predicate */ if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->skip_prologue == 0)) @@ -1170,6 +1170,29 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_extract_struct_value_address /*DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif +#ifdef DEPRECATED_FRAME_INIT_SAVED_REGS_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_FRAME_INIT_SAVED_REGS_P()", + XSTRING (DEPRECATED_FRAME_INIT_SAVED_REGS_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_INIT_SAVED_REGS_P() = %d\n", + DEPRECATED_FRAME_INIT_SAVED_REGS_P ()); +#endif +#ifdef DEPRECATED_FRAME_INIT_SAVED_REGS +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_FRAME_INIT_SAVED_REGS(frame)", + XSTRING (DEPRECATED_FRAME_INIT_SAVED_REGS (frame))); +#endif + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_INIT_SAVED_REGS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_init_saved_regs + /*DEPRECATED_FRAME_INIT_SAVED_REGS ()*/); +#endif #ifdef DEPRECATED_INIT_EXTRA_FRAME_INFO_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1510,29 +1533,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->frame_chain_valid /*FRAME_CHAIN_VALID ()*/); #endif -#ifdef FRAME_INIT_SAVED_REGS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAME_INIT_SAVED_REGS_P()", - XSTRING (FRAME_INIT_SAVED_REGS_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_INIT_SAVED_REGS_P() = %d\n", - FRAME_INIT_SAVED_REGS_P ()); -#endif -#ifdef FRAME_INIT_SAVED_REGS -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAME_INIT_SAVED_REGS(frame)", - XSTRING (FRAME_INIT_SAVED_REGS (frame))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_INIT_SAVED_REGS = <0x%08lx>\n", - (long) current_gdbarch->frame_init_saved_regs - /*FRAME_INIT_SAVED_REGS ()*/); -#endif #ifdef FRAME_LOCALS_ADDRESS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -4457,29 +4457,29 @@ set_gdbarch_use_struct_convention (struct gdbarch *gdbarch, } int -gdbarch_frame_init_saved_regs_p (struct gdbarch *gdbarch) +gdbarch_deprecated_frame_init_saved_regs_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->frame_init_saved_regs != 0; + return gdbarch->deprecated_frame_init_saved_regs != 0; } void -gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame) +gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame) { gdb_assert (gdbarch != NULL); - if (gdbarch->frame_init_saved_regs == 0) + if (gdbarch->deprecated_frame_init_saved_regs == 0) internal_error (__FILE__, __LINE__, - "gdbarch: gdbarch_frame_init_saved_regs invalid"); + "gdbarch: gdbarch_deprecated_frame_init_saved_regs invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_init_saved_regs called\n"); - gdbarch->frame_init_saved_regs (frame); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_init_saved_regs called\n"); + gdbarch->deprecated_frame_init_saved_regs (frame); } void -set_gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, - gdbarch_frame_init_saved_regs_ftype frame_init_saved_regs) +set_gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, + gdbarch_deprecated_frame_init_saved_regs_ftype deprecated_frame_init_saved_regs) { - gdbarch->frame_init_saved_regs = frame_init_saved_regs; + gdbarch->deprecated_frame_init_saved_regs = deprecated_frame_init_saved_regs; } int diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 2629adf..099a7b9 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -62,7 +62,7 @@ extern struct gdbarch *current_gdbarch; #if GDB_MULTI_ARCH #if defined (FRAME_FIND_SAVED_REGS) -#error "FRAME_FIND_SAVED_REGS: replaced by FRAME_INIT_SAVED_REGS" +#error "FRAME_FIND_SAVED_REGS: replaced by DEPRECATED_FRAME_INIT_SAVED_REGS" #endif #endif @@ -1856,40 +1856,40 @@ extern void set_gdbarch_use_struct_convention (struct gdbarch *gdbarch, gdbarch_ #endif #endif -#if defined (FRAME_INIT_SAVED_REGS) -/* Legacy for systems yet to multi-arch FRAME_INIT_SAVED_REGS */ -#if !defined (FRAME_INIT_SAVED_REGS_P) -#define FRAME_INIT_SAVED_REGS_P() (1) +#if defined (DEPRECATED_FRAME_INIT_SAVED_REGS) +/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_INIT_SAVED_REGS */ +#if !defined (DEPRECATED_FRAME_INIT_SAVED_REGS_P) +#define DEPRECATED_FRAME_INIT_SAVED_REGS_P() (1) #endif #endif /* Default predicate for non- multi-arch targets. */ -#if (!GDB_MULTI_ARCH) && !defined (FRAME_INIT_SAVED_REGS_P) -#define FRAME_INIT_SAVED_REGS_P() (0) +#if (!GDB_MULTI_ARCH) && !defined (DEPRECATED_FRAME_INIT_SAVED_REGS_P) +#define DEPRECATED_FRAME_INIT_SAVED_REGS_P() (0) #endif -extern int gdbarch_frame_init_saved_regs_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (FRAME_INIT_SAVED_REGS_P) -#error "Non multi-arch definition of FRAME_INIT_SAVED_REGS" +extern int gdbarch_deprecated_frame_init_saved_regs_p (struct gdbarch *gdbarch); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_INIT_SAVED_REGS_P) +#error "Non multi-arch definition of DEPRECATED_FRAME_INIT_SAVED_REGS" #endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (FRAME_INIT_SAVED_REGS_P) -#define FRAME_INIT_SAVED_REGS_P() (gdbarch_frame_init_saved_regs_p (current_gdbarch)) +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_FRAME_INIT_SAVED_REGS_P) +#define DEPRECATED_FRAME_INIT_SAVED_REGS_P() (gdbarch_deprecated_frame_init_saved_regs_p (current_gdbarch)) #endif /* Default (function) for non- multi-arch platforms. */ -#if (!GDB_MULTI_ARCH) && !defined (FRAME_INIT_SAVED_REGS) -#define FRAME_INIT_SAVED_REGS(frame) (internal_error (__FILE__, __LINE__, "FRAME_INIT_SAVED_REGS"), 0) +#if (!GDB_MULTI_ARCH) && !defined (DEPRECATED_FRAME_INIT_SAVED_REGS) +#define DEPRECATED_FRAME_INIT_SAVED_REGS(frame) (internal_error (__FILE__, __LINE__, "DEPRECATED_FRAME_INIT_SAVED_REGS"), 0) #endif -typedef void (gdbarch_frame_init_saved_regs_ftype) (struct frame_info *frame); -extern void gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame); -extern void set_gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, gdbarch_frame_init_saved_regs_ftype *frame_init_saved_regs); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (FRAME_INIT_SAVED_REGS) -#error "Non multi-arch definition of FRAME_INIT_SAVED_REGS" +typedef void (gdbarch_deprecated_frame_init_saved_regs_ftype) (struct frame_info *frame); +extern void gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame); +extern void set_gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, gdbarch_deprecated_frame_init_saved_regs_ftype *deprecated_frame_init_saved_regs); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_INIT_SAVED_REGS) +#error "Non multi-arch definition of DEPRECATED_FRAME_INIT_SAVED_REGS" #endif #if GDB_MULTI_ARCH -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (FRAME_INIT_SAVED_REGS) -#define FRAME_INIT_SAVED_REGS(frame) (gdbarch_frame_init_saved_regs (current_gdbarch, frame)) +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_FRAME_INIT_SAVED_REGS) +#define DEPRECATED_FRAME_INIT_SAVED_REGS(frame) (gdbarch_deprecated_frame_init_saved_regs (current_gdbarch, frame)) #endif #endif diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 482d588..06e55be 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -572,7 +572,7 @@ F:2:EXTRACT_STRUCT_VALUE_ADDRESS:CORE_ADDR:extract_struct_value_address:struct r F:2:DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS:CORE_ADDR:deprecated_extract_struct_value_address:char *regbuf:regbuf:::0 f:2:USE_STRUCT_CONVENTION:int:use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type:::generic_use_struct_convention::0 # -F:2:FRAME_INIT_SAVED_REGS:void:frame_init_saved_regs:struct frame_info *frame:frame:::0 +F:2:DEPRECATED_FRAME_INIT_SAVED_REGS:void:deprecated_frame_init_saved_regs:struct frame_info *frame:frame:::0 F:2:DEPRECATED_INIT_EXTRA_FRAME_INFO:void:deprecated_init_extra_frame_info:int fromleaf, struct frame_info *frame:fromleaf, frame:::0 # f:2:SKIP_PROLOGUE:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip::0:0 @@ -818,7 +818,7 @@ extern struct gdbarch *current_gdbarch; #if GDB_MULTI_ARCH #if defined (FRAME_FIND_SAVED_REGS) -#error "FRAME_FIND_SAVED_REGS: replaced by FRAME_INIT_SAVED_REGS" +#error "FRAME_FIND_SAVED_REGS: replaced by DEPRECATED_FRAME_INIT_SAVED_REGS" #endif #endif diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index f48e6f4..ee687a5 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1118,8 +1118,8 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* * Frame Info */ + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, h8300_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, h8300_init_extra_frame_info); - set_gdbarch_frame_init_saved_regs (gdbarch, h8300_frame_init_saved_regs); set_gdbarch_frame_chain (gdbarch, h8300_frame_chain); set_gdbarch_saved_pc_after_call (gdbarch, h8300_saved_pc_after_call); set_gdbarch_frame_saved_pc (gdbarch, h8300_frame_saved_pc); diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index c660f9a..c0d272c 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1598,7 +1598,7 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) i386_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, i386_use_struct_convention); - set_gdbarch_frame_init_saved_regs (gdbarch, i386_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, i386_frame_init_saved_regs); set_gdbarch_skip_prologue (gdbarch, i386_skip_prologue); /* Stack grows downward. */ diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 4c6a5ae..f3fb1c9 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -94,7 +94,6 @@ static gdbarch_breakpoint_from_pc_ftype ia64_breakpoint_from_pc; static gdbarch_frame_chain_ftype ia64_frame_chain; static gdbarch_frame_saved_pc_ftype ia64_frame_saved_pc; static gdbarch_skip_prologue_ftype ia64_skip_prologue; -static gdbarch_frame_init_saved_regs_ftype ia64_frame_init_saved_regs; static gdbarch_get_saved_register_ftype ia64_get_saved_register; static gdbarch_deprecated_extract_return_value_ftype ia64_extract_return_value; static gdbarch_deprecated_extract_struct_value_address_ftype ia64_extract_struct_value_address; @@ -710,7 +709,7 @@ ia64_frame_chain (struct frame_info *frame) return get_frame_base (frame); else { - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); if (get_frame_saved_regs (frame)[IA64_VFP_REGNUM]) return read_memory_integer (get_frame_saved_regs (frame)[IA64_VFP_REGNUM], 8); else @@ -731,7 +730,7 @@ ia64_frame_saved_pc (struct frame_info *frame) get_frame_base (frame), pc_regnum); else { - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); if (get_frame_saved_regs (frame)[IA64_VRAP_REGNUM]) return read_memory_integer (get_frame_saved_regs (frame)[IA64_VRAP_REGNUM], 8); @@ -1311,7 +1310,7 @@ ia64_get_saved_register (char *raw_buffer, if (!is_dummy_frame) { - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); gr_addr = get_frame_saved_regs (frame)[ regnum - IA64_NAT0_REGNUM + IA64_GR0_REGNUM]; } @@ -1353,7 +1352,7 @@ ia64_get_saved_register (char *raw_buffer, CORE_ADDR addr = 0; if (!is_dummy_frame) { - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); addr = get_frame_saved_regs (frame)[regnum]; } @@ -1461,7 +1460,7 @@ ia64_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) int ia64_frameless_function_invocation (struct frame_info *frame) { - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); return (get_frame_extra_info (frame)->mem_stack_frame_size == 0); } @@ -1522,7 +1521,7 @@ ia64_init_extra_frame_info (int fromleaf, struct frame_info *frame) { struct frame_info *frn = get_next_frame (frame); - FRAME_INIT_SAVED_REGS (frn); + DEPRECATED_FRAME_INIT_SAVED_REGS (frn); if (get_frame_saved_regs (frn)[IA64_CFM_REGNUM] != 0) cfm = read_memory_integer (get_frame_saved_regs (frn)[IA64_CFM_REGNUM], 8); @@ -1989,7 +1988,7 @@ ia64_pop_frame_regular (struct frame_info *frame) int regno; CORE_ADDR bsp, cfm, pfs; - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); for (regno = 0; regno < ia64_num_regs; regno++) { @@ -2200,7 +2199,7 @@ ia64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_chain (gdbarch, ia64_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, ia64_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, ia64_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, ia64_frame_init_saved_regs); set_gdbarch_get_saved_register (gdbarch, ia64_get_saved_register); set_gdbarch_register_convertible (gdbarch, ia64_register_convertible); diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c index 4527199..fd32532 100644 --- a/gdb/m68hc11-tdep.c +++ b/gdb/m68hc11-tdep.c @@ -442,7 +442,7 @@ m68hc11_pop_frame (void) else { fp = get_frame_base (frame); - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); /* Copy regs from where they were saved in the frame. */ for (regnum = 0; regnum < M68HC11_ALL_REGS; regnum++) @@ -1362,7 +1362,7 @@ m68hc11_gdbarch_init (struct gdbarch_info info, set_gdbarch_fp0_regnum (gdbarch, -1); set_gdbarch_max_register_raw_size (gdbarch, 2); set_gdbarch_max_register_virtual_size (gdbarch, 2); - set_gdbarch_frame_init_saved_regs (gdbarch, m68hc11_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, m68hc11_frame_init_saved_regs); set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_read_pc (gdbarch, generic_target_read_pc); diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 7a262a2..686c206 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1012,7 +1012,7 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_chain (gdbarch, m68k_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, m68k_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, m68k_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, m68k_frame_init_saved_regs); set_gdbarch_frameless_function_invocation (gdbarch, m68k_frameless_function_invocation); /* OK to default this value to 'unknown'. */ diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 20dbb50..5e9baac 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -1138,7 +1138,7 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mcore_init_extra_frame_info); set_gdbarch_frame_chain (gdbarch, mcore_frame_chain); - set_gdbarch_frame_init_saved_regs (gdbarch, mcore_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mcore_frame_init_saved_regs); set_gdbarch_frame_saved_pc (gdbarch, mcore_frame_saved_pc); set_gdbarch_deprecated_store_return_value (gdbarch, mcore_store_return_value); set_gdbarch_deprecated_extract_return_value (gdbarch, diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index fc9f334..5df6205 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -3846,7 +3846,7 @@ mips_pop_frame (void) write_register (PC_REGNUM, FRAME_SAVED_PC (frame)); if (get_frame_saved_regs (frame) == NULL) - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); for (regnum = 0; regnum < NUM_REGS; regnum++) if (regnum != SP_REGNUM && regnum != PC_REGNUM && get_frame_saved_regs (frame)[regnum]) @@ -5982,8 +5982,8 @@ mips_gdbarch_init (struct gdbarch_info info, set_gdbarch_ecoff_reg_to_regnum (gdbarch, mips_ecoff_reg_to_regnum); /* Initialize a frame */ + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mips_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mips_init_extra_frame_info); - set_gdbarch_frame_init_saved_regs (gdbarch, mips_frame_init_saved_regs); /* MIPS version of CALL_DUMMY */ diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 01341ec..ad80ad3 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1169,7 +1169,7 @@ mn10300_gdbarch_init (struct gdbarch_info info, set_gdbarch_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info); set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop); - set_gdbarch_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs); set_gdbarch_frame_chain (gdbarch, mn10300_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, mn10300_frame_saved_pc); set_gdbarch_deprecated_extract_return_value (gdbarch, mn10300_extract_return_value); diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index d58b813..5cd7869 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -429,7 +429,7 @@ ns32k_pop_frame (void) int regnum; fp = get_frame_base (frame); - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); for (regnum = 0; regnum < 8; regnum++) if (get_frame_saved_regs (frame)[regnum]) @@ -578,7 +578,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_address (gdbarch, ns32k_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, ns32k_frame_locals_address); - set_gdbarch_frame_init_saved_regs (gdbarch, ns32k_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, ns32k_frame_init_saved_regs); set_gdbarch_frame_args_skip (gdbarch, 8); diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 508296c..f02581b 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -732,7 +732,7 @@ ppc_linux_init_abi (struct gdbarch_info info, set_gdbarch_frame_chain (gdbarch, ppc_linux_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, ppc_linux_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, ppc_linux_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, ppc_linux_init_extra_frame_info); diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index ca817f8..5225c66 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2940,7 +2940,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_chain (gdbarch, rs6000_frame_chain); set_gdbarch_frame_saved_pc (gdbarch, rs6000_frame_saved_pc); - set_gdbarch_frame_init_saved_regs (gdbarch, rs6000_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, rs6000_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, rs6000_init_extra_frame_info); if (!sysv_abi) diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 7799212..da1c73e 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1809,7 +1809,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_frame_args_address (gdbarch, s390_frame_args_address); set_gdbarch_frame_chain (gdbarch, s390_frame_chain); - set_gdbarch_frame_init_saved_regs (gdbarch, s390_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, s390_frame_init_saved_regs); set_gdbarch_frame_locals_address (gdbarch, s390_frame_args_address); /* We can't do this */ set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index b08c558..0f8da62 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1029,7 +1029,7 @@ sh_find_callers_reg (struct frame_info *fi, int regnum) get_frame_base (fi), regnum); else { - FRAME_INIT_SAVED_REGS (fi); + DEPRECATED_FRAME_INIT_SAVED_REGS (fi); if (!get_frame_pc (fi)) return 0; if (get_frame_saved_regs (fi)[regnum] != 0) @@ -1053,7 +1053,7 @@ sh64_get_saved_pr (struct frame_info *fi, int pr_regnum) get_frame_base (fi), pr_regnum); else { - FRAME_INIT_SAVED_REGS (fi); + DEPRECATED_FRAME_INIT_SAVED_REGS (fi); if (!get_frame_pc (fi)) return 0; @@ -1776,7 +1776,7 @@ sh_init_extra_frame_info (int fromleaf, struct frame_info *fi) } else { - FRAME_INIT_SAVED_REGS (fi); + DEPRECATED_FRAME_INIT_SAVED_REGS (fi); get_frame_extra_info (fi)->return_pc = sh_find_callers_reg (fi, gdbarch_tdep (current_gdbarch)->PR_REGNUM); } @@ -1807,7 +1807,7 @@ sh64_init_extra_frame_info (int fromleaf, struct frame_info *fi) } else { - FRAME_INIT_SAVED_REGS (fi); + DEPRECATED_FRAME_INIT_SAVED_REGS (fi); get_frame_extra_info (fi)->return_pc = sh64_get_saved_pr (fi, gdbarch_tdep (current_gdbarch)->PR_REGNUM); } @@ -1864,7 +1864,7 @@ sh64_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, return; } - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); if (get_frame_saved_regs (frame) != NULL && get_frame_saved_regs (frame)[regnum] != 0) { @@ -1953,7 +1953,7 @@ sh_pop_frame (void) else { fp = get_frame_base (frame); - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); /* Copy regs from where they were saved in the frame */ for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) @@ -1985,7 +1985,7 @@ sh64_pop_frame (void) else { fp = get_frame_base (frame); - FRAME_INIT_SAVED_REGS (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); /* Copy regs from where they were saved in the frame */ for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) @@ -4392,7 +4392,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh_generic_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4402,7 +4402,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh_generic_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4412,7 +4412,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh2e_show_regs; sh_store_return_value = sh3e_sh4_store_return_value; sh_register_virtual_type = sh_sh3e_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4426,7 +4426,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh_dsp_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4451,7 +4451,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh3_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4463,7 +4463,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh3e_show_regs; sh_store_return_value = sh3e_sh4_store_return_value; sh_register_virtual_type = sh_sh3e_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_fp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_fp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4480,7 +4480,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh3_dsp_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); @@ -4506,7 +4506,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh4_show_regs; sh_store_return_value = sh3e_sh4_store_return_value; sh_register_virtual_type = sh_sh4_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_fp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_fp_frame_init_saved_regs); set_gdbarch_deprecated_extract_return_value (gdbarch, sh3e_sh4_extract_return_value); set_gdbarch_fp0_regnum (gdbarch, 25); set_gdbarch_register_raw_size (gdbarch, sh_sh4_register_raw_size); @@ -4611,7 +4611,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_pseudo_register_write (gdbarch, sh64_pseudo_register_write); set_gdbarch_deprecated_do_registers_info (gdbarch, sh64_do_registers_info); - set_gdbarch_frame_init_saved_regs (gdbarch, sh64_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh64_nofp_frame_init_saved_regs); set_gdbarch_breakpoint_from_pc (gdbarch, sh_sh64_breakpoint_from_pc); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, sh64_init_extra_frame_info); set_gdbarch_frame_chain (gdbarch, sh64_frame_chain); @@ -4630,7 +4630,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) sh_show_regs = sh_generic_show_regs; sh_store_return_value = sh_default_store_return_value; sh_register_virtual_type = sh_default_register_virtual_type; - set_gdbarch_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sh_nofp_frame_init_saved_regs); set_gdbarch_register_raw_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_virtual_size (gdbarch, sh_default_register_raw_size); set_gdbarch_register_byte (gdbarch, sh_default_register_byte); diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index 634a9fb..5d39f38 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -3145,7 +3145,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_fp_regnum (gdbarch, SPARC_FP_REGNUM); set_gdbarch_fp0_regnum (gdbarch, SPARC_FP0_REGNUM); set_gdbarch_frame_chain (gdbarch, sparc_frame_chain); - set_gdbarch_frame_init_saved_regs (gdbarch, sparc_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, sparc_frame_init_saved_regs); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_frame_saved_pc (gdbarch, sparc_frame_saved_pc); set_gdbarch_frameless_function_invocation (gdbarch, diff --git a/gdb/stack.c b/gdb/stack.c index d96f46b..3eab979 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -782,9 +782,9 @@ frame_info (char *addr_exp, int from_tty) } } - if (FRAME_INIT_SAVED_REGS_P () + if (DEPRECATED_FRAME_INIT_SAVED_REGS_P () && get_frame_saved_regs (fi) == NULL) - FRAME_INIT_SAVED_REGS (fi); + DEPRECATED_FRAME_INIT_SAVED_REGS (fi); /* Print as much information as possible on the location of all the registers. */ { diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index aa8fe9b..269c165 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1242,8 +1242,8 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* * Frame Info */ + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, v850_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, v850_init_extra_frame_info); - set_gdbarch_frame_init_saved_regs (gdbarch, v850_frame_init_saved_regs); set_gdbarch_frame_chain (gdbarch, v850_frame_chain); set_gdbarch_saved_pc_after_call (gdbarch, v850_saved_pc_after_call); set_gdbarch_frame_saved_pc (gdbarch, v850_frame_saved_pc); diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index a88c570..ebc3d5a 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -46,7 +46,6 @@ static gdbarch_frame_chain_ftype vax_frame_chain; static gdbarch_frame_saved_pc_ftype vax_frame_saved_pc; static gdbarch_frame_args_address_ftype vax_frame_args_address; static gdbarch_frame_locals_address_ftype vax_frame_locals_address; -static gdbarch_frame_init_saved_regs_ftype vax_frame_init_saved_regs; static gdbarch_store_struct_return_ftype vax_store_struct_return; static gdbarch_deprecated_extract_return_value_ftype vax_extract_return_value; @@ -656,7 +655,7 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_address (gdbarch, vax_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, vax_frame_locals_address); - set_gdbarch_frame_init_saved_regs (gdbarch, vax_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, vax_frame_init_saved_regs); set_gdbarch_frame_args_skip (gdbarch, 4); diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c index 9bb96e6..5ba1da2 100644 --- a/gdb/x86-64-tdep.c +++ b/gdb/x86-64-tdep.c @@ -991,7 +991,7 @@ x86_64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_extract_struct_value_address (gdbarch, NULL); set_gdbarch_use_struct_convention (gdbarch, x86_64_use_struct_convention); - set_gdbarch_frame_init_saved_regs (gdbarch, x86_64_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, x86_64_frame_init_saved_regs); set_gdbarch_skip_prologue (gdbarch, x86_64_skip_prologue); set_gdbarch_frame_chain (gdbarch, x86_64_linux_frame_chain); diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index b549759..e572771 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1055,7 +1055,7 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) */ set_gdbarch_deprecated_init_extra_frame_info (gdbarch, xstormy16_init_extra_frame_info); - set_gdbarch_frame_init_saved_regs (gdbarch, + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, xstormy16_frame_init_saved_regs); set_gdbarch_frame_chain (gdbarch, xstormy16_frame_chain); set_gdbarch_get_saved_register (gdbarch, xstormy16_get_saved_register); |