From 331ae7edef62361ede14f99995e83d6ff8f4b698 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 3 Aug 2004 03:52:01 +0000 Subject: [PATCH] 2004-08-02 Andrew Cagney * gdbarch.sh (deprecated_target_read_fp) (deprecated_frame_locals_address, deprecated_frame_args_address) (deprecated_frame_chain_valid, deprecated_frame_chain) (deprecated_init_extra_frame_info, deprecated_pop_frame) (deprecated_frame_init_saved_regs, deprecated_get_saved_register) (deprecated_do_registers_info, deprecated_init_frame_pc): Delete. * gdbarch.h, gdbarch.c: Re-generate. * regcache.c (deprecated_read_fp): Do not call DEPRECATED_TARGET_READ_FP_P. * infcmd.c (default_print_registers_info): Do not call DEPRECATED_DO_REGISTERS_INFO. * frame-base.c (default_frame_locals_address): Do not call DEPRECATED_FRAME_LOCALS_ADDRESS. (default_frame_args_address): Do not call DEPRECATED_FRAME_ARGS_ADDRESS. --- gdb/ChangeLog | 18 +- gdb/frame-base.c | 12 -- gdb/gdbarch.c | 499 ------------------------------------------------------- gdb/gdbarch.h | 281 ------------------------------- gdb/gdbarch.sh | 15 -- gdb/infcmd.c | 6 - gdb/regcache.c | 4 +- 7 files changed, 17 insertions(+), 818 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a04e8ed..5162fcd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,21 @@ 2004-08-02 Andrew Cagney + * gdbarch.sh (deprecated_target_read_fp) + (deprecated_frame_locals_address, deprecated_frame_args_address) + (deprecated_frame_chain_valid, deprecated_frame_chain) + (deprecated_init_extra_frame_info, deprecated_pop_frame) + (deprecated_frame_init_saved_regs, deprecated_get_saved_register) + (deprecated_do_registers_info, deprecated_init_frame_pc): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * regcache.c (deprecated_read_fp): Do not call + DEPRECATED_TARGET_READ_FP_P. + * infcmd.c (default_print_registers_info): Do not call + DEPRECATED_DO_REGISTERS_INFO. + * frame-base.c (default_frame_locals_address): Do not call + DEPRECATED_FRAME_LOCALS_ADDRESS. + (default_frame_args_address): Do not call + DEPRECATED_FRAME_ARGS_ADDRESS. + * gdbarch.sh (deprecated_register_raw_size) (deprecated_register_virtual_size:int): Delete. * gdbarch.h, gdbarch.c: Re-generate. @@ -9,8 +25,6 @@ (alpha_register_virtual_size): Delete. (alpha_gdbarch_init): Update. -2004-08-02 Andrew Cagney - * gdbarch.sh (deprecated_register_virtual_type) (deprecated_save_dummy_frame_tos, deprecated_push_return_address) (deprecated_dummy_write_sp): Delete. diff --git a/gdb/frame-base.c b/gdb/frame-base.c index 0fce6bc..0961033 100644 --- a/gdb/frame-base.c +++ b/gdb/frame-base.c @@ -39,24 +39,12 @@ default_frame_base_address (struct frame_info *next_frame, void **this_cache) static CORE_ADDR default_frame_locals_address (struct frame_info *next_frame, void **this_cache) { - if (DEPRECATED_FRAME_LOCALS_ADDRESS_P ()) - { - /* This is bad. The computation of per-frame locals address - should use a per-frame frame-base. */ - struct frame_info *this_frame = get_prev_frame (next_frame); - return DEPRECATED_FRAME_LOCALS_ADDRESS (this_frame); - } return default_frame_base_address (next_frame, this_cache); } static CORE_ADDR default_frame_args_address (struct frame_info *next_frame, void **this_cache) { - if (DEPRECATED_FRAME_ARGS_ADDRESS_P ()) - { - struct frame_info *this_frame = get_prev_frame (next_frame); - return DEPRECATED_FRAME_ARGS_ADDRESS (this_frame); - } return default_frame_base_address (next_frame, this_cache); } diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index d5f72ec..dba1c06 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -148,13 +148,11 @@ struct gdbarch gdbarch_deprecated_register_byte_ftype *deprecated_register_byte; gdbarch_unwind_dummy_id_ftype *unwind_dummy_id; int deprecated_fp_regnum; - gdbarch_deprecated_target_read_fp_ftype *deprecated_target_read_fp; gdbarch_push_dummy_call_ftype *push_dummy_call; gdbarch_deprecated_push_arguments_ftype *deprecated_push_arguments; int deprecated_register_size; int call_dummy_location; gdbarch_push_dummy_code_ftype *push_dummy_code; - gdbarch_deprecated_do_registers_info_ftype *deprecated_do_registers_info; gdbarch_print_registers_info_ftype *print_registers_info; gdbarch_print_float_info_ftype *print_float_info; gdbarch_print_vector_info_ftype *print_vector_info; @@ -163,16 +161,13 @@ struct gdbarch gdbarch_cannot_fetch_register_ftype *cannot_fetch_register; gdbarch_cannot_store_register_ftype *cannot_store_register; gdbarch_get_longjmp_target_ftype *get_longjmp_target; - gdbarch_deprecated_init_frame_pc_ftype *deprecated_init_frame_pc; int believe_pcc_promotion; - gdbarch_deprecated_get_saved_register_ftype *deprecated_get_saved_register; gdbarch_convert_register_p_ftype *convert_register_p; gdbarch_register_to_value_ftype *register_to_value; gdbarch_value_to_register_ftype *value_to_register; gdbarch_pointer_to_address_ftype *pointer_to_address; gdbarch_address_to_pointer_ftype *address_to_pointer; gdbarch_integer_to_address_ftype *integer_to_address; - gdbarch_deprecated_pop_frame_ftype *deprecated_pop_frame; gdbarch_deprecated_store_struct_return_ftype *deprecated_store_struct_return; gdbarch_return_value_ftype *return_value; gdbarch_extract_return_value_ftype *extract_return_value; @@ -181,8 +176,6 @@ struct gdbarch gdbarch_deprecated_store_return_value_ftype *deprecated_store_return_value; gdbarch_deprecated_use_struct_convention_ftype *deprecated_use_struct_convention; gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address; - gdbarch_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_inner_than_ftype *inner_than; gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; @@ -193,13 +186,9 @@ struct gdbarch CORE_ADDR deprecated_function_start_offset; gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address; CORE_ADDR frame_args_skip; - gdbarch_deprecated_frame_chain_ftype *deprecated_frame_chain; - gdbarch_deprecated_frame_chain_valid_ftype *deprecated_frame_chain_valid; gdbarch_deprecated_frame_saved_pc_ftype *deprecated_frame_saved_pc; gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_unwind_sp_ftype *unwind_sp; - gdbarch_deprecated_frame_args_address_ftype *deprecated_frame_args_address; - gdbarch_deprecated_frame_locals_address_ftype *deprecated_frame_locals_address; gdbarch_deprecated_saved_pc_after_call_ftype *deprecated_saved_pc_after_call; gdbarch_frame_num_args_ftype *frame_num_args; gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; @@ -286,13 +275,11 @@ struct gdbarch startup_gdbarch = generic_register_byte, /* deprecated_register_byte */ 0, /* unwind_dummy_id */ -1, /* deprecated_fp_regnum */ - 0, /* deprecated_target_read_fp */ 0, /* push_dummy_call */ 0, /* deprecated_push_arguments */ 0, /* deprecated_register_size */ 0, /* call_dummy_location */ 0, /* push_dummy_code */ - 0, /* deprecated_do_registers_info */ default_print_registers_info, /* print_registers_info */ 0, /* print_float_info */ 0, /* print_vector_info */ @@ -301,16 +288,13 @@ struct gdbarch startup_gdbarch = 0, /* cannot_fetch_register */ 0, /* cannot_store_register */ 0, /* get_longjmp_target */ - 0, /* deprecated_init_frame_pc */ 0, /* believe_pcc_promotion */ - 0, /* deprecated_get_saved_register */ 0, /* convert_register_p */ 0, /* register_to_value */ 0, /* value_to_register */ 0, /* pointer_to_address */ 0, /* address_to_pointer */ 0, /* integer_to_address */ - 0, /* deprecated_pop_frame */ 0, /* deprecated_store_struct_return */ 0, /* return_value */ 0, /* extract_return_value */ @@ -319,8 +303,6 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_store_return_value */ 0, /* deprecated_use_struct_convention */ 0, /* deprecated_extract_struct_value_address */ - 0, /* deprecated_frame_init_saved_regs */ - 0, /* deprecated_init_extra_frame_info */ 0, /* skip_prologue */ 0, /* inner_than */ 0, /* breakpoint_from_pc */ @@ -331,13 +313,9 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_function_start_offset */ generic_remote_translate_xfer_address, /* remote_translate_xfer_address */ 0, /* frame_args_skip */ - 0, /* deprecated_frame_chain */ - 0, /* deprecated_frame_chain_valid */ 0, /* deprecated_frame_saved_pc */ 0, /* unwind_pc */ 0, /* unwind_sp */ - get_frame_base, /* deprecated_frame_args_address */ - get_frame_base, /* deprecated_frame_locals_address */ 0, /* deprecated_saved_pc_after_call */ 0, /* frame_num_args */ 0, /* deprecated_stack_align */ @@ -446,8 +424,6 @@ gdbarch_alloc (const struct gdbarch_info *info, 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; - current_gdbarch->deprecated_frame_args_address = get_frame_base; - current_gdbarch->deprecated_frame_locals_address = get_frame_base; current_gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr; current_gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity; current_gdbarch->addr_bits_remove = core_addr_identity; @@ -556,12 +532,10 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of deprecated_register_byte, has predicate */ /* Skip verify of unwind_dummy_id, has predicate */ /* Skip verify of deprecated_fp_regnum, invalid_p == 0 */ - /* Skip verify of deprecated_target_read_fp, has predicate */ /* Skip verify of push_dummy_call, has predicate */ /* Skip verify of deprecated_push_arguments, has predicate */ /* Skip verify of call_dummy_location, invalid_p == 0 */ /* Skip verify of push_dummy_code, has predicate */ - /* Skip verify of deprecated_do_registers_info, has predicate */ /* Skip verify of print_registers_info, invalid_p == 0 */ /* Skip verify of print_float_info, has predicate */ /* Skip verify of print_vector_info, has predicate */ @@ -570,21 +544,16 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of cannot_fetch_register, invalid_p == 0 */ /* Skip verify of cannot_store_register, invalid_p == 0 */ /* Skip verify of get_longjmp_target, has predicate */ - /* Skip verify of deprecated_init_frame_pc, has predicate */ - /* Skip verify of deprecated_get_saved_register, has predicate */ /* Skip verify of convert_register_p, invalid_p == 0 */ /* Skip verify of pointer_to_address, invalid_p == 0 */ /* Skip verify of address_to_pointer, invalid_p == 0 */ /* Skip verify of integer_to_address, has predicate */ - /* Skip verify of deprecated_pop_frame, has predicate */ /* Skip verify of deprecated_store_struct_return, has predicate */ /* 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 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 */ if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (current_gdbarch->skip_prologue == 0)) fprintf_unfiltered (log, "\n\tskip_prologue"); @@ -601,13 +570,9 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of deprecated_function_start_offset, invalid_p == 0 */ /* Skip verify of remote_translate_xfer_address, invalid_p == 0 */ /* Skip verify of frame_args_skip, invalid_p == 0 */ - /* Skip verify of deprecated_frame_chain, has predicate */ - /* Skip verify of deprecated_frame_chain_valid, has predicate */ /* Skip verify of deprecated_frame_saved_pc, has predicate */ /* Skip verify of unwind_pc, has predicate */ /* Skip verify of unwind_sp, has predicate */ - /* Skip verify of deprecated_frame_args_address, has predicate */ - /* Skip verify of deprecated_frame_locals_address, has predicate */ /* Skip verify of deprecated_saved_pc_after_call, has predicate */ /* Skip verify of frame_num_args, has predicate */ /* Skip verify of deprecated_stack_align, has predicate */ @@ -845,24 +810,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: decr_pc_after_break = 0x%s\n", paddr_nz (current_gdbarch->decr_pc_after_break)); -#ifdef DEPRECATED_DO_REGISTERS_INFO_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_DO_REGISTERS_INFO_P()", - XSTRING (DEPRECATED_DO_REGISTERS_INFO_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_do_registers_info_p() = %d\n", - gdbarch_deprecated_do_registers_info_p (current_gdbarch)); -#ifdef DEPRECATED_DO_REGISTERS_INFO - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_DO_REGISTERS_INFO(reg_nr, fpregs)", - XSTRING (DEPRECATED_DO_REGISTERS_INFO (reg_nr, fpregs))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_do_registers_info = <0x%lx>\n", - (long) current_gdbarch->deprecated_do_registers_info); #ifdef DEPRECATED_EXTRACT_RETURN_VALUE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -898,96 +845,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_fp_regnum = %s\n", paddr_d (current_gdbarch->deprecated_fp_regnum)); -#ifdef DEPRECATED_FRAME_ARGS_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_ARGS_ADDRESS_P()", - XSTRING (DEPRECATED_FRAME_ARGS_ADDRESS_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_args_address_p() = %d\n", - gdbarch_deprecated_frame_args_address_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_ARGS_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_ARGS_ADDRESS(fi)", - XSTRING (DEPRECATED_FRAME_ARGS_ADDRESS (fi))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_args_address = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_args_address); -#ifdef DEPRECATED_FRAME_CHAIN_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_CHAIN_P()", - XSTRING (DEPRECATED_FRAME_CHAIN_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_chain_p() = %d\n", - gdbarch_deprecated_frame_chain_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_CHAIN - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_CHAIN(frame)", - XSTRING (DEPRECATED_FRAME_CHAIN (frame))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_chain = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_chain); -#ifdef DEPRECATED_FRAME_CHAIN_VALID_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_CHAIN_VALID_P()", - XSTRING (DEPRECATED_FRAME_CHAIN_VALID_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_chain_valid_p() = %d\n", - gdbarch_deprecated_frame_chain_valid_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_CHAIN_VALID - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_CHAIN_VALID(chain, thisframe)", - XSTRING (DEPRECATED_FRAME_CHAIN_VALID (chain, thisframe))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_chain_valid = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_chain_valid); -#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 ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_init_saved_regs_p() = %d\n", - gdbarch_deprecated_frame_init_saved_regs_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_INIT_SAVED_REGS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_INIT_SAVED_REGS(frame)", - XSTRING (DEPRECATED_FRAME_INIT_SAVED_REGS (frame))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_init_saved_regs = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_init_saved_regs); -#ifdef DEPRECATED_FRAME_LOCALS_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_LOCALS_ADDRESS_P()", - XSTRING (DEPRECATED_FRAME_LOCALS_ADDRESS_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_locals_address_p() = %d\n", - gdbarch_deprecated_frame_locals_address_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_LOCALS_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_LOCALS_ADDRESS(fi)", - XSTRING (DEPRECATED_FRAME_LOCALS_ADDRESS (fi))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_locals_address = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_locals_address); #ifdef DEPRECATED_FRAME_SAVED_PC_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1014,78 +871,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_function_start_offset = 0x%s\n", paddr_nz (current_gdbarch->deprecated_function_start_offset)); -#ifdef DEPRECATED_GET_SAVED_REGISTER_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_GET_SAVED_REGISTER_P()", - XSTRING (DEPRECATED_GET_SAVED_REGISTER_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_get_saved_register_p() = %d\n", - gdbarch_deprecated_get_saved_register_p (current_gdbarch)); -#ifdef DEPRECATED_GET_SAVED_REGISTER - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval)", - XSTRING (DEPRECATED_GET_SAVED_REGISTER (raw_buffer, optimized, addrp, frame, regnum, lval))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_get_saved_register = <0x%lx>\n", - (long) current_gdbarch->deprecated_get_saved_register); -#ifdef DEPRECATED_INIT_EXTRA_FRAME_INFO_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_EXTRA_FRAME_INFO_P()", - XSTRING (DEPRECATED_INIT_EXTRA_FRAME_INFO_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_init_extra_frame_info_p() = %d\n", - gdbarch_deprecated_init_extra_frame_info_p (current_gdbarch)); -#ifdef DEPRECATED_INIT_EXTRA_FRAME_INFO - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_EXTRA_FRAME_INFO(fromleaf, frame)", - XSTRING (DEPRECATED_INIT_EXTRA_FRAME_INFO (fromleaf, frame))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_init_extra_frame_info = <0x%lx>\n", - (long) current_gdbarch->deprecated_init_extra_frame_info); -#ifdef DEPRECATED_INIT_FRAME_PC_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_FRAME_PC_P()", - XSTRING (DEPRECATED_INIT_FRAME_PC_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_init_frame_pc_p() = %d\n", - gdbarch_deprecated_init_frame_pc_p (current_gdbarch)); -#ifdef DEPRECATED_INIT_FRAME_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_FRAME_PC(fromleaf, prev)", - XSTRING (DEPRECATED_INIT_FRAME_PC (fromleaf, prev))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_init_frame_pc = <0x%lx>\n", - (long) current_gdbarch->deprecated_init_frame_pc); -#ifdef DEPRECATED_POP_FRAME_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_POP_FRAME_P()", - XSTRING (DEPRECATED_POP_FRAME_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_pop_frame_p() = %d\n", - gdbarch_deprecated_pop_frame_p (current_gdbarch)); -#ifdef DEPRECATED_POP_FRAME - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_POP_FRAME(-)", - XSTRING (DEPRECATED_POP_FRAME (-))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_pop_frame = <0x%lx>\n", - (long) current_gdbarch->deprecated_pop_frame); #ifdef DEPRECATED_PUSH_ARGUMENTS_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1211,24 +996,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_store_struct_return = <0x%lx>\n", (long) current_gdbarch->deprecated_store_struct_return); -#ifdef DEPRECATED_TARGET_READ_FP_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_TARGET_READ_FP_P()", - XSTRING (DEPRECATED_TARGET_READ_FP_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_target_read_fp_p() = %d\n", - gdbarch_deprecated_target_read_fp_p (current_gdbarch)); -#ifdef DEPRECATED_TARGET_READ_FP - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_TARGET_READ_FP()", - XSTRING (DEPRECATED_TARGET_READ_FP ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_target_read_fp = <0x%lx>\n", - (long) current_gdbarch->deprecated_target_read_fp); #ifdef DEPRECATED_USE_STRUCT_CONVENTION fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2525,30 +2292,6 @@ set_gdbarch_deprecated_fp_regnum (struct gdbarch *gdbarch, } int -gdbarch_deprecated_target_read_fp_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_target_read_fp != NULL; -} - -CORE_ADDR -gdbarch_deprecated_target_read_fp (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_target_read_fp != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_target_read_fp called\n"); - return gdbarch->deprecated_target_read_fp (); -} - -void -set_gdbarch_deprecated_target_read_fp (struct gdbarch *gdbarch, - gdbarch_deprecated_target_read_fp_ftype deprecated_target_read_fp) -{ - gdbarch->deprecated_target_read_fp = deprecated_target_read_fp; -} - -int gdbarch_push_dummy_call_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -2653,30 +2396,6 @@ set_gdbarch_push_dummy_code (struct gdbarch *gdbarch, gdbarch->push_dummy_code = push_dummy_code; } -int -gdbarch_deprecated_do_registers_info_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_do_registers_info != NULL; -} - -void -gdbarch_deprecated_do_registers_info (struct gdbarch *gdbarch, int reg_nr, int fpregs) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_do_registers_info != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_do_registers_info called\n"); - gdbarch->deprecated_do_registers_info (reg_nr, fpregs); -} - -void -set_gdbarch_deprecated_do_registers_info (struct gdbarch *gdbarch, - gdbarch_deprecated_do_registers_info_ftype deprecated_do_registers_info) -{ - gdbarch->deprecated_do_registers_info = deprecated_do_registers_info; -} - void gdbarch_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, int regnum, int all) { @@ -2842,30 +2561,6 @@ set_gdbarch_get_longjmp_target (struct gdbarch *gdbarch, } int -gdbarch_deprecated_init_frame_pc_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_init_frame_pc != NULL; -} - -CORE_ADDR -gdbarch_deprecated_init_frame_pc (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_init_frame_pc != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_init_frame_pc called\n"); - return gdbarch->deprecated_init_frame_pc (fromleaf, prev); -} - -void -set_gdbarch_deprecated_init_frame_pc (struct gdbarch *gdbarch, - gdbarch_deprecated_init_frame_pc_ftype deprecated_init_frame_pc) -{ - gdbarch->deprecated_init_frame_pc = deprecated_init_frame_pc; -} - -int gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -2882,30 +2577,6 @@ set_gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch, } int -gdbarch_deprecated_get_saved_register_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_get_saved_register != NULL; -} - -void -gdbarch_deprecated_get_saved_register (struct gdbarch *gdbarch, char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_get_saved_register != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_get_saved_register called\n"); - gdbarch->deprecated_get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval); -} - -void -set_gdbarch_deprecated_get_saved_register (struct gdbarch *gdbarch, - gdbarch_deprecated_get_saved_register_ftype deprecated_get_saved_register) -{ - gdbarch->deprecated_get_saved_register = deprecated_get_saved_register; -} - -int gdbarch_convert_register_p (struct gdbarch *gdbarch, int regnum, struct type *type) { gdb_assert (gdbarch != NULL); @@ -3015,30 +2686,6 @@ set_gdbarch_integer_to_address (struct gdbarch *gdbarch, } int -gdbarch_deprecated_pop_frame_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_pop_frame != NULL; -} - -void -gdbarch_deprecated_pop_frame (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_pop_frame != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_pop_frame called\n"); - gdbarch->deprecated_pop_frame (); -} - -void -set_gdbarch_deprecated_pop_frame (struct gdbarch *gdbarch, - gdbarch_deprecated_pop_frame_ftype deprecated_pop_frame) -{ - gdbarch->deprecated_pop_frame = deprecated_pop_frame; -} - -int gdbarch_deprecated_store_struct_return_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -3196,54 +2843,6 @@ set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, gdbarch->deprecated_extract_struct_value_address = deprecated_extract_struct_value_address; } -int -gdbarch_deprecated_frame_init_saved_regs_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_init_saved_regs != NULL; -} - -void -gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_init_saved_regs != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_init_saved_regs called\n"); - gdbarch->deprecated_frame_init_saved_regs (frame); -} - -void -set_gdbarch_deprecated_frame_init_saved_regs (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_init_saved_regs_ftype deprecated_frame_init_saved_regs) -{ - gdbarch->deprecated_frame_init_saved_regs = deprecated_frame_init_saved_regs; -} - -int -gdbarch_deprecated_init_extra_frame_info_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_init_extra_frame_info != NULL; -} - -void -gdbarch_deprecated_init_extra_frame_info (struct gdbarch *gdbarch, int fromleaf, struct frame_info *frame) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_init_extra_frame_info != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_init_extra_frame_info called\n"); - gdbarch->deprecated_init_extra_frame_info (fromleaf, frame); -} - -void -set_gdbarch_deprecated_init_extra_frame_info (struct gdbarch *gdbarch, - gdbarch_deprecated_init_extra_frame_info_ftype deprecated_init_extra_frame_info) -{ - gdbarch->deprecated_init_extra_frame_info = deprecated_init_extra_frame_info; -} - CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) { @@ -3422,54 +3021,6 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, } int -gdbarch_deprecated_frame_chain_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_chain != NULL; -} - -CORE_ADDR -gdbarch_deprecated_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_chain != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_chain called\n"); - return gdbarch->deprecated_frame_chain (frame); -} - -void -set_gdbarch_deprecated_frame_chain (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_chain_ftype deprecated_frame_chain) -{ - gdbarch->deprecated_frame_chain = deprecated_frame_chain; -} - -int -gdbarch_deprecated_frame_chain_valid_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_chain_valid != NULL; -} - -int -gdbarch_deprecated_frame_chain_valid (struct gdbarch *gdbarch, CORE_ADDR chain, struct frame_info *thisframe) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_chain_valid != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_chain_valid called\n"); - return gdbarch->deprecated_frame_chain_valid (chain, thisframe); -} - -void -set_gdbarch_deprecated_frame_chain_valid (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_chain_valid_ftype deprecated_frame_chain_valid) -{ - gdbarch->deprecated_frame_chain_valid = deprecated_frame_chain_valid; -} - -int gdbarch_deprecated_frame_saved_pc_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -3542,56 +3093,6 @@ set_gdbarch_unwind_sp (struct gdbarch *gdbarch, } int -gdbarch_deprecated_frame_args_address_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_args_address != get_frame_base; -} - -CORE_ADDR -gdbarch_deprecated_frame_args_address (struct gdbarch *gdbarch, struct frame_info *fi) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_args_address != NULL); - /* Do not check predicate: gdbarch->deprecated_frame_args_address != get_frame_base, allow call. */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_args_address called\n"); - return gdbarch->deprecated_frame_args_address (fi); -} - -void -set_gdbarch_deprecated_frame_args_address (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_args_address_ftype deprecated_frame_args_address) -{ - gdbarch->deprecated_frame_args_address = deprecated_frame_args_address; -} - -int -gdbarch_deprecated_frame_locals_address_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_locals_address != get_frame_base; -} - -CORE_ADDR -gdbarch_deprecated_frame_locals_address (struct gdbarch *gdbarch, struct frame_info *fi) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_locals_address != NULL); - /* Do not check predicate: gdbarch->deprecated_frame_locals_address != get_frame_base, allow call. */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_locals_address called\n"); - return gdbarch->deprecated_frame_locals_address (fi); -} - -void -set_gdbarch_deprecated_frame_locals_address (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_locals_address_ftype deprecated_frame_locals_address) -{ - gdbarch->deprecated_frame_locals_address = deprecated_frame_locals_address; -} - -int gdbarch_deprecated_saved_pc_after_call_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index f971a1d..b691945 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -507,34 +507,6 @@ extern void set_gdbarch_deprecated_fp_regnum (struct gdbarch *gdbarch, int depre #define DEPRECATED_FP_REGNUM (gdbarch_deprecated_fp_regnum (current_gdbarch)) #endif -/* Implement UNWIND_DUMMY_ID and PUSH_DUMMY_CALL, then delete - DEPRECATED_TARGET_READ_FP. */ - -#if defined (DEPRECATED_TARGET_READ_FP) -/* Legacy for systems yet to multi-arch DEPRECATED_TARGET_READ_FP */ -#if !defined (DEPRECATED_TARGET_READ_FP_P) -#define DEPRECATED_TARGET_READ_FP_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_target_read_fp_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_TARGET_READ_FP_P) -#error "Non multi-arch definition of DEPRECATED_TARGET_READ_FP" -#endif -#if !defined (DEPRECATED_TARGET_READ_FP_P) -#define DEPRECATED_TARGET_READ_FP_P() (gdbarch_deprecated_target_read_fp_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_target_read_fp_ftype) (void); -extern CORE_ADDR gdbarch_deprecated_target_read_fp (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_target_read_fp (struct gdbarch *gdbarch, gdbarch_deprecated_target_read_fp_ftype *deprecated_target_read_fp); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_TARGET_READ_FP) -#error "Non multi-arch definition of DEPRECATED_TARGET_READ_FP" -#endif -#if !defined (DEPRECATED_TARGET_READ_FP) -#define DEPRECATED_TARGET_READ_FP() (gdbarch_deprecated_target_read_fp (current_gdbarch)) -#endif - /* See gdbint.texinfo. See infcall.c. New, all singing all dancing, replacement for DEPRECATED_PUSH_ARGUMENTS. */ @@ -597,31 +569,6 @@ typedef CORE_ADDR (gdbarch_push_dummy_code_ftype) (struct gdbarch *gdbarch, CORE extern CORE_ADDR gdbarch_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr); extern void set_gdbarch_push_dummy_code (struct gdbarch *gdbarch, gdbarch_push_dummy_code_ftype *push_dummy_code); -#if defined (DEPRECATED_DO_REGISTERS_INFO) -/* Legacy for systems yet to multi-arch DEPRECATED_DO_REGISTERS_INFO */ -#if !defined (DEPRECATED_DO_REGISTERS_INFO_P) -#define DEPRECATED_DO_REGISTERS_INFO_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_do_registers_info_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_DO_REGISTERS_INFO_P) -#error "Non multi-arch definition of DEPRECATED_DO_REGISTERS_INFO" -#endif -#if !defined (DEPRECATED_DO_REGISTERS_INFO_P) -#define DEPRECATED_DO_REGISTERS_INFO_P() (gdbarch_deprecated_do_registers_info_p (current_gdbarch)) -#endif - -typedef void (gdbarch_deprecated_do_registers_info_ftype) (int reg_nr, int fpregs); -extern void gdbarch_deprecated_do_registers_info (struct gdbarch *gdbarch, int reg_nr, int fpregs); -extern void set_gdbarch_deprecated_do_registers_info (struct gdbarch *gdbarch, gdbarch_deprecated_do_registers_info_ftype *deprecated_do_registers_info); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_DO_REGISTERS_INFO) -#error "Non multi-arch definition of DEPRECATED_DO_REGISTERS_INFO" -#endif -#if !defined (DEPRECATED_DO_REGISTERS_INFO) -#define DEPRECATED_DO_REGISTERS_INFO(reg_nr, fpregs) (gdbarch_deprecated_do_registers_info (current_gdbarch, reg_nr, fpregs)) -#endif - typedef void (gdbarch_print_registers_info_ftype) (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, int regnum, int all); extern void gdbarch_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, int regnum, int all); extern void set_gdbarch_print_registers_info (struct gdbarch *gdbarch, gdbarch_print_registers_info_ftype *print_registers_info); @@ -723,31 +670,6 @@ extern void set_gdbarch_get_longjmp_target (struct gdbarch *gdbarch, gdbarch_get #define GET_LONGJMP_TARGET(pc) (gdbarch_get_longjmp_target (current_gdbarch, pc)) #endif -#if defined (DEPRECATED_INIT_FRAME_PC) -/* Legacy for systems yet to multi-arch DEPRECATED_INIT_FRAME_PC */ -#if !defined (DEPRECATED_INIT_FRAME_PC_P) -#define DEPRECATED_INIT_FRAME_PC_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_init_frame_pc_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_FRAME_PC_P) -#error "Non multi-arch definition of DEPRECATED_INIT_FRAME_PC" -#endif -#if !defined (DEPRECATED_INIT_FRAME_PC_P) -#define DEPRECATED_INIT_FRAME_PC_P() (gdbarch_deprecated_init_frame_pc_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_init_frame_pc_ftype) (int fromleaf, struct frame_info *prev); -extern CORE_ADDR gdbarch_deprecated_init_frame_pc (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev); -extern void set_gdbarch_deprecated_init_frame_pc (struct gdbarch *gdbarch, gdbarch_deprecated_init_frame_pc_ftype *deprecated_init_frame_pc); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_FRAME_PC) -#error "Non multi-arch definition of DEPRECATED_INIT_FRAME_PC" -#endif -#if !defined (DEPRECATED_INIT_FRAME_PC) -#define DEPRECATED_INIT_FRAME_PC(fromleaf, prev) (gdbarch_deprecated_init_frame_pc (current_gdbarch, fromleaf, prev)) -#endif - extern int gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch); extern void set_gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch, int believe_pcc_promotion); #if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (BELIEVE_PCC_PROMOTION) @@ -757,31 +679,6 @@ extern void set_gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch, int beli #define BELIEVE_PCC_PROMOTION (gdbarch_believe_pcc_promotion (current_gdbarch)) #endif -#if defined (DEPRECATED_GET_SAVED_REGISTER) -/* Legacy for systems yet to multi-arch DEPRECATED_GET_SAVED_REGISTER */ -#if !defined (DEPRECATED_GET_SAVED_REGISTER_P) -#define DEPRECATED_GET_SAVED_REGISTER_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_get_saved_register_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_GET_SAVED_REGISTER_P) -#error "Non multi-arch definition of DEPRECATED_GET_SAVED_REGISTER" -#endif -#if !defined (DEPRECATED_GET_SAVED_REGISTER_P) -#define DEPRECATED_GET_SAVED_REGISTER_P() (gdbarch_deprecated_get_saved_register_p (current_gdbarch)) -#endif - -typedef void (gdbarch_deprecated_get_saved_register_ftype) (char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval); -extern void gdbarch_deprecated_get_saved_register (struct gdbarch *gdbarch, char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval); -extern void set_gdbarch_deprecated_get_saved_register (struct gdbarch *gdbarch, gdbarch_deprecated_get_saved_register_ftype *deprecated_get_saved_register); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_GET_SAVED_REGISTER) -#error "Non multi-arch definition of DEPRECATED_GET_SAVED_REGISTER" -#endif -#if !defined (DEPRECATED_GET_SAVED_REGISTER) -#define DEPRECATED_GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval) (gdbarch_deprecated_get_saved_register (current_gdbarch, raw_buffer, optimized, addrp, frame, regnum, lval)) -#endif - typedef int (gdbarch_convert_register_p_ftype) (int regnum, struct type *type); extern int gdbarch_convert_register_p (struct gdbarch *gdbarch, int regnum, struct type *type); extern void set_gdbarch_convert_register_p (struct gdbarch *gdbarch, gdbarch_convert_register_p_ftype *convert_register_p); @@ -857,31 +754,6 @@ extern void set_gdbarch_integer_to_address (struct gdbarch *gdbarch, gdbarch_int #define INTEGER_TO_ADDRESS(type, buf) (gdbarch_integer_to_address (current_gdbarch, type, buf)) #endif -#if defined (DEPRECATED_POP_FRAME) -/* Legacy for systems yet to multi-arch DEPRECATED_POP_FRAME */ -#if !defined (DEPRECATED_POP_FRAME_P) -#define DEPRECATED_POP_FRAME_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_pop_frame_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_POP_FRAME_P) -#error "Non multi-arch definition of DEPRECATED_POP_FRAME" -#endif -#if !defined (DEPRECATED_POP_FRAME_P) -#define DEPRECATED_POP_FRAME_P() (gdbarch_deprecated_pop_frame_p (current_gdbarch)) -#endif - -typedef void (gdbarch_deprecated_pop_frame_ftype) (void); -extern void gdbarch_deprecated_pop_frame (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_pop_frame (struct gdbarch *gdbarch, gdbarch_deprecated_pop_frame_ftype *deprecated_pop_frame); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_POP_FRAME) -#error "Non multi-arch definition of DEPRECATED_POP_FRAME" -#endif -#if !defined (DEPRECATED_POP_FRAME) -#define DEPRECATED_POP_FRAME (gdbarch_deprecated_pop_frame (current_gdbarch)) -#endif - /* NOTE: cagney/2003-03-24: Replaced by PUSH_ARGUMENTS. */ #if defined (DEPRECATED_STORE_STRUCT_RETURN) @@ -1020,56 +892,6 @@ extern void set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch #define DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regcache) (gdbarch_deprecated_extract_struct_value_address (current_gdbarch, regcache)) #endif -#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 - -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 !defined (DEPRECATED_FRAME_INIT_SAVED_REGS_P) -#define DEPRECATED_FRAME_INIT_SAVED_REGS_P() (gdbarch_deprecated_frame_init_saved_regs_p (current_gdbarch)) -#endif - -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 !defined (DEPRECATED_FRAME_INIT_SAVED_REGS) -#define DEPRECATED_FRAME_INIT_SAVED_REGS(frame) (gdbarch_deprecated_frame_init_saved_regs (current_gdbarch, frame)) -#endif - -#if defined (DEPRECATED_INIT_EXTRA_FRAME_INFO) -/* Legacy for systems yet to multi-arch DEPRECATED_INIT_EXTRA_FRAME_INFO */ -#if !defined (DEPRECATED_INIT_EXTRA_FRAME_INFO_P) -#define DEPRECATED_INIT_EXTRA_FRAME_INFO_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_init_extra_frame_info_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_EXTRA_FRAME_INFO_P) -#error "Non multi-arch definition of DEPRECATED_INIT_EXTRA_FRAME_INFO" -#endif -#if !defined (DEPRECATED_INIT_EXTRA_FRAME_INFO_P) -#define DEPRECATED_INIT_EXTRA_FRAME_INFO_P() (gdbarch_deprecated_init_extra_frame_info_p (current_gdbarch)) -#endif - -typedef void (gdbarch_deprecated_init_extra_frame_info_ftype) (int fromleaf, struct frame_info *frame); -extern void gdbarch_deprecated_init_extra_frame_info (struct gdbarch *gdbarch, int fromleaf, struct frame_info *frame); -extern void set_gdbarch_deprecated_init_extra_frame_info (struct gdbarch *gdbarch, gdbarch_deprecated_init_extra_frame_info_ftype *deprecated_init_extra_frame_info); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_EXTRA_FRAME_INFO) -#error "Non multi-arch definition of DEPRECATED_INIT_EXTRA_FRAME_INFO" -#endif -#if !defined (DEPRECATED_INIT_EXTRA_FRAME_INFO) -#define DEPRECATED_INIT_EXTRA_FRAME_INFO(fromleaf, frame) (gdbarch_deprecated_init_extra_frame_info (current_gdbarch, fromleaf, frame)) -#endif - typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (CORE_ADDR ip); extern CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip); extern void set_gdbarch_skip_prologue (struct gdbarch *gdbarch, gdbarch_skip_prologue_ftype *skip_prologue); @@ -1165,56 +987,6 @@ extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR fram #define FRAME_ARGS_SKIP (gdbarch_frame_args_skip (current_gdbarch)) #endif -#if defined (DEPRECATED_FRAME_CHAIN) -/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_CHAIN */ -#if !defined (DEPRECATED_FRAME_CHAIN_P) -#define DEPRECATED_FRAME_CHAIN_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_frame_chain_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_CHAIN_P) -#error "Non multi-arch definition of DEPRECATED_FRAME_CHAIN" -#endif -#if !defined (DEPRECATED_FRAME_CHAIN_P) -#define DEPRECATED_FRAME_CHAIN_P() (gdbarch_deprecated_frame_chain_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_frame_chain_ftype) (struct frame_info *frame); -extern CORE_ADDR gdbarch_deprecated_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame); -extern void set_gdbarch_deprecated_frame_chain (struct gdbarch *gdbarch, gdbarch_deprecated_frame_chain_ftype *deprecated_frame_chain); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_CHAIN) -#error "Non multi-arch definition of DEPRECATED_FRAME_CHAIN" -#endif -#if !defined (DEPRECATED_FRAME_CHAIN) -#define DEPRECATED_FRAME_CHAIN(frame) (gdbarch_deprecated_frame_chain (current_gdbarch, frame)) -#endif - -#if defined (DEPRECATED_FRAME_CHAIN_VALID) -/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_CHAIN_VALID */ -#if !defined (DEPRECATED_FRAME_CHAIN_VALID_P) -#define DEPRECATED_FRAME_CHAIN_VALID_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_frame_chain_valid_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_CHAIN_VALID_P) -#error "Non multi-arch definition of DEPRECATED_FRAME_CHAIN_VALID" -#endif -#if !defined (DEPRECATED_FRAME_CHAIN_VALID_P) -#define DEPRECATED_FRAME_CHAIN_VALID_P() (gdbarch_deprecated_frame_chain_valid_p (current_gdbarch)) -#endif - -typedef int (gdbarch_deprecated_frame_chain_valid_ftype) (CORE_ADDR chain, struct frame_info *thisframe); -extern int gdbarch_deprecated_frame_chain_valid (struct gdbarch *gdbarch, CORE_ADDR chain, struct frame_info *thisframe); -extern void set_gdbarch_deprecated_frame_chain_valid (struct gdbarch *gdbarch, gdbarch_deprecated_frame_chain_valid_ftype *deprecated_frame_chain_valid); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_CHAIN_VALID) -#error "Non multi-arch definition of DEPRECATED_FRAME_CHAIN_VALID" -#endif -#if !defined (DEPRECATED_FRAME_CHAIN_VALID) -#define DEPRECATED_FRAME_CHAIN_VALID(chain, thisframe) (gdbarch_deprecated_frame_chain_valid (current_gdbarch, chain, thisframe)) -#endif - /* DEPRECATED_FRAME_SAVED_PC has been replaced by UNWIND_PC. Please note, per UNWIND_PC's doco, that while the two have similar interfaces they have very different underlying implementations. */ @@ -1256,62 +1028,9 @@ typedef CORE_ADDR (gdbarch_unwind_sp_ftype) (struct gdbarch *gdbarch, struct fra extern CORE_ADDR gdbarch_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame); extern void set_gdbarch_unwind_sp (struct gdbarch *gdbarch, gdbarch_unwind_sp_ftype *unwind_sp); -/* DEPRECATED_FRAME_ARGS_ADDRESS as been replaced by the per-frame - frame-base. Enable frame-base before frame-unwind. */ - -#if defined (DEPRECATED_FRAME_ARGS_ADDRESS) -/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_ARGS_ADDRESS */ -#if !defined (DEPRECATED_FRAME_ARGS_ADDRESS_P) -#define DEPRECATED_FRAME_ARGS_ADDRESS_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_frame_args_address_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_ARGS_ADDRESS_P) -#error "Non multi-arch definition of DEPRECATED_FRAME_ARGS_ADDRESS" -#endif -#if !defined (DEPRECATED_FRAME_ARGS_ADDRESS_P) -#define DEPRECATED_FRAME_ARGS_ADDRESS_P() (gdbarch_deprecated_frame_args_address_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_frame_args_address_ftype) (struct frame_info *fi); -extern CORE_ADDR gdbarch_deprecated_frame_args_address (struct gdbarch *gdbarch, struct frame_info *fi); -extern void set_gdbarch_deprecated_frame_args_address (struct gdbarch *gdbarch, gdbarch_deprecated_frame_args_address_ftype *deprecated_frame_args_address); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_ARGS_ADDRESS) -#error "Non multi-arch definition of DEPRECATED_FRAME_ARGS_ADDRESS" -#endif -#if !defined (DEPRECATED_FRAME_ARGS_ADDRESS) -#define DEPRECATED_FRAME_ARGS_ADDRESS(fi) (gdbarch_deprecated_frame_args_address (current_gdbarch, fi)) -#endif - /* DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame frame-base. Enable frame-base before frame-unwind. */ -#if defined (DEPRECATED_FRAME_LOCALS_ADDRESS) -/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_LOCALS_ADDRESS */ -#if !defined (DEPRECATED_FRAME_LOCALS_ADDRESS_P) -#define DEPRECATED_FRAME_LOCALS_ADDRESS_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_frame_locals_address_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_LOCALS_ADDRESS_P) -#error "Non multi-arch definition of DEPRECATED_FRAME_LOCALS_ADDRESS" -#endif -#if !defined (DEPRECATED_FRAME_LOCALS_ADDRESS_P) -#define DEPRECATED_FRAME_LOCALS_ADDRESS_P() (gdbarch_deprecated_frame_locals_address_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_frame_locals_address_ftype) (struct frame_info *fi); -extern CORE_ADDR gdbarch_deprecated_frame_locals_address (struct gdbarch *gdbarch, struct frame_info *fi); -extern void set_gdbarch_deprecated_frame_locals_address (struct gdbarch *gdbarch, gdbarch_deprecated_frame_locals_address_ftype *deprecated_frame_locals_address); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_LOCALS_ADDRESS) -#error "Non multi-arch definition of DEPRECATED_FRAME_LOCALS_ADDRESS" -#endif -#if !defined (DEPRECATED_FRAME_LOCALS_ADDRESS) -#define DEPRECATED_FRAME_LOCALS_ADDRESS(fi) (gdbarch_deprecated_frame_locals_address (current_gdbarch, fi)) -#endif - #if defined (DEPRECATED_SAVED_PC_AFTER_CALL) /* Legacy for systems yet to multi-arch DEPRECATED_SAVED_PC_AFTER_CALL */ #if !defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index f615069..a5c68c1 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -475,9 +475,6 @@ M::struct frame_id:unwind_dummy_id:struct frame_info *info:info # Implement UNWIND_DUMMY_ID and PUSH_DUMMY_CALL, then delete # DEPRECATED_FP_REGNUM. v:=:int:deprecated_fp_regnum::::-1:-1::0 -# Implement UNWIND_DUMMY_ID and PUSH_DUMMY_CALL, then delete -# DEPRECATED_TARGET_READ_FP. -F:=:CORE_ADDR:deprecated_target_read_fp:void # See gdbint.texinfo. See infcall.c. New, all singing all dancing, # replacement for DEPRECATED_PUSH_ARGUMENTS. @@ -489,7 +486,6 @@ v:=:int:deprecated_register_size v:=:int:call_dummy_location:::::AT_ENTRY_POINT::0 M::CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr -F:=:void:deprecated_do_registers_info:int reg_nr, int fpregs:reg_nr, fpregs m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all:::default_print_registers_info::0 M::void:print_float_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args M::void:print_vector_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args @@ -501,10 +497,8 @@ f:=:int:cannot_fetch_register:int regnum:regnum:::cannot_register_not::0 f:=:int:cannot_store_register:int regnum:regnum:::cannot_register_not::0 # setjmp/longjmp support. F:=:int:get_longjmp_target:CORE_ADDR *pc:pc -F:=:CORE_ADDR:deprecated_init_frame_pc:int fromleaf, struct frame_info *prev:fromleaf, prev # v:=:int:believe_pcc_promotion::::::: -F:=:void:deprecated_get_saved_register:char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval:raw_buffer, optimized, addrp, frame, regnum, lval # f:=:int:convert_register_p:int regnum, struct type *type:regnum, type::0:generic_convert_register_p::0 f:=:void:register_to_value:struct frame_info *frame, int regnum, struct type *type, void *buf:frame, regnum, type, buf::0 @@ -514,7 +508,6 @@ f:=:CORE_ADDR:pointer_to_address:struct type *type, const void *buf:type, buf::: f:=:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr:::unsigned_address_to_pointer::0 F:=:CORE_ADDR:integer_to_address:struct type *type, void *buf:type, buf # -F:=:void:deprecated_pop_frame:void:- # NOTE: cagney/2003-03-24: Replaced by PUSH_ARGUMENTS. F:=:void:deprecated_store_struct_return:CORE_ADDR addr, CORE_ADDR sp:addr, sp @@ -560,8 +553,6 @@ f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_ #M::CORE_ADDR:extract_returned_value_address:struct frame_info *caller_frame:caller_frame F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache:regcache -F:=:void:deprecated_frame_init_saved_regs:struct frame_info *frame:frame -F:=:void:deprecated_init_extra_frame_info:int fromleaf, struct frame_info *frame:fromleaf, frame # f:=:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip::0:0 f:=:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs::0:0 @@ -584,20 +575,14 @@ v:=:CORE_ADDR:deprecated_function_start_offset::::0:::0 m::void:remote_translate_xfer_address:struct regcache *regcache, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len:regcache, gdb_addr, gdb_len, rem_addr, rem_len:::generic_remote_translate_xfer_address::0 # v:=:CORE_ADDR:frame_args_skip::::0:::0 -F:=:CORE_ADDR:deprecated_frame_chain:struct frame_info *frame:frame -F:=:int:deprecated_frame_chain_valid:CORE_ADDR chain, struct frame_info *thisframe:chain, thisframe # DEPRECATED_FRAME_SAVED_PC has been replaced by UNWIND_PC. Please # note, per UNWIND_PC's doco, that while the two have similar # interfaces they have very different underlying implementations. F:=:CORE_ADDR:deprecated_frame_saved_pc:struct frame_info *fi:fi M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame -# DEPRECATED_FRAME_ARGS_ADDRESS as been replaced by the per-frame -# frame-base. Enable frame-base before frame-unwind. -F:=:CORE_ADDR:deprecated_frame_args_address:struct frame_info *fi:fi::get_frame_base:get_frame_base # DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame # frame-base. Enable frame-base before frame-unwind. -F:=:CORE_ADDR:deprecated_frame_locals_address:struct frame_info *fi:fi::get_frame_base:get_frame_base F:=:CORE_ADDR:deprecated_saved_pc_after_call:struct frame_info *frame:frame F:=:int:frame_num_args:struct frame_info *frame:frame # diff --git a/gdb/infcmd.c b/gdb/infcmd.c index b529d8b..b0d233e 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1514,12 +1514,6 @@ default_print_registers_info (struct gdbarch *gdbarch, const int numregs = NUM_REGS + NUM_PSEUDO_REGS; char buffer[MAX_REGISTER_SIZE]; - if (DEPRECATED_DO_REGISTERS_INFO_P ()) - { - DEPRECATED_DO_REGISTERS_INFO (regnum, print_all); - return; - } - for (i = 0; i < numregs; i++) { /* Decide between printing all regs, non-float / vector regs, or diff --git a/gdb/regcache.c b/gdb/regcache.c index d933d59..b45740d 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1166,9 +1166,7 @@ deprecated_write_sp (CORE_ADDR val) CORE_ADDR deprecated_read_fp (void) { - if (DEPRECATED_TARGET_READ_FP_P ()) - return DEPRECATED_TARGET_READ_FP (); - else if (DEPRECATED_FP_REGNUM >= 0) + if (DEPRECATED_FP_REGNUM >= 0) return read_register (DEPRECATED_FP_REGNUM); else internal_error (__FILE__, __LINE__, "deprecated_read_fp"); -- 2.7.4