2003-03-12 Andrew Cagney * gdbarch.sh (DEPRECATED_POP_FRAME): Replace POP_FRAME. * gdbarch.h, gdbarch.c: Regenerate. * valops.c (hand_function_call): Update comment. * stack.c (return_command): Update comment. * config/sparc/tm-sparc.h (DEPRECATED_POP_FRAME): Update. * config/pa/tm-hppa.h (DEPRECATED_POP_FRAME): Update. * 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. * 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. * hppa-tdep.c (hppa_gdbarch_init): Update. * h8300-tdep.c (h8300_gdbarch_init): Update. * frv-tdep.c (frv_gdbarch_init): Update. * cris-tdep.c (cris_gdbarch_init): Update. * avr-tdep.c (avr_gdbarch_init): Update. * arm-tdep.c (arm_gdbarch_init): Update. * alpha-tdep.c (alpha_gdbarch_init): Update. Index: doc/ChangeLog 2003-03-12 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Replace POP_FRAME with DEPRECATED_POP_FRAME. Update description. Index: alpha-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/alpha-tdep.c,v retrieving revision 1.66 diff -u -r1.66 alpha-tdep.c --- alpha-tdep.c 12 Mar 2003 16:50:42 -0000 1.66 +++ alpha-tdep.c 12 Mar 2003 18:21:02 -0000 @@ -70,7 +70,6 @@ static gdbarch_frame_chain_ftype alpha_frame_chain; static gdbarch_push_arguments_ftype alpha_push_arguments; -static gdbarch_pop_frame_ftype alpha_pop_frame; static gdbarch_fix_call_dummy_ftype alpha_fix_call_dummy; static gdbarch_get_longjmp_target_ftype alpha_get_longjmp_target; @@ -1857,7 +1856,7 @@ set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0); set_gdbarch_call_dummy_length (gdbarch, 0); set_gdbarch_push_arguments (gdbarch, alpha_push_arguments); - set_gdbarch_pop_frame (gdbarch, alpha_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, alpha_pop_frame); /* On the Alpha, the call dummy code is never copied to user space, stopping the user call is achieved via a bp_call_dummy breakpoint. Index: arm-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/arm-tdep.c,v retrieving revision 1.106 diff -u -r1.106 arm-tdep.c --- arm-tdep.c 12 Mar 2003 16:50:43 -0000 1.106 +++ arm-tdep.c 12 Mar 2003 18:21:03 -0000 @@ -2915,7 +2915,7 @@ 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_pop_frame (gdbarch, arm_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, arm_pop_frame); /* Address manipulation. */ set_gdbarch_smash_text_address (gdbarch, arm_smash_text_address); Index: avr-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/avr-tdep.c,v retrieving revision 1.30 diff -u -r1.30 avr-tdep.c --- avr-tdep.c 12 Mar 2003 16:50:43 -0000 1.30 +++ avr-tdep.c 12 Mar 2003 18:21:03 -0000 @@ -1183,7 +1183,7 @@ set_gdbarch_pointer_to_address (gdbarch, avr_pointer_to_address); set_gdbarch_push_arguments (gdbarch, avr_push_arguments); set_gdbarch_push_return_address (gdbarch, avr_push_return_address); - set_gdbarch_pop_frame (gdbarch, avr_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, avr_pop_frame); set_gdbarch_use_struct_convention (gdbarch, generic_use_struct_convention); set_gdbarch_store_struct_return (gdbarch, avr_store_struct_return); Index: cris-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/cris-tdep.c,v retrieving revision 1.51 diff -u -r1.51 cris-tdep.c --- cris-tdep.c 12 Mar 2003 16:50:43 -0000 1.51 +++ cris-tdep.c 12 Mar 2003 18:21:03 -0000 @@ -4285,7 +4285,7 @@ set_gdbarch_register_convertible (gdbarch, generic_register_convertible_not); set_gdbarch_push_return_address (gdbarch, cris_push_return_address); - set_gdbarch_pop_frame (gdbarch, cris_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, cris_pop_frame); set_gdbarch_store_struct_return (gdbarch, cris_store_struct_return); set_gdbarch_deprecated_extract_struct_value_address Index: frame.c =================================================================== RCS file: /cvs/src/src/gdb/frame.c,v retrieving revision 1.78 diff -u -r1.78 frame.c --- frame.c 12 Mar 2003 16:50:43 -0000 1.78 +++ frame.c 12 Mar 2003 18:21:03 -0000 @@ -198,12 +198,12 @@ struct regcache *scratch_regcache; struct cleanup *cleanups; - if (POP_FRAME_P ()) + if (DEPRECATED_POP_FRAME_P ()) { /* A legacy architecture that has implemented a custom pop function. All new architectures should instead be using the generic code below. */ - POP_FRAME; + DEPRECATED_POP_FRAME; } else { Index: frv-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/frv-tdep.c,v retrieving revision 1.19 diff -u -r1.19 frv-tdep.c --- frv-tdep.c 12 Mar 2003 16:50:43 -0000 1.19 +++ frv-tdep.c 12 Mar 2003 18:21:03 -0000 @@ -45,7 +45,6 @@ static gdbarch_store_struct_return_ftype frv_store_struct_return; static gdbarch_push_arguments_ftype frv_push_arguments; static gdbarch_push_return_address_ftype frv_push_return_address; -static gdbarch_pop_frame_ftype frv_pop_frame; static gdbarch_saved_pc_after_call_ftype frv_saved_pc_after_call; static void frv_pop_frame_regular (struct frame_info *frame); @@ -1095,7 +1094,7 @@ set_gdbarch_call_dummy_length (gdbarch, 0); set_gdbarch_push_arguments (gdbarch, frv_push_arguments); set_gdbarch_push_return_address (gdbarch, frv_push_return_address); - set_gdbarch_pop_frame (gdbarch, frv_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, frv_pop_frame); set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_words (gdbarch, frv_call_dummy_words); Index: gdbarch.sh =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.sh,v retrieving revision 1.204 diff -u -r1.204 gdbarch.sh --- gdbarch.sh 12 Mar 2003 16:50:43 -0000 1.204 +++ gdbarch.sh 12 Mar 2003 18:21:04 -0000 @@ -559,7 +559,7 @@ f:2:PUSH_ARGUMENTS:CORE_ADDR:push_arguments:int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:nargs, args, sp, struct_return, struct_addr:::default_push_arguments::0 F:2:DEPRECATED_PUSH_DUMMY_FRAME:void:deprecated_push_dummy_frame:void:-:::0 F:2:PUSH_RETURN_ADDRESS:CORE_ADDR:push_return_address:CORE_ADDR pc, CORE_ADDR sp:pc, sp:::0 -F:2:POP_FRAME:void:pop_frame:void:-:::0 +F:2:DEPRECATED_POP_FRAME:void:deprecated_pop_frame:void:-:::0 # f:2:STORE_STRUCT_RETURN:void:store_struct_return:CORE_ADDR addr, CORE_ADDR sp:addr, sp:::0 # Index: h8300-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/h8300-tdep.c,v retrieving revision 1.41 diff -u -r1.41 h8300-tdep.c --- h8300-tdep.c 12 Mar 2003 16:50:44 -0000 1.41 +++ h8300-tdep.c 12 Mar 2003 18:21:04 -0000 @@ -1151,7 +1151,7 @@ set_gdbarch_push_return_address (gdbarch, h8300_push_return_address); set_gdbarch_deprecated_extract_return_value (gdbarch, h8300_extract_return_value); set_gdbarch_push_arguments (gdbarch, h8300_push_arguments); - set_gdbarch_pop_frame (gdbarch, h8300_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, h8300_pop_frame); set_gdbarch_store_struct_return (gdbarch, h8300_store_struct_return); set_gdbarch_deprecated_store_return_value (gdbarch, h8300_store_return_value); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, h8300_extract_struct_value_address); Index: hppa-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/hppa-tdep.c,v retrieving revision 1.54 diff -u -r1.54 hppa-tdep.c --- hppa-tdep.c 12 Mar 2003 16:50:44 -0000 1.54 +++ hppa-tdep.c 12 Mar 2003 18:21:04 -0000 @@ -5017,7 +5017,7 @@ set_gdbarch_frame_num_args (gdbarch, hppa_frame_num_args); set_gdbarch_frame_args_skip (gdbarch, 0); /* set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); */ - set_gdbarch_pop_frame (gdbarch, hppa_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, hppa_pop_frame); set_gdbarch_call_dummy_length (gdbarch, INSTRUCTION_SIZE * 28); set_gdbarch_call_dummy_start_offset (gdbarch, 0); /* set_gdbarch_fix_call_dummy (gdbarch, hppa_fix_call_dummy); */ Index: i386-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/i386-tdep.c,v retrieving revision 1.117 diff -u -r1.117 i386-tdep.c --- i386-tdep.c 12 Mar 2003 16:50:44 -0000 1.117 +++ i386-tdep.c 12 Mar 2003 18:21:04 -0000 @@ -1591,7 +1591,7 @@ set_gdbarch_extract_return_value (gdbarch, i386_extract_return_value); set_gdbarch_push_arguments (gdbarch, i386_push_arguments); set_gdbarch_push_return_address (gdbarch, i386_push_return_address); - set_gdbarch_pop_frame (gdbarch, i386_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, i386_pop_frame); set_gdbarch_store_struct_return (gdbarch, i386_store_struct_return); set_gdbarch_store_return_value (gdbarch, i386_store_return_value); set_gdbarch_extract_struct_value_address (gdbarch, Index: ia64-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/ia64-tdep.c,v retrieving revision 1.53 diff -u -r1.53 ia64-tdep.c --- ia64-tdep.c 12 Mar 2003 16:50:44 -0000 1.53 +++ ia64-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -101,7 +101,6 @@ static gdbarch_store_struct_return_ftype ia64_store_struct_return; static gdbarch_push_arguments_ftype ia64_push_arguments; static gdbarch_push_return_address_ftype ia64_push_return_address; -static gdbarch_pop_frame_ftype ia64_pop_frame; static gdbarch_saved_pc_after_call_ftype ia64_saved_pc_after_call; static void ia64_pop_frame_regular (struct frame_info *frame); static struct type *is_float_or_hfa_type (struct type *t); @@ -2222,7 +2221,7 @@ set_gdbarch_call_dummy_length (gdbarch, 0); set_gdbarch_push_arguments (gdbarch, ia64_push_arguments); set_gdbarch_push_return_address (gdbarch, ia64_push_return_address); - set_gdbarch_pop_frame (gdbarch, ia64_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, ia64_pop_frame); set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_words (gdbarch, ia64_call_dummy_words); Index: m68hc11-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/m68hc11-tdep.c,v retrieving revision 1.50 diff -u -r1.50 m68hc11-tdep.c --- m68hc11-tdep.c 12 Mar 2003 16:50:44 -0000 1.50 +++ m68hc11-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -1418,7 +1418,7 @@ (gdbarch, m68hc11_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, m68hc11_use_struct_convention); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, m68hc11_init_extra_frame_info); - set_gdbarch_pop_frame (gdbarch, m68hc11_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, m68hc11_pop_frame); set_gdbarch_skip_prologue (gdbarch, m68hc11_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); set_gdbarch_decr_pc_after_break (gdbarch, 0); Index: m68k-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/m68k-tdep.c,v retrieving revision 1.46 diff -u -r1.46 m68k-tdep.c --- m68k-tdep.c 12 Mar 2003 16:50:44 -0000 1.46 +++ m68k-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -1051,7 +1051,7 @@ set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_fix_call_dummy (gdbarch, m68k_fix_call_dummy); set_gdbarch_deprecated_push_dummy_frame (gdbarch, m68k_push_dummy_frame); - set_gdbarch_pop_frame (gdbarch, m68k_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, m68k_pop_frame); return gdbarch; } Index: mcore-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mcore-tdep.c,v retrieving revision 1.43 diff -u -r1.43 mcore-tdep.c --- mcore-tdep.c 12 Mar 2003 16:50:45 -0000 1.43 +++ mcore-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -1151,7 +1151,7 @@ set_gdbarch_frame_args_address (gdbarch, mcore_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, mcore_frame_locals_address); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); - set_gdbarch_pop_frame (gdbarch, mcore_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, mcore_pop_frame); set_gdbarch_virtual_frame_pointer (gdbarch, mcore_virtual_frame_pointer); /* Misc.: */ Index: mips-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mips-tdep.c,v retrieving revision 1.170 diff -u -r1.170 mips-tdep.c --- mips-tdep.c 12 Mar 2003 16:50:45 -0000 1.170 +++ mips-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -6007,7 +6007,7 @@ set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_call_dummy_address (gdbarch, mips_call_dummy_address); set_gdbarch_push_return_address (gdbarch, mips_push_return_address); - set_gdbarch_pop_frame (gdbarch, mips_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, mips_pop_frame); set_gdbarch_call_dummy_start_offset (gdbarch, 0); set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); Index: mn10300-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mn10300-tdep.c,v retrieving revision 1.58 diff -u -r1.58 mn10300-tdep.c --- mn10300-tdep.c 12 Mar 2003 16:50:45 -0000 1.58 +++ mn10300-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -1177,7 +1177,7 @@ (gdbarch, mn10300_extract_struct_value_address); set_gdbarch_deprecated_store_return_value (gdbarch, mn10300_store_return_value); set_gdbarch_store_struct_return (gdbarch, mn10300_store_struct_return); - set_gdbarch_pop_frame (gdbarch, mn10300_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, mn10300_pop_frame); set_gdbarch_skip_prologue (gdbarch, mn10300_skip_prologue); set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); Index: ns32k-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/ns32k-tdep.c,v retrieving revision 1.35 diff -u -r1.35 ns32k-tdep.c --- ns32k-tdep.c 12 Mar 2003 16:50:45 -0000 1.35 +++ ns32k-tdep.c 12 Mar 2003 18:21:05 -0000 @@ -593,7 +593,7 @@ /* Call dummy info */ set_gdbarch_deprecated_push_dummy_frame (gdbarch, ns32k_push_dummy_frame); - set_gdbarch_pop_frame (gdbarch, ns32k_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, ns32k_pop_frame); set_gdbarch_call_dummy_location (gdbarch, ON_STACK); set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_words (gdbarch, ns32k_call_dummy_words); Index: rs6000-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v retrieving revision 1.110 diff -u -r1.110 rs6000-tdep.c --- rs6000-tdep.c 12 Mar 2003 16:50:45 -0000 1.110 +++ rs6000-tdep.c 12 Mar 2003 18:21:06 -0000 @@ -2917,7 +2917,7 @@ set_gdbarch_store_struct_return (gdbarch, rs6000_store_struct_return); set_gdbarch_extract_struct_value_address (gdbarch, rs6000_extract_struct_value_address); - set_gdbarch_pop_frame (gdbarch, rs6000_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, rs6000_pop_frame); set_gdbarch_skip_prologue (gdbarch, rs6000_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); Index: s390-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/s390-tdep.c,v retrieving revision 1.76 diff -u -r1.76 s390-tdep.c --- s390-tdep.c 12 Mar 2003 16:50:45 -0000 1.76 +++ s390-tdep.c 12 Mar 2003 18:21:06 -0000 @@ -1820,7 +1820,7 @@ This is often the number of bytes in BREAKPOINT but not always. */ set_gdbarch_decr_pc_after_break (gdbarch, 2); - set_gdbarch_pop_frame (gdbarch, s390_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, s390_pop_frame); /* Stack grows downward. */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); /* Offset from address of function to start of its code. Index: sh-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sh-tdep.c,v retrieving revision 1.101 diff -u -r1.101 sh-tdep.c --- sh-tdep.c 12 Mar 2003 16:50:45 -0000 1.101 +++ sh-tdep.c 12 Mar 2003 18:21:06 -0000 @@ -4379,7 +4379,7 @@ set_gdbarch_store_struct_return (gdbarch, sh_store_struct_return); set_gdbarch_use_struct_convention (gdbarch, sh_use_struct_convention); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, sh_extract_struct_value_address); - set_gdbarch_pop_frame (gdbarch, sh_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, sh_pop_frame); set_gdbarch_print_insn (gdbarch, gdb_print_insn_sh); set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno); skip_prologue_hard_way = sh_skip_prologue_hard_way; @@ -4621,7 +4621,7 @@ /*set_gdbarch_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_pop_frame (gdbarch, sh64_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, sh64_pop_frame); set_gdbarch_elf_make_msymbol_special (gdbarch, sh64_elf_make_msymbol_special); break; Index: sparc-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sparc-tdep.c,v retrieving revision 1.70 diff -u -r1.70 sparc-tdep.c --- sparc-tdep.c 12 Mar 2003 16:50:45 -0000 1.70 +++ sparc-tdep.c 12 Mar 2003 18:21:06 -0000 @@ -3158,7 +3158,7 @@ set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_deprecated_max_register_raw_size (gdbarch, 8); set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 8); - set_gdbarch_pop_frame (gdbarch, sparc_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, sparc_pop_frame); set_gdbarch_push_return_address (gdbarch, sparc_push_return_address); set_gdbarch_deprecated_push_dummy_frame (gdbarch, sparc_push_dummy_frame); set_gdbarch_read_pc (gdbarch, generic_target_read_pc); Index: stack.c =================================================================== RCS file: /cvs/src/src/gdb/stack.c,v retrieving revision 1.70 diff -u -r1.70 stack.c --- stack.c 2 Mar 2003 04:02:24 -0000 1.70 +++ stack.c 12 Mar 2003 18:21:06 -0000 @@ -1639,9 +1639,13 @@ that. */ /* Do the real work. Pop until the specified frame is current. We - use this method because the deprecated_selected_frame is not valid after - a POP_FRAME. The pc comparison makes this work even if the - selected frame shares its fp with another frame. */ + use this method because the deprecated_selected_frame is not + valid after a frame_pop(). The pc comparison makes this work + even if the selected frame shares its fp with another frame. */ + + /* FIXME: cagney/32003-03-12: This code should use frame_id_eq(). + Unfortunatly, that function doesn't yet include the PC in any + frame ID comparison. */ while (selected_frame_addr != get_frame_base (frame = get_current_frame ()) || selected_frame_pc != get_frame_pc (frame)) Index: v850-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/v850-tdep.c,v retrieving revision 1.42 diff -u -r1.42 v850-tdep.c --- v850-tdep.c 12 Mar 2003 16:50:45 -0000 1.42 +++ v850-tdep.c 12 Mar 2003 18:21:06 -0000 @@ -1271,7 +1271,7 @@ set_gdbarch_push_return_address (gdbarch, v850_push_return_address); set_gdbarch_deprecated_extract_return_value (gdbarch, v850_extract_return_value); set_gdbarch_push_arguments (gdbarch, v850_push_arguments); - set_gdbarch_pop_frame (gdbarch, v850_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, v850_pop_frame); set_gdbarch_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); Index: valops.c =================================================================== RCS file: /cvs/src/src/gdb/valops.c,v retrieving revision 1.93 diff -u -r1.93 valops.c --- valops.c 27 Feb 2003 17:48:47 -0000 1.93 +++ valops.c 12 Mar 2003 18:21:07 -0000 @@ -1303,7 +1303,7 @@ if (DEPRECATED_PUSH_DUMMY_FRAME_P ()) { /* DEPRECATED_PUSH_DUMMY_FRAME is responsible for saving the - inferior registers (and POP_FRAME for restoring them). (At + inferior registers (and frame_pop() for restoring them). (At least on most machines) they are saved on the stack in the inferior. */ DEPRECATED_PUSH_DUMMY_FRAME; Index: vax-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/vax-tdep.c,v retrieving revision 1.36 diff -u -r1.36 vax-tdep.c --- vax-tdep.c 12 Mar 2003 16:50:45 -0000 1.36 +++ vax-tdep.c 12 Mar 2003 18:21:07 -0000 @@ -52,7 +52,6 @@ vax_extract_struct_value_address; static gdbarch_deprecated_push_dummy_frame_ftype vax_push_dummy_frame; -static gdbarch_pop_frame_ftype vax_pop_frame; static gdbarch_fix_call_dummy_ftype vax_fix_call_dummy; /* Return 1 if P points to an invalid floating point value. @@ -668,7 +667,7 @@ /* Call dummy info */ set_gdbarch_deprecated_push_dummy_frame (gdbarch, vax_push_dummy_frame); - set_gdbarch_pop_frame (gdbarch, vax_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, vax_pop_frame); set_gdbarch_call_dummy_location (gdbarch, ON_STACK); set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_words (gdbarch, vax_call_dummy_words); Index: x86-64-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/x86-64-tdep.c,v retrieving revision 1.54 diff -u -r1.54 x86-64-tdep.c --- x86-64-tdep.c 12 Mar 2003 16:50:45 -0000 1.54 +++ x86-64-tdep.c 12 Mar 2003 18:21:07 -0000 @@ -1015,7 +1015,7 @@ set_gdbarch_push_arguments (gdbarch, x86_64_push_arguments); set_gdbarch_push_return_address (gdbarch, x86_64_push_return_address); - set_gdbarch_pop_frame (gdbarch, x86_64_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, x86_64_pop_frame); set_gdbarch_store_struct_return (gdbarch, x86_64_store_struct_return); set_gdbarch_store_return_value (gdbarch, x86_64_store_return_value); /* Override, since this is handled by x86_64_extract_return_value. */ Index: xstormy16-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v retrieving revision 1.28 diff -u -r1.28 xstormy16-tdep.c --- xstormy16-tdep.c 12 Mar 2003 16:50:46 -0000 1.28 +++ xstormy16-tdep.c 12 Mar 2003 18:21:07 -0000 @@ -1089,7 +1089,7 @@ set_gdbarch_push_return_address (gdbarch, xstormy16_push_return_address); set_gdbarch_deprecated_extract_return_value (gdbarch, xstormy16_extract_return_value); set_gdbarch_push_arguments (gdbarch, xstormy16_push_arguments); - set_gdbarch_pop_frame (gdbarch, xstormy16_pop_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, xstormy16_pop_frame); set_gdbarch_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); Index: config/pa/tm-hppa.h =================================================================== RCS file: /cvs/src/src/gdb/config/pa/tm-hppa.h,v retrieving revision 1.35 diff -u -r1.35 tm-hppa.h --- config/pa/tm-hppa.h 12 Mar 2003 16:50:46 -0000 1.35 +++ config/pa/tm-hppa.h 12 Mar 2003 18:21:07 -0000 @@ -463,7 +463,7 @@ /* Discard from the stack the innermost frame, restoring all saved registers. */ #if !GDB_MULTI_ARCH -#define POP_FRAME hppa_pop_frame () +#define DEPRECATED_POP_FRAME hppa_pop_frame () extern void hppa_pop_frame (void); #endif Index: config/sparc/tm-sparc.h =================================================================== RCS file: /cvs/src/src/gdb/config/sparc/tm-sparc.h,v retrieving revision 1.36 diff -u -r1.36 tm-sparc.h --- config/sparc/tm-sparc.h 12 Mar 2003 16:50:47 -0000 1.36 +++ config/sparc/tm-sparc.h 12 Mar 2003 18:21:07 -0000 @@ -683,7 +683,7 @@ /* Push an empty stack frame, to record the current PC, etc. */ #define DEPRECATED_PUSH_DUMMY_FRAME sparc_push_dummy_frame () -#define POP_FRAME sparc_pop_frame () +#define DEPRECATED_POP_FRAME sparc_pop_frame () void sparc_push_dummy_frame (void); void sparc_pop_frame (void); Index: doc/gdbint.texinfo =================================================================== RCS file: /cvs/src/src/gdb/doc/gdbint.texinfo,v retrieving revision 1.129 diff -u -r1.129 gdbint.texinfo --- doc/gdbint.texinfo 12 Mar 2003 16:50:47 -0000 1.129 +++ doc/gdbint.texinfo 12 Mar 2003 18:21:08 -0000 @@ -3680,12 +3680,11 @@ If defined, this is the number of the processor status register. (This definition is only used in generic code when parsing "$ps".) -@item POP_FRAME -@findex POP_FRAME -@findex call_function_by_hand -@findex return_command -Used in @samp{call_function_by_hand} to remove an artificial stack -frame and in @samp{return_command} to remove a real stack frame. +@item DEPRECATED_POP_FRAME +@findex DEPRECATED_POP_FRAME +@findex frame_pop +If defined, used by @code{frame_pop} to remove a stack frame. This +method has been superseeded by generic code. @item PUSH_ARGUMENTS (@var{nargs}, @var{args}, @var{sp}, @var{struct_return}, @var{struct_addr}) @findex PUSH_ARGUMENTS