diff options
Diffstat (limited to 'gdb/gdbarch.c')
| -rw-r--r-- | gdb/gdbarch.c | 1373 |
1 files changed, 594 insertions, 779 deletions
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index b9aea09..974a3c0 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -36,27 +36,8 @@ #include "defs.h" #include "arch-utils.h" -#if GDB_MULTI_ARCH #include "gdbcmd.h" #include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ -#else -/* Just include everything in sight so that the every old definition - of macro is visible. */ -#include "gdb_string.h" -#include <ctype.h> -#include "symtab.h" -#include "frame.h" -#include "inferior.h" -#include "breakpoint.h" -#include "gdb_wait.h" -#include "gdbcore.h" -#include "gdbcmd.h" -#include "target.h" -#include "gdbthread.h" -#include "annotate.h" -#include "symfile.h" /* for overlay functions */ -#include "value.h" /* For old tm.h/nm.h macros. */ -#endif #include "symcat.h" #include "floatformat.h" @@ -161,7 +142,7 @@ struct gdbarch int pc_regnum; int ps_regnum; int fp0_regnum; - int npc_regnum; + int deprecated_npc_regnum; gdbarch_stab_reg_to_regnum_ftype *stab_reg_to_regnum; gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum; gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum; @@ -187,7 +168,7 @@ struct gdbarch gdbarch_deprecated_dummy_write_sp_ftype *deprecated_dummy_write_sp; int deprecated_register_size; int call_dummy_location; - gdbarch_call_dummy_address_ftype *call_dummy_address; + gdbarch_deprecated_call_dummy_address_ftype *deprecated_call_dummy_address; CORE_ADDR deprecated_call_dummy_start_offset; CORE_ADDR deprecated_call_dummy_breakpoint_offset; int deprecated_call_dummy_length; @@ -254,9 +235,10 @@ struct gdbarch 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_stack_align_ftype *stack_align; + gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; gdbarch_frame_align_ftype *frame_align; - gdbarch_reg_struct_has_addr_ftype *reg_struct_has_addr; + gdbarch_deprecated_reg_struct_has_addr_ftype *deprecated_reg_struct_has_addr; + int frame_red_zone_size; int parm_boundary; const struct floatformat * float_format; const struct floatformat * double_format; @@ -328,7 +310,7 @@ struct gdbarch startup_gdbarch = -1, /* pc_regnum */ -1, /* ps_regnum */ 0, /* fp0_regnum */ - 0, /* npc_regnum */ + 0, /* deprecated_npc_regnum */ 0, /* stab_reg_to_regnum */ 0, /* ecoff_reg_to_regnum */ 0, /* dwarf_reg_to_regnum */ @@ -354,7 +336,7 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_dummy_write_sp */ 0, /* deprecated_register_size */ 0, /* call_dummy_location */ - 0, /* call_dummy_address */ + 0, /* deprecated_call_dummy_address */ 0, /* deprecated_call_dummy_start_offset */ 0, /* deprecated_call_dummy_breakpoint_offset */ 0, /* deprecated_call_dummy_length */ @@ -421,9 +403,10 @@ struct gdbarch startup_gdbarch = get_frame_base, /* deprecated_frame_locals_address */ 0, /* deprecated_saved_pc_after_call */ 0, /* frame_num_args */ - 0, /* stack_align */ + 0, /* deprecated_stack_align */ 0, /* frame_align */ - 0, /* reg_struct_has_addr */ + 0, /* deprecated_reg_struct_has_addr */ + 0, /* frame_red_zone_size */ 0, /* parm_boundary */ 0, /* float_format */ 0, /* double_format */ @@ -518,7 +501,7 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->pc_regnum = -1; current_gdbarch->ps_regnum = -1; current_gdbarch->fp0_regnum = -1; - current_gdbarch->npc_regnum = -1; + current_gdbarch->deprecated_npc_regnum = -1; current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum; @@ -530,7 +513,6 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->deprecated_fp_regnum = -1; current_gdbarch->deprecated_use_generic_dummy_frames = 1; current_gdbarch->call_dummy_location = AT_ENTRY_POINT; - current_gdbarch->call_dummy_address = entry_point_address; current_gdbarch->deprecated_call_dummy_words = legacy_call_dummy_words; current_gdbarch->deprecated_sizeof_call_dummy_words = legacy_sizeof_call_dummy_words; current_gdbarch->print_registers_info = default_print_registers_info; @@ -561,7 +543,6 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->convert_from_func_ptr_addr = core_addr_identity; current_gdbarch->addr_bits_remove = core_addr_identity; current_gdbarch->smash_text_address = core_addr_identity; - current_gdbarch->print_insn = legacy_print_insn; current_gdbarch->skip_trampoline_code = generic_skip_trampoline_code; current_gdbarch->in_solib_call_trampoline = generic_in_solib_call_trampoline; current_gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline; @@ -616,9 +597,6 @@ verify_gdbarch (struct gdbarch *gdbarch) struct cleanup *cleanups; long dummy; char *buf; - /* Only perform sanity checks on a multi-arch target. */ - if (!GDB_MULTI_ARCH) - return; log = mem_fileopen (); cleanups = make_cleanup_ui_file_delete (log); /* fundamental */ @@ -654,7 +632,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of pc_regnum, invalid_p == 0 */ /* Skip verify of ps_regnum, invalid_p == 0 */ /* Skip verify of fp0_regnum, invalid_p == 0 */ - /* Skip verify of npc_regnum, invalid_p == 0 */ + /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */ /* Skip verify of stab_reg_to_regnum, invalid_p == 0 */ /* Skip verify of ecoff_reg_to_regnum, invalid_p == 0 */ /* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */ @@ -677,7 +655,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of deprecated_push_return_address, has predicate */ /* Skip verify of deprecated_dummy_write_sp, has predicate */ /* Skip verify of call_dummy_location, invalid_p == 0 */ - /* Skip verify of call_dummy_address, invalid_p == 0 */ + /* Skip verify of deprecated_call_dummy_address, has predicate */ /* Skip verify of deprecated_call_dummy_words, invalid_p == 0 */ /* Skip verify of deprecated_sizeof_call_dummy_words, invalid_p == 0 */ /* Skip verify of deprecated_call_dummy_stack_adjust, has predicate */ @@ -749,9 +727,9 @@ verify_gdbarch (struct gdbarch *gdbarch) /* 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 stack_align, has predicate */ + /* Skip verify of deprecated_stack_align, has predicate */ /* Skip verify of frame_align, has predicate */ - /* Skip verify of reg_struct_has_addr, has predicate */ + /* Skip verify of deprecated_reg_struct_has_addr, has predicate */ if (gdbarch->float_format == 0) gdbarch->float_format = default_float_format (gdbarch); if (gdbarch->double_format == 0) @@ -762,7 +740,9 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of addr_bits_remove, invalid_p == 0 */ /* Skip verify of smash_text_address, invalid_p == 0 */ /* Skip verify of software_single_step, has predicate */ - /* Skip verify of print_insn, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) + && (gdbarch->print_insn == 0)) + fprintf_unfiltered (log, "\n\tprint_insn"); /* Skip verify of skip_trampoline_code, invalid_p == 0 */ /* Skip verify of in_solib_call_trampoline, invalid_p == 0 */ /* Skip verify of in_solib_return_trampoline, invalid_p == 0 */ @@ -805,46 +785,36 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: GDB_MULTI_ARCH = %d\n", GDB_MULTI_ARCH); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_frame_align_p() = %d\n", - gdbarch_frame_align_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: frame_align = 0x%08lx\n", - (long) current_gdbarch->frame_align); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: in_function_epilogue_p = 0x%08lx\n", - (long) current_gdbarch->in_function_epilogue_p); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: register_reggroup_p = 0x%08lx\n", - (long) current_gdbarch->register_reggroup_p); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_pseudo_register_read_p() = %d\n", - gdbarch_pseudo_register_read_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: pseudo_register_read = 0x%08lx\n", - (long) current_gdbarch->pseudo_register_read); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_pseudo_register_write_p() = %d\n", - gdbarch_pseudo_register_write_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: pseudo_register_write = 0x%08lx\n", - (long) current_gdbarch->pseudo_register_write); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_address_class_name_to_type_flags_p() = %d\n", - gdbarch_address_class_name_to_type_flags_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: address_class_name_to_type_flags = 0x%08lx\n", - (long) current_gdbarch->address_class_name_to_type_flags); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_frame_align_p() = %d\n", + gdbarch_frame_align_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: frame_align = 0x%08lx\n", + (long) current_gdbarch->frame_align); + fprintf_unfiltered (file, + "gdbarch_dump: in_function_epilogue_p = 0x%08lx\n", + (long) current_gdbarch->in_function_epilogue_p); + fprintf_unfiltered (file, + "gdbarch_dump: register_reggroup_p = 0x%08lx\n", + (long) current_gdbarch->register_reggroup_p); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_pseudo_register_read_p() = %d\n", + gdbarch_pseudo_register_read_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: pseudo_register_read = 0x%08lx\n", + (long) current_gdbarch->pseudo_register_read); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_pseudo_register_write_p() = %d\n", + gdbarch_pseudo_register_write_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: pseudo_register_write = 0x%08lx\n", + (long) current_gdbarch->pseudo_register_write); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_address_class_name_to_type_flags_p() = %d\n", + gdbarch_address_class_name_to_type_flags_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: address_class_name_to_type_flags = 0x%08lx\n", + (long) current_gdbarch->address_class_name_to_type_flags); #ifdef ADDRESS_CLASS_TYPE_FLAGS_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -859,44 +829,36 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "ADDRESS_CLASS_TYPE_FLAGS(byte_size, dwarf2_addr_class)", XSTRING (ADDRESS_CLASS_TYPE_FLAGS (byte_size, dwarf2_addr_class))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: ADDRESS_CLASS_TYPE_FLAGS = <0x%08lx>\n", - (long) current_gdbarch->address_class_type_flags - /*ADDRESS_CLASS_TYPE_FLAGS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: ADDRESS_CLASS_TYPE_FLAGS = <0x%08lx>\n", + (long) current_gdbarch->address_class_type_flags + /*ADDRESS_CLASS_TYPE_FLAGS ()*/); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_address_class_type_flags_to_name_p() = %d\n", - gdbarch_address_class_type_flags_to_name_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: address_class_type_flags_to_name = 0x%08lx\n", - (long) current_gdbarch->address_class_type_flags_to_name); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_address_class_type_flags_to_name_p() = %d\n", + gdbarch_address_class_type_flags_to_name_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: address_class_type_flags_to_name = 0x%08lx\n", + (long) current_gdbarch->address_class_type_flags_to_name); #ifdef ADDRESS_TO_POINTER -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "ADDRESS_TO_POINTER(type, buf, addr)", XSTRING (ADDRESS_TO_POINTER (type, buf, addr))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: ADDRESS_TO_POINTER = <0x%08lx>\n", - (long) current_gdbarch->address_to_pointer - /*ADDRESS_TO_POINTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: ADDRESS_TO_POINTER = <0x%08lx>\n", + (long) current_gdbarch->address_to_pointer + /*ADDRESS_TO_POINTER ()*/); #endif #ifdef ADDR_BITS_REMOVE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "ADDR_BITS_REMOVE(addr)", XSTRING (ADDR_BITS_REMOVE (addr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: ADDR_BITS_REMOVE = <0x%08lx>\n", - (long) current_gdbarch->addr_bits_remove - /*ADDR_BITS_REMOVE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: ADDR_BITS_REMOVE = <0x%08lx>\n", + (long) current_gdbarch->addr_bits_remove + /*ADDR_BITS_REMOVE ()*/); #endif #ifdef BELIEVE_PCC_PROMOTION fprintf_unfiltered (file, @@ -919,22 +881,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "BREAKPOINT_FROM_PC(pcptr, lenptr)", XSTRING (BREAKPOINT_FROM_PC (pcptr, lenptr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: BREAKPOINT_FROM_PC = <0x%08lx>\n", - (long) current_gdbarch->breakpoint_from_pc - /*BREAKPOINT_FROM_PC ()*/); -#endif -#ifdef CALL_DUMMY_ADDRESS fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "CALL_DUMMY_ADDRESS()", - XSTRING (CALL_DUMMY_ADDRESS ())); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->call_dummy_address - /*CALL_DUMMY_ADDRESS ()*/); + "gdbarch_dump: BREAKPOINT_FROM_PC = <0x%08lx>\n", + (long) current_gdbarch->breakpoint_from_pc + /*BREAKPOINT_FROM_PC ()*/); #endif #ifdef CALL_DUMMY_LOCATION fprintf_unfiltered (file, @@ -949,11 +899,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "CANNOT_FETCH_REGISTER(regnum)", XSTRING (CANNOT_FETCH_REGISTER (regnum))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: CANNOT_FETCH_REGISTER = <0x%08lx>\n", - (long) current_gdbarch->cannot_fetch_register - /*CANNOT_FETCH_REGISTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: CANNOT_FETCH_REGISTER = <0x%08lx>\n", + (long) current_gdbarch->cannot_fetch_register + /*CANNOT_FETCH_REGISTER ()*/); #endif #ifdef CANNOT_STEP_BREAKPOINT fprintf_unfiltered (file, @@ -968,51 +917,43 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "CANNOT_STORE_REGISTER(regnum)", XSTRING (CANNOT_STORE_REGISTER (regnum))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: CANNOT_STORE_REGISTER = <0x%08lx>\n", - (long) current_gdbarch->cannot_store_register - /*CANNOT_STORE_REGISTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: CANNOT_STORE_REGISTER = <0x%08lx>\n", + (long) current_gdbarch->cannot_store_register + /*CANNOT_STORE_REGISTER ()*/); #endif #ifdef COFF_MAKE_MSYMBOL_SPECIAL -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "COFF_MAKE_MSYMBOL_SPECIAL(val, msym)", XSTRING (COFF_MAKE_MSYMBOL_SPECIAL (val, msym))); + fprintf_unfiltered (file, + "gdbarch_dump: COFF_MAKE_MSYMBOL_SPECIAL = <0x%08lx>\n", + (long) current_gdbarch->coff_make_msymbol_special + /*COFF_MAKE_MSYMBOL_SPECIAL ()*/); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: COFF_MAKE_MSYMBOL_SPECIAL = <0x%08lx>\n", - (long) current_gdbarch->coff_make_msymbol_special - /*COFF_MAKE_MSYMBOL_SPECIAL ()*/); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: construct_inferior_arguments = 0x%08lx\n", - (long) current_gdbarch->construct_inferior_arguments); + fprintf_unfiltered (file, + "gdbarch_dump: construct_inferior_arguments = 0x%08lx\n", + (long) current_gdbarch->construct_inferior_arguments); #ifdef CONVERT_FROM_FUNC_PTR_ADDR fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "CONVERT_FROM_FUNC_PTR_ADDR(addr)", XSTRING (CONVERT_FROM_FUNC_PTR_ADDR (addr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: CONVERT_FROM_FUNC_PTR_ADDR = <0x%08lx>\n", - (long) current_gdbarch->convert_from_func_ptr_addr - /*CONVERT_FROM_FUNC_PTR_ADDR ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: CONVERT_FROM_FUNC_PTR_ADDR = <0x%08lx>\n", + (long) current_gdbarch->convert_from_func_ptr_addr + /*CONVERT_FROM_FUNC_PTR_ADDR ()*/); #endif #ifdef CONVERT_REGISTER_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "CONVERT_REGISTER_P(regnum, type)", XSTRING (CONVERT_REGISTER_P (regnum, type))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: CONVERT_REGISTER_P = <0x%08lx>\n", - (long) current_gdbarch->convert_register_p - /*CONVERT_REGISTER_P ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: CONVERT_REGISTER_P = <0x%08lx>\n", + (long) current_gdbarch->convert_register_p + /*CONVERT_REGISTER_P ()*/); #endif #ifdef DECR_PC_AFTER_BREAK fprintf_unfiltered (file, @@ -1022,6 +963,25 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n", (long) DECR_PC_AFTER_BREAK); #endif +#ifdef DEPRECATED_CALL_DUMMY_ADDRESS_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_CALL_DUMMY_ADDRESS_P()", + XSTRING (DEPRECATED_CALL_DUMMY_ADDRESS_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_CALL_DUMMY_ADDRESS_P() = %d\n", + DEPRECATED_CALL_DUMMY_ADDRESS_P ()); +#endif +#ifdef DEPRECATED_CALL_DUMMY_ADDRESS + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_CALL_DUMMY_ADDRESS()", + XSTRING (DEPRECATED_CALL_DUMMY_ADDRESS ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_CALL_DUMMY_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_call_dummy_address + /*DEPRECATED_CALL_DUMMY_ADDRESS ()*/); +#endif #ifdef DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET # %s\n", @@ -1081,18 +1041,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_DO_REGISTERS_INFO_P ()); #endif #ifdef DEPRECATED_DO_REGISTERS_INFO -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_DO_REGISTERS_INFO(reg_nr, fpregs)", XSTRING (DEPRECATED_DO_REGISTERS_INFO (reg_nr, fpregs))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_DO_REGISTERS_INFO = <0x%08lx>\n", - (long) current_gdbarch->deprecated_do_registers_info - /*DEPRECATED_DO_REGISTERS_INFO ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_DO_REGISTERS_INFO = <0x%08lx>\n", + (long) current_gdbarch->deprecated_do_registers_info + /*DEPRECATED_DO_REGISTERS_INFO ()*/); #endif #ifdef DEPRECATED_DUMMY_WRITE_SP_P fprintf_unfiltered (file, @@ -1104,32 +1060,24 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_DUMMY_WRITE_SP_P ()); #endif #ifdef DEPRECATED_DUMMY_WRITE_SP -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_DUMMY_WRITE_SP(val)", XSTRING (DEPRECATED_DUMMY_WRITE_SP (val))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_DUMMY_WRITE_SP = <0x%08lx>\n", - (long) current_gdbarch->deprecated_dummy_write_sp - /*DEPRECATED_DUMMY_WRITE_SP ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_DUMMY_WRITE_SP = <0x%08lx>\n", + (long) current_gdbarch->deprecated_dummy_write_sp + /*DEPRECATED_DUMMY_WRITE_SP ()*/); #endif #ifdef DEPRECATED_EXTRACT_RETURN_VALUE -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_EXTRACT_RETURN_VALUE(type, regbuf, valbuf)", XSTRING (DEPRECATED_EXTRACT_RETURN_VALUE (type, regbuf, valbuf))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_EXTRACT_RETURN_VALUE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_extract_return_value - /*DEPRECATED_EXTRACT_RETURN_VALUE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_EXTRACT_RETURN_VALUE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_extract_return_value + /*DEPRECATED_EXTRACT_RETURN_VALUE ()*/); #endif #ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P fprintf_unfiltered (file, @@ -1145,11 +1093,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regbuf)", XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (regbuf))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_extract_struct_value_address - /*DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_extract_struct_value_address + /*DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif #ifdef DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED fprintf_unfiltered (file, @@ -1169,18 +1116,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_FIX_CALL_DUMMY_P ()); #endif #ifdef DEPRECATED_FIX_CALL_DUMMY -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p)", XSTRING (DEPRECATED_FIX_CALL_DUMMY (dummy, pc, fun, nargs, args, type, gcc_p))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FIX_CALL_DUMMY = <0x%08lx>\n", - (long) current_gdbarch->deprecated_fix_call_dummy - /*DEPRECATED_FIX_CALL_DUMMY ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FIX_CALL_DUMMY = <0x%08lx>\n", + (long) current_gdbarch->deprecated_fix_call_dummy + /*DEPRECATED_FIX_CALL_DUMMY ()*/); #endif #ifdef DEPRECATED_FP_REGNUM fprintf_unfiltered (file, @@ -1204,11 +1147,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_FRAME_ARGS_ADDRESS(fi)", XSTRING (DEPRECATED_FRAME_ARGS_ADDRESS (fi))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FRAME_ARGS_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_frame_args_address - /*DEPRECATED_FRAME_ARGS_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_ARGS_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_args_address + /*DEPRECATED_FRAME_ARGS_ADDRESS ()*/); #endif #ifdef DEPRECATED_FRAME_CHAIN_P fprintf_unfiltered (file, @@ -1224,11 +1166,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_FRAME_CHAIN(frame)", XSTRING (DEPRECATED_FRAME_CHAIN (frame))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FRAME_CHAIN = <0x%08lx>\n", - (long) current_gdbarch->deprecated_frame_chain - /*DEPRECATED_FRAME_CHAIN ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_CHAIN = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_chain + /*DEPRECATED_FRAME_CHAIN ()*/); #endif #ifdef DEPRECATED_FRAME_CHAIN_VALID_P fprintf_unfiltered (file, @@ -1244,11 +1185,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_FRAME_CHAIN_VALID(chain, thisframe)", XSTRING (DEPRECATED_FRAME_CHAIN_VALID (chain, thisframe))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FRAME_CHAIN_VALID = <0x%08lx>\n", - (long) current_gdbarch->deprecated_frame_chain_valid - /*DEPRECATED_FRAME_CHAIN_VALID ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_CHAIN_VALID = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_chain_valid + /*DEPRECATED_FRAME_CHAIN_VALID ()*/); #endif #ifdef DEPRECATED_FRAME_INIT_SAVED_REGS_P fprintf_unfiltered (file, @@ -1260,18 +1200,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) 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 ()*/); + 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_FRAME_LOCALS_ADDRESS_P fprintf_unfiltered (file, @@ -1287,11 +1223,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_FRAME_LOCALS_ADDRESS(fi)", XSTRING (DEPRECATED_FRAME_LOCALS_ADDRESS (fi))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FRAME_LOCALS_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_frame_locals_address - /*DEPRECATED_FRAME_LOCALS_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_LOCALS_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_locals_address + /*DEPRECATED_FRAME_LOCALS_ADDRESS ()*/); #endif #ifdef DEPRECATED_FRAME_SAVED_PC_P fprintf_unfiltered (file, @@ -1307,11 +1242,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_FRAME_SAVED_PC(fi)", XSTRING (DEPRECATED_FRAME_SAVED_PC (fi))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FRAME_SAVED_PC = <0x%08lx>\n", - (long) current_gdbarch->deprecated_frame_saved_pc - /*DEPRECATED_FRAME_SAVED_PC ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAME_SAVED_PC = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frame_saved_pc + /*DEPRECATED_FRAME_SAVED_PC ()*/); #endif #ifdef DEPRECATED_GET_SAVED_REGISTER_P fprintf_unfiltered (file, @@ -1323,18 +1257,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_GET_SAVED_REGISTER_P ()); #endif #ifdef DEPRECATED_GET_SAVED_REGISTER -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ 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 - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_GET_SAVED_REGISTER = <0x%08lx>\n", - (long) current_gdbarch->deprecated_get_saved_register - /*DEPRECATED_GET_SAVED_REGISTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_GET_SAVED_REGISTER = <0x%08lx>\n", + (long) current_gdbarch->deprecated_get_saved_register + /*DEPRECATED_GET_SAVED_REGISTER ()*/); #endif #ifdef DEPRECATED_INIT_EXTRA_FRAME_INFO_P fprintf_unfiltered (file, @@ -1346,18 +1276,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_INIT_EXTRA_FRAME_INFO_P ()); #endif #ifdef DEPRECATED_INIT_EXTRA_FRAME_INFO -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_INIT_EXTRA_FRAME_INFO(fromleaf, frame)", XSTRING (DEPRECATED_INIT_EXTRA_FRAME_INFO (fromleaf, frame))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_INIT_EXTRA_FRAME_INFO = <0x%08lx>\n", - (long) current_gdbarch->deprecated_init_extra_frame_info - /*DEPRECATED_INIT_EXTRA_FRAME_INFO ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_INIT_EXTRA_FRAME_INFO = <0x%08lx>\n", + (long) current_gdbarch->deprecated_init_extra_frame_info + /*DEPRECATED_INIT_EXTRA_FRAME_INFO ()*/); #endif #ifdef DEPRECATED_INIT_FRAME_PC_P fprintf_unfiltered (file, @@ -1373,11 +1299,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_INIT_FRAME_PC(fromleaf, prev)", XSTRING (DEPRECATED_INIT_FRAME_PC (fromleaf, prev))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_INIT_FRAME_PC = <0x%08lx>\n", - (long) current_gdbarch->deprecated_init_frame_pc - /*DEPRECATED_INIT_FRAME_PC ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_INIT_FRAME_PC = <0x%08lx>\n", + (long) current_gdbarch->deprecated_init_frame_pc + /*DEPRECATED_INIT_FRAME_PC ()*/); #endif #ifdef DEPRECATED_INIT_FRAME_PC_FIRST_P fprintf_unfiltered (file, @@ -1393,11 +1318,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev)", XSTRING (DEPRECATED_INIT_FRAME_PC_FIRST (fromleaf, prev))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_INIT_FRAME_PC_FIRST = <0x%08lx>\n", - (long) current_gdbarch->deprecated_init_frame_pc_first - /*DEPRECATED_INIT_FRAME_PC_FIRST ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_INIT_FRAME_PC_FIRST = <0x%08lx>\n", + (long) current_gdbarch->deprecated_init_frame_pc_first + /*DEPRECATED_INIT_FRAME_PC_FIRST ()*/); #endif #ifdef DEPRECATED_MAX_REGISTER_RAW_SIZE_P fprintf_unfiltered (file, @@ -1433,6 +1357,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE = %d\n", DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE); #endif +#ifdef DEPRECATED_NPC_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_NPC_REGNUM # %s\n", + XSTRING (DEPRECATED_NPC_REGNUM)); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_NPC_REGNUM = %d\n", + DEPRECATED_NPC_REGNUM); +#endif #ifdef DEPRECATED_PC_IN_CALL_DUMMY_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1447,11 +1379,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_PC_IN_CALL_DUMMY(pc, sp, frame_address)", XSTRING (DEPRECATED_PC_IN_CALL_DUMMY (pc, sp, frame_address))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_PC_IN_CALL_DUMMY = <0x%08lx>\n", - (long) current_gdbarch->deprecated_pc_in_call_dummy - /*DEPRECATED_PC_IN_CALL_DUMMY ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_PC_IN_CALL_DUMMY = <0x%08lx>\n", + (long) current_gdbarch->deprecated_pc_in_call_dummy + /*DEPRECATED_PC_IN_CALL_DUMMY ()*/); #endif #ifdef DEPRECATED_POP_FRAME_P fprintf_unfiltered (file, @@ -1463,18 +1394,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_POP_FRAME_P ()); #endif #ifdef DEPRECATED_POP_FRAME -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_POP_FRAME(-)", XSTRING (DEPRECATED_POP_FRAME (-))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_POP_FRAME = <0x%08lx>\n", - (long) current_gdbarch->deprecated_pop_frame - /*DEPRECATED_POP_FRAME ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_POP_FRAME = <0x%08lx>\n", + (long) current_gdbarch->deprecated_pop_frame + /*DEPRECATED_POP_FRAME ()*/); #endif #ifdef DEPRECATED_PUSH_ARGUMENTS_P fprintf_unfiltered (file, @@ -1490,11 +1417,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr)", XSTRING (DEPRECATED_PUSH_ARGUMENTS (nargs, args, sp, struct_return, struct_addr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_PUSH_ARGUMENTS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_push_arguments - /*DEPRECATED_PUSH_ARGUMENTS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_PUSH_ARGUMENTS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_push_arguments + /*DEPRECATED_PUSH_ARGUMENTS ()*/); #endif #ifdef DEPRECATED_PUSH_DUMMY_FRAME_P fprintf_unfiltered (file, @@ -1506,18 +1432,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_PUSH_DUMMY_FRAME_P ()); #endif #ifdef DEPRECATED_PUSH_DUMMY_FRAME -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_PUSH_DUMMY_FRAME(-)", XSTRING (DEPRECATED_PUSH_DUMMY_FRAME (-))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_PUSH_DUMMY_FRAME = <0x%08lx>\n", - (long) current_gdbarch->deprecated_push_dummy_frame - /*DEPRECATED_PUSH_DUMMY_FRAME ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_PUSH_DUMMY_FRAME = <0x%08lx>\n", + (long) current_gdbarch->deprecated_push_dummy_frame + /*DEPRECATED_PUSH_DUMMY_FRAME ()*/); #endif #ifdef DEPRECATED_PUSH_RETURN_ADDRESS_P fprintf_unfiltered (file, @@ -1533,11 +1455,29 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_PUSH_RETURN_ADDRESS(pc, sp)", XSTRING (DEPRECATED_PUSH_RETURN_ADDRESS (pc, sp))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_PUSH_RETURN_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_push_return_address - /*DEPRECATED_PUSH_RETURN_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_PUSH_RETURN_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_push_return_address + /*DEPRECATED_PUSH_RETURN_ADDRESS ()*/); +#endif +#ifdef DEPRECATED_REGISTER_BYTE_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REGISTER_BYTE_P()", + XSTRING (DEPRECATED_REGISTER_BYTE_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_BYTE_P() = %d\n", + DEPRECATED_REGISTER_BYTE_P ()); +#endif +#ifdef DEPRECATED_REGISTER_BYTE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REGISTER_BYTE(reg_nr)", + XSTRING (DEPRECATED_REGISTER_BYTE (reg_nr))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_BYTE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_byte + /*DEPRECATED_REGISTER_BYTE ()*/); #endif #ifdef DEPRECATED_REGISTER_BYTES fprintf_unfiltered (file, @@ -1552,39 +1492,30 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_REGISTER_CONVERTIBLE(nr)", XSTRING (DEPRECATED_REGISTER_CONVERTIBLE (nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_REGISTER_CONVERTIBLE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_convertible - /*DEPRECATED_REGISTER_CONVERTIBLE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_CONVERTIBLE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_convertible + /*DEPRECATED_REGISTER_CONVERTIBLE ()*/); #endif #ifdef DEPRECATED_REGISTER_CONVERT_TO_RAW -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_REGISTER_CONVERT_TO_RAW(type, regnum, from, to)", XSTRING (DEPRECATED_REGISTER_CONVERT_TO_RAW (type, regnum, from, to))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_REGISTER_CONVERT_TO_RAW = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_convert_to_raw - /*DEPRECATED_REGISTER_CONVERT_TO_RAW ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_CONVERT_TO_RAW = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_convert_to_raw + /*DEPRECATED_REGISTER_CONVERT_TO_RAW ()*/); #endif #ifdef DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL(regnum, type, from, to)", XSTRING (DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL (regnum, type, from, to))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_convert_to_virtual - /*DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_convert_to_virtual + /*DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL ()*/); #endif #ifdef DEPRECATED_REGISTER_SIZE fprintf_unfiltered (file, @@ -1594,6 +1525,25 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_REGISTER_SIZE = %d\n", DEPRECATED_REGISTER_SIZE); #endif +#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REG_STRUCT_HAS_ADDR_P()", + XSTRING (DEPRECATED_REG_STRUCT_HAS_ADDR_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REG_STRUCT_HAS_ADDR_P() = %d\n", + DEPRECATED_REG_STRUCT_HAS_ADDR_P ()); +#endif +#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REG_STRUCT_HAS_ADDR(gcc_p, type)", + XSTRING (DEPRECATED_REG_STRUCT_HAS_ADDR (gcc_p, type))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REG_STRUCT_HAS_ADDR = <0x%08lx>\n", + (long) current_gdbarch->deprecated_reg_struct_has_addr + /*DEPRECATED_REG_STRUCT_HAS_ADDR ()*/); +#endif #ifdef DEPRECATED_SAVED_PC_AFTER_CALL_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1608,11 +1558,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_SAVED_PC_AFTER_CALL(frame)", XSTRING (DEPRECATED_SAVED_PC_AFTER_CALL (frame))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_SAVED_PC_AFTER_CALL = <0x%08lx>\n", - (long) current_gdbarch->deprecated_saved_pc_after_call - /*DEPRECATED_SAVED_PC_AFTER_CALL ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_SAVED_PC_AFTER_CALL = <0x%08lx>\n", + (long) current_gdbarch->deprecated_saved_pc_after_call + /*DEPRECATED_SAVED_PC_AFTER_CALL ()*/); #endif #ifdef DEPRECATED_SAVE_DUMMY_FRAME_TOS_P fprintf_unfiltered (file, @@ -1624,18 +1573,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ()); #endif #ifdef DEPRECATED_SAVE_DUMMY_FRAME_TOS -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_SAVE_DUMMY_FRAME_TOS(sp)", XSTRING (DEPRECATED_SAVE_DUMMY_FRAME_TOS (sp))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_SAVE_DUMMY_FRAME_TOS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_save_dummy_frame_tos - /*DEPRECATED_SAVE_DUMMY_FRAME_TOS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_SAVE_DUMMY_FRAME_TOS = <0x%08lx>\n", + (long) current_gdbarch->deprecated_save_dummy_frame_tos + /*DEPRECATED_SAVE_DUMMY_FRAME_TOS ()*/); #endif #ifdef DEPRECATED_SIZEOF_CALL_DUMMY_WORDS fprintf_unfiltered (file, @@ -1645,19 +1590,34 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_SIZEOF_CALL_DUMMY_WORDS = %d\n", DEPRECATED_SIZEOF_CALL_DUMMY_WORDS); #endif +#ifdef DEPRECATED_STACK_ALIGN_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_STACK_ALIGN_P()", + XSTRING (DEPRECATED_STACK_ALIGN_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_STACK_ALIGN_P() = %d\n", + DEPRECATED_STACK_ALIGN_P ()); +#endif +#ifdef DEPRECATED_STACK_ALIGN + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_STACK_ALIGN(sp)", + XSTRING (DEPRECATED_STACK_ALIGN (sp))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_STACK_ALIGN = <0x%08lx>\n", + (long) current_gdbarch->deprecated_stack_align + /*DEPRECATED_STACK_ALIGN ()*/); +#endif #ifdef DEPRECATED_STORE_RETURN_VALUE -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_STORE_RETURN_VALUE(type, valbuf)", XSTRING (DEPRECATED_STORE_RETURN_VALUE (type, valbuf))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_STORE_RETURN_VALUE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_store_return_value - /*DEPRECATED_STORE_RETURN_VALUE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_STORE_RETURN_VALUE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_store_return_value + /*DEPRECATED_STORE_RETURN_VALUE ()*/); #endif #ifdef DEPRECATED_STORE_STRUCT_RETURN_P fprintf_unfiltered (file, @@ -1669,18 +1629,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) DEPRECATED_STORE_STRUCT_RETURN_P ()); #endif #ifdef DEPRECATED_STORE_STRUCT_RETURN -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DEPRECATED_STORE_STRUCT_RETURN(addr, sp)", XSTRING (DEPRECATED_STORE_STRUCT_RETURN (addr, sp))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_STORE_STRUCT_RETURN = <0x%08lx>\n", - (long) current_gdbarch->deprecated_store_struct_return - /*DEPRECATED_STORE_STRUCT_RETURN ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_STORE_STRUCT_RETURN = <0x%08lx>\n", + (long) current_gdbarch->deprecated_store_struct_return + /*DEPRECATED_STORE_STRUCT_RETURN ()*/); #endif #ifdef DEPRECATED_TARGET_READ_FP_P fprintf_unfiltered (file, @@ -1696,11 +1652,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DEPRECATED_TARGET_READ_FP()", XSTRING (DEPRECATED_TARGET_READ_FP ())); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_TARGET_READ_FP = <0x%08lx>\n", - (long) current_gdbarch->deprecated_target_read_fp - /*DEPRECATED_TARGET_READ_FP ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_TARGET_READ_FP = <0x%08lx>\n", + (long) current_gdbarch->deprecated_target_read_fp + /*DEPRECATED_TARGET_READ_FP ()*/); #endif #ifdef DEPRECATED_USE_GENERIC_DUMMY_FRAMES fprintf_unfiltered (file, @@ -1715,61 +1670,50 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "DWARF2_REG_TO_REGNUM(dwarf2_regnr)", XSTRING (DWARF2_REG_TO_REGNUM (dwarf2_regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DWARF2_REG_TO_REGNUM = <0x%08lx>\n", - (long) current_gdbarch->dwarf2_reg_to_regnum - /*DWARF2_REG_TO_REGNUM ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DWARF2_REG_TO_REGNUM = <0x%08lx>\n", + (long) current_gdbarch->dwarf2_reg_to_regnum + /*DWARF2_REG_TO_REGNUM ()*/); #endif #ifdef DWARF_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "DWARF_REG_TO_REGNUM(dwarf_regnr)", XSTRING (DWARF_REG_TO_REGNUM (dwarf_regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: DWARF_REG_TO_REGNUM = <0x%08lx>\n", - (long) current_gdbarch->dwarf_reg_to_regnum - /*DWARF_REG_TO_REGNUM ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: DWARF_REG_TO_REGNUM = <0x%08lx>\n", + (long) current_gdbarch->dwarf_reg_to_regnum + /*DWARF_REG_TO_REGNUM ()*/); #endif #ifdef ECOFF_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "ECOFF_REG_TO_REGNUM(ecoff_regnr)", XSTRING (ECOFF_REG_TO_REGNUM (ecoff_regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: ECOFF_REG_TO_REGNUM = <0x%08lx>\n", - (long) current_gdbarch->ecoff_reg_to_regnum - /*ECOFF_REG_TO_REGNUM ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: ECOFF_REG_TO_REGNUM = <0x%08lx>\n", + (long) current_gdbarch->ecoff_reg_to_regnum + /*ECOFF_REG_TO_REGNUM ()*/); #endif #ifdef ELF_MAKE_MSYMBOL_SPECIAL -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "ELF_MAKE_MSYMBOL_SPECIAL(sym, msym)", XSTRING (ELF_MAKE_MSYMBOL_SPECIAL (sym, msym))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: ELF_MAKE_MSYMBOL_SPECIAL = <0x%08lx>\n", - (long) current_gdbarch->elf_make_msymbol_special - /*ELF_MAKE_MSYMBOL_SPECIAL ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: ELF_MAKE_MSYMBOL_SPECIAL = <0x%08lx>\n", + (long) current_gdbarch->elf_make_msymbol_special + /*ELF_MAKE_MSYMBOL_SPECIAL ()*/); #endif #ifdef EXTRACT_RETURN_VALUE -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "EXTRACT_RETURN_VALUE(type, regcache, valbuf)", XSTRING (EXTRACT_RETURN_VALUE (type, regcache, valbuf))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: EXTRACT_RETURN_VALUE = <0x%08lx>\n", - (long) current_gdbarch->extract_return_value - /*EXTRACT_RETURN_VALUE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: EXTRACT_RETURN_VALUE = <0x%08lx>\n", + (long) current_gdbarch->extract_return_value + /*EXTRACT_RETURN_VALUE ()*/); #endif #ifdef EXTRACT_STRUCT_VALUE_ADDRESS_P fprintf_unfiltered (file, @@ -1785,11 +1729,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "EXTRACT_STRUCT_VALUE_ADDRESS(regcache)", XSTRING (EXTRACT_STRUCT_VALUE_ADDRESS (regcache))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: EXTRACT_STRUCT_VALUE_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->extract_struct_value_address - /*EXTRACT_STRUCT_VALUE_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: EXTRACT_STRUCT_VALUE_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->extract_struct_value_address + /*EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif #ifdef FETCH_POINTER_ARGUMENT_P fprintf_unfiltered (file, @@ -1805,11 +1748,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "FETCH_POINTER_ARGUMENT(frame, argi, type)", XSTRING (FETCH_POINTER_ARGUMENT (frame, argi, type))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FETCH_POINTER_ARGUMENT = <0x%08lx>\n", - (long) current_gdbarch->fetch_pointer_argument - /*FETCH_POINTER_ARGUMENT ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: FETCH_POINTER_ARGUMENT = <0x%08lx>\n", + (long) current_gdbarch->fetch_pointer_argument + /*FETCH_POINTER_ARGUMENT ()*/); #endif #ifdef FP0_REGNUM fprintf_unfiltered (file, @@ -1824,11 +1766,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "FRAMELESS_FUNCTION_INVOCATION(fi)", XSTRING (FRAMELESS_FUNCTION_INVOCATION (fi))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAMELESS_FUNCTION_INVOCATION = <0x%08lx>\n", - (long) current_gdbarch->frameless_function_invocation - /*FRAMELESS_FUNCTION_INVOCATION ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: FRAMELESS_FUNCTION_INVOCATION = <0x%08lx>\n", + (long) current_gdbarch->frameless_function_invocation + /*FRAMELESS_FUNCTION_INVOCATION ()*/); #endif #ifdef FRAME_ARGS_SKIP fprintf_unfiltered (file, @@ -1852,11 +1793,18 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "FRAME_NUM_ARGS(frame)", XSTRING (FRAME_NUM_ARGS (frame))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_NUM_ARGS = <0x%08lx>\n", - (long) current_gdbarch->frame_num_args - /*FRAME_NUM_ARGS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_NUM_ARGS = <0x%08lx>\n", + (long) current_gdbarch->frame_num_args + /*FRAME_NUM_ARGS ()*/); +#endif +#ifdef FRAME_RED_ZONE_SIZE + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_RED_ZONE_SIZE # %s\n", + XSTRING (FRAME_RED_ZONE_SIZE)); + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_RED_ZONE_SIZE = %d\n", + FRAME_RED_ZONE_SIZE); #endif #ifdef FUNCTION_START_OFFSET fprintf_unfiltered (file, @@ -1880,11 +1828,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "GET_LONGJMP_TARGET(pc)", XSTRING (GET_LONGJMP_TARGET (pc))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: GET_LONGJMP_TARGET = <0x%08lx>\n", - (long) current_gdbarch->get_longjmp_target - /*GET_LONGJMP_TARGET ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: GET_LONGJMP_TARGET = <0x%08lx>\n", + (long) current_gdbarch->get_longjmp_target + /*GET_LONGJMP_TARGET ()*/); #endif #ifdef HAVE_NONSTEPPABLE_WATCHPOINT fprintf_unfiltered (file, @@ -1899,11 +1846,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "INNER_THAN(lhs, rhs)", XSTRING (INNER_THAN (lhs, rhs))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: INNER_THAN = <0x%08lx>\n", - (long) current_gdbarch->inner_than - /*INNER_THAN ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: INNER_THAN = <0x%08lx>\n", + (long) current_gdbarch->inner_than + /*INNER_THAN ()*/); #endif #ifdef INTEGER_TO_ADDRESS_P fprintf_unfiltered (file, @@ -1919,55 +1865,50 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "INTEGER_TO_ADDRESS(type, buf)", XSTRING (INTEGER_TO_ADDRESS (type, buf))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: INTEGER_TO_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->integer_to_address - /*INTEGER_TO_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: INTEGER_TO_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->integer_to_address + /*INTEGER_TO_ADDRESS ()*/); #endif #ifdef IN_SOLIB_CALL_TRAMPOLINE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "IN_SOLIB_CALL_TRAMPOLINE(pc, name)", XSTRING (IN_SOLIB_CALL_TRAMPOLINE (pc, name))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: IN_SOLIB_CALL_TRAMPOLINE = <0x%08lx>\n", - (long) current_gdbarch->in_solib_call_trampoline - /*IN_SOLIB_CALL_TRAMPOLINE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: IN_SOLIB_CALL_TRAMPOLINE = <0x%08lx>\n", + (long) current_gdbarch->in_solib_call_trampoline + /*IN_SOLIB_CALL_TRAMPOLINE ()*/); #endif #ifdef IN_SOLIB_RETURN_TRAMPOLINE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "IN_SOLIB_RETURN_TRAMPOLINE(pc, name)", XSTRING (IN_SOLIB_RETURN_TRAMPOLINE (pc, name))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: IN_SOLIB_RETURN_TRAMPOLINE = <0x%08lx>\n", - (long) current_gdbarch->in_solib_return_trampoline - /*IN_SOLIB_RETURN_TRAMPOLINE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: IN_SOLIB_RETURN_TRAMPOLINE = <0x%08lx>\n", + (long) current_gdbarch->in_solib_return_trampoline + /*IN_SOLIB_RETURN_TRAMPOLINE ()*/); #endif #ifdef MEMORY_INSERT_BREAKPOINT fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "MEMORY_INSERT_BREAKPOINT(addr, contents_cache)", XSTRING (MEMORY_INSERT_BREAKPOINT (addr, contents_cache))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: MEMORY_INSERT_BREAKPOINT = <0x%08lx>\n", - (long) current_gdbarch->memory_insert_breakpoint - /*MEMORY_INSERT_BREAKPOINT ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: MEMORY_INSERT_BREAKPOINT = <0x%08lx>\n", + (long) current_gdbarch->memory_insert_breakpoint + /*MEMORY_INSERT_BREAKPOINT ()*/); #endif #ifdef MEMORY_REMOVE_BREAKPOINT fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "MEMORY_REMOVE_BREAKPOINT(addr, contents_cache)", XSTRING (MEMORY_REMOVE_BREAKPOINT (addr, contents_cache))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: MEMORY_REMOVE_BREAKPOINT = <0x%08lx>\n", - (long) current_gdbarch->memory_remove_breakpoint - /*MEMORY_REMOVE_BREAKPOINT ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: MEMORY_REMOVE_BREAKPOINT = <0x%08lx>\n", + (long) current_gdbarch->memory_remove_breakpoint + /*MEMORY_REMOVE_BREAKPOINT ()*/); #endif #ifdef NAME_OF_MALLOC fprintf_unfiltered (file, @@ -1977,14 +1918,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: NAME_OF_MALLOC = %s\n", NAME_OF_MALLOC); #endif -#ifdef NPC_REGNUM - fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM # %s\n", - XSTRING (NPC_REGNUM)); - fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM = %d\n", - NPC_REGNUM); -#endif #ifdef NUM_PSEUDO_REGS fprintf_unfiltered (file, "gdbarch_dump: NUM_PSEUDO_REGS # %s\n", @@ -2014,11 +1947,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "PC_IN_SIGTRAMP(pc, name)", XSTRING (PC_IN_SIGTRAMP (pc, name))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: PC_IN_SIGTRAMP = <0x%08lx>\n", - (long) current_gdbarch->pc_in_sigtramp - /*PC_IN_SIGTRAMP ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: PC_IN_SIGTRAMP = <0x%08lx>\n", + (long) current_gdbarch->pc_in_sigtramp + /*PC_IN_SIGTRAMP ()*/); #endif #ifdef PC_REGNUM fprintf_unfiltered (file, @@ -2033,42 +1965,35 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "POINTER_TO_ADDRESS(type, buf)", XSTRING (POINTER_TO_ADDRESS (type, buf))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: POINTER_TO_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->pointer_to_address - /*POINTER_TO_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: POINTER_TO_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->pointer_to_address + /*POINTER_TO_ADDRESS ()*/); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_print_float_info_p() = %d\n", - gdbarch_print_float_info_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: print_float_info = 0x%08lx\n", - (long) current_gdbarch->print_float_info); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: print_registers_info = 0x%08lx\n", - (long) current_gdbarch->print_registers_info); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_print_vector_info_p() = %d\n", - gdbarch_print_vector_info_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: print_vector_info = 0x%08lx\n", - (long) current_gdbarch->print_vector_info); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_print_float_info_p() = %d\n", + gdbarch_print_float_info_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: print_float_info = 0x%08lx\n", + (long) current_gdbarch->print_float_info); + fprintf_unfiltered (file, + "gdbarch_dump: print_registers_info = 0x%08lx\n", + (long) current_gdbarch->print_registers_info); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_print_vector_info_p() = %d\n", + gdbarch_print_vector_info_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: print_vector_info = 0x%08lx\n", + (long) current_gdbarch->print_vector_info); #ifdef PROLOGUE_FRAMELESS_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "PROLOGUE_FRAMELESS_P(ip)", XSTRING (PROLOGUE_FRAMELESS_P (ip))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: PROLOGUE_FRAMELESS_P = <0x%08lx>\n", - (long) current_gdbarch->prologue_frameless_p - /*PROLOGUE_FRAMELESS_P ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: PROLOGUE_FRAMELESS_P = <0x%08lx>\n", + (long) current_gdbarch->prologue_frameless_p + /*PROLOGUE_FRAMELESS_P ()*/); #endif #ifdef PS_REGNUM fprintf_unfiltered (file, @@ -2078,42 +2003,18 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: PS_REGNUM = %d\n", PS_REGNUM); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_push_dummy_call_p() = %d\n", - gdbarch_push_dummy_call_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: push_dummy_call = 0x%08lx\n", - (long) current_gdbarch->push_dummy_call); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_push_dummy_code_p() = %d\n", - gdbarch_push_dummy_code_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: push_dummy_code = 0x%08lx\n", - (long) current_gdbarch->push_dummy_code); -#ifdef REGISTER_BYTE_P fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_BYTE_P()", - XSTRING (REGISTER_BYTE_P ())); + "gdbarch_dump: gdbarch_push_dummy_call_p() = %d\n", + gdbarch_push_dummy_call_p (current_gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTE_P() = %d\n", - REGISTER_BYTE_P ()); -#endif -#ifdef REGISTER_BYTE + "gdbarch_dump: push_dummy_call = 0x%08lx\n", + (long) current_gdbarch->push_dummy_call); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_BYTE(reg_nr)", - XSTRING (REGISTER_BYTE (reg_nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_byte - /*REGISTER_BYTE ()*/); -#endif + "gdbarch_dump: gdbarch_push_dummy_code_p() = %d\n", + gdbarch_push_dummy_code_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: push_dummy_code = 0x%08lx\n", + (long) current_gdbarch->push_dummy_code); #ifdef REGISTER_BYTES_OK_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2128,22 +2029,20 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "REGISTER_BYTES_OK(nr_bytes)", XSTRING (REGISTER_BYTES_OK (nr_bytes))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTES_OK = <0x%08lx>\n", - (long) current_gdbarch->register_bytes_ok - /*REGISTER_BYTES_OK ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_BYTES_OK = <0x%08lx>\n", + (long) current_gdbarch->register_bytes_ok + /*REGISTER_BYTES_OK ()*/); #endif #ifdef REGISTER_NAME fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "REGISTER_NAME(regnr)", XSTRING (REGISTER_NAME (regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_NAME = <0x%08lx>\n", - (long) current_gdbarch->register_name - /*REGISTER_NAME ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_NAME = <0x%08lx>\n", + (long) current_gdbarch->register_name + /*REGISTER_NAME ()*/); #endif #ifdef REGISTER_RAW_SIZE_P fprintf_unfiltered (file, @@ -2159,45 +2058,37 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "REGISTER_RAW_SIZE(reg_nr)", XSTRING (REGISTER_RAW_SIZE (reg_nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_RAW_SIZE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_raw_size - /*REGISTER_RAW_SIZE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_RAW_SIZE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_raw_size + /*REGISTER_RAW_SIZE ()*/); #endif #ifdef REGISTER_SIM_REGNO fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "REGISTER_SIM_REGNO(reg_nr)", XSTRING (REGISTER_SIM_REGNO (reg_nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_SIM_REGNO = <0x%08lx>\n", - (long) current_gdbarch->register_sim_regno - /*REGISTER_SIM_REGNO ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_SIM_REGNO = <0x%08lx>\n", + (long) current_gdbarch->register_sim_regno + /*REGISTER_SIM_REGNO ()*/); #endif #ifdef REGISTER_TO_VALUE -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "REGISTER_TO_VALUE(frame, regnum, type, buf)", XSTRING (REGISTER_TO_VALUE (frame, regnum, type, buf))); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_TO_VALUE = <0x%08lx>\n", + (long) current_gdbarch->register_to_value + /*REGISTER_TO_VALUE ()*/); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_TO_VALUE = <0x%08lx>\n", - (long) current_gdbarch->register_to_value - /*REGISTER_TO_VALUE ()*/); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_register_type_p() = %d\n", - gdbarch_register_type_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: register_type = 0x%08lx\n", - (long) current_gdbarch->register_type); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_register_type_p() = %d\n", + gdbarch_register_type_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: register_type = 0x%08lx\n", + (long) current_gdbarch->register_type); #ifdef REGISTER_VIRTUAL_SIZE_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2212,11 +2103,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "REGISTER_VIRTUAL_SIZE(reg_nr)", XSTRING (REGISTER_VIRTUAL_SIZE (reg_nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_VIRTUAL_SIZE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_virtual_size - /*REGISTER_VIRTUAL_SIZE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_VIRTUAL_SIZE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_virtual_size + /*REGISTER_VIRTUAL_SIZE ()*/); #endif #ifdef REGISTER_VIRTUAL_TYPE_P fprintf_unfiltered (file, @@ -2232,57 +2122,33 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "REGISTER_VIRTUAL_TYPE(reg_nr)", XSTRING (REGISTER_VIRTUAL_TYPE (reg_nr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_VIRTUAL_TYPE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_virtual_type - /*REGISTER_VIRTUAL_TYPE ()*/); -#endif -#ifdef REG_STRUCT_HAS_ADDR_P fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REG_STRUCT_HAS_ADDR_P()", - XSTRING (REG_STRUCT_HAS_ADDR_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: REG_STRUCT_HAS_ADDR_P() = %d\n", - REG_STRUCT_HAS_ADDR_P ()); + "gdbarch_dump: REGISTER_VIRTUAL_TYPE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_virtual_type + /*REGISTER_VIRTUAL_TYPE ()*/); #endif -#ifdef REG_STRUCT_HAS_ADDR fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REG_STRUCT_HAS_ADDR(gcc_p, type)", - XSTRING (REG_STRUCT_HAS_ADDR (gcc_p, type))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REG_STRUCT_HAS_ADDR = <0x%08lx>\n", - (long) current_gdbarch->reg_struct_has_addr - /*REG_STRUCT_HAS_ADDR ()*/); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: remote_translate_xfer_address = 0x%08lx\n", - (long) current_gdbarch->remote_translate_xfer_address); + "gdbarch_dump: remote_translate_xfer_address = 0x%08lx\n", + (long) current_gdbarch->remote_translate_xfer_address); #ifdef RETURN_VALUE_ON_STACK fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "RETURN_VALUE_ON_STACK(type)", XSTRING (RETURN_VALUE_ON_STACK (type))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: RETURN_VALUE_ON_STACK = <0x%08lx>\n", - (long) current_gdbarch->return_value_on_stack - /*RETURN_VALUE_ON_STACK ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: RETURN_VALUE_ON_STACK = <0x%08lx>\n", + (long) current_gdbarch->return_value_on_stack + /*RETURN_VALUE_ON_STACK ()*/); #endif #ifdef SDB_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "SDB_REG_TO_REGNUM(sdb_regnr)", XSTRING (SDB_REG_TO_REGNUM (sdb_regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SDB_REG_TO_REGNUM = <0x%08lx>\n", - (long) current_gdbarch->sdb_reg_to_regnum - /*SDB_REG_TO_REGNUM ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SDB_REG_TO_REGNUM = <0x%08lx>\n", + (long) current_gdbarch->sdb_reg_to_regnum + /*SDB_REG_TO_REGNUM ()*/); #endif #ifdef SIGTRAMP_END_P fprintf_unfiltered (file, @@ -2298,11 +2164,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "SIGTRAMP_END(pc)", XSTRING (SIGTRAMP_END (pc))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SIGTRAMP_END = <0x%08lx>\n", - (long) current_gdbarch->sigtramp_end - /*SIGTRAMP_END ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SIGTRAMP_END = <0x%08lx>\n", + (long) current_gdbarch->sigtramp_end + /*SIGTRAMP_END ()*/); #endif #ifdef SIGTRAMP_START_P fprintf_unfiltered (file, @@ -2318,44 +2183,40 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "SIGTRAMP_START(pc)", XSTRING (SIGTRAMP_START (pc))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SIGTRAMP_START = <0x%08lx>\n", - (long) current_gdbarch->sigtramp_start - /*SIGTRAMP_START ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SIGTRAMP_START = <0x%08lx>\n", + (long) current_gdbarch->sigtramp_start + /*SIGTRAMP_START ()*/); #endif #ifdef SKIP_PROLOGUE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "SKIP_PROLOGUE(ip)", XSTRING (SKIP_PROLOGUE (ip))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SKIP_PROLOGUE = <0x%08lx>\n", - (long) current_gdbarch->skip_prologue - /*SKIP_PROLOGUE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SKIP_PROLOGUE = <0x%08lx>\n", + (long) current_gdbarch->skip_prologue + /*SKIP_PROLOGUE ()*/); #endif #ifdef SKIP_TRAMPOLINE_CODE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "SKIP_TRAMPOLINE_CODE(pc)", XSTRING (SKIP_TRAMPOLINE_CODE (pc))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SKIP_TRAMPOLINE_CODE = <0x%08lx>\n", - (long) current_gdbarch->skip_trampoline_code - /*SKIP_TRAMPOLINE_CODE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SKIP_TRAMPOLINE_CODE = <0x%08lx>\n", + (long) current_gdbarch->skip_trampoline_code + /*SKIP_TRAMPOLINE_CODE ()*/); #endif #ifdef SMASH_TEXT_ADDRESS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "SMASH_TEXT_ADDRESS(addr)", XSTRING (SMASH_TEXT_ADDRESS (addr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SMASH_TEXT_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->smash_text_address - /*SMASH_TEXT_ADDRESS ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SMASH_TEXT_ADDRESS = <0x%08lx>\n", + (long) current_gdbarch->smash_text_address + /*SMASH_TEXT_ADDRESS ()*/); #endif #ifdef SOFTWARE_SINGLE_STEP_P fprintf_unfiltered (file, @@ -2367,18 +2228,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) SOFTWARE_SINGLE_STEP_P ()); #endif #ifdef SOFTWARE_SINGLE_STEP -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "SOFTWARE_SINGLE_STEP(sig, insert_breakpoints_p)", XSTRING (SOFTWARE_SINGLE_STEP (sig, insert_breakpoints_p))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SOFTWARE_SINGLE_STEP = <0x%08lx>\n", - (long) current_gdbarch->software_single_step - /*SOFTWARE_SINGLE_STEP ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: SOFTWARE_SINGLE_STEP = <0x%08lx>\n", + (long) current_gdbarch->software_single_step + /*SOFTWARE_SINGLE_STEP ()*/); #endif #ifdef SP_REGNUM fprintf_unfiltered (file, @@ -2393,45 +2250,20 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "STAB_REG_TO_REGNUM(stab_regnr)", XSTRING (STAB_REG_TO_REGNUM (stab_regnr))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: STAB_REG_TO_REGNUM = <0x%08lx>\n", - (long) current_gdbarch->stab_reg_to_regnum - /*STAB_REG_TO_REGNUM ()*/); -#endif -#ifdef STACK_ALIGN_P fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STACK_ALIGN_P()", - XSTRING (STACK_ALIGN_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: STACK_ALIGN_P() = %d\n", - STACK_ALIGN_P ()); -#endif -#ifdef STACK_ALIGN - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STACK_ALIGN(sp)", - XSTRING (STACK_ALIGN (sp))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: STACK_ALIGN = <0x%08lx>\n", - (long) current_gdbarch->stack_align - /*STACK_ALIGN ()*/); + "gdbarch_dump: STAB_REG_TO_REGNUM = <0x%08lx>\n", + (long) current_gdbarch->stab_reg_to_regnum + /*STAB_REG_TO_REGNUM ()*/); #endif #ifdef STORE_RETURN_VALUE -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "STORE_RETURN_VALUE(type, regcache, valbuf)", XSTRING (STORE_RETURN_VALUE (type, regcache, valbuf))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: STORE_RETURN_VALUE = <0x%08lx>\n", - (long) current_gdbarch->store_return_value - /*STORE_RETURN_VALUE ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: STORE_RETURN_VALUE = <0x%08lx>\n", + (long) current_gdbarch->store_return_value + /*STORE_RETURN_VALUE ()*/); #endif #ifdef TARGET_ADDR_BIT fprintf_unfiltered (file, @@ -2559,11 +2391,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "TARGET_PRINT_INSN(vma, info)", XSTRING (TARGET_PRINT_INSN (vma, info))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_PRINT_INSN = <0x%08lx>\n", - (long) current_gdbarch->print_insn - /*TARGET_PRINT_INSN ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_PRINT_INSN = <0x%08lx>\n", + (long) current_gdbarch->print_insn + /*TARGET_PRINT_INSN ()*/); #endif #ifdef TARGET_PTR_BIT fprintf_unfiltered (file, @@ -2587,11 +2418,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "TARGET_READ_PC(ptid)", XSTRING (TARGET_READ_PC (ptid))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_READ_PC = <0x%08lx>\n", - (long) current_gdbarch->read_pc - /*TARGET_READ_PC ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_READ_PC = <0x%08lx>\n", + (long) current_gdbarch->read_pc + /*TARGET_READ_PC ()*/); #endif #ifdef TARGET_READ_SP_P fprintf_unfiltered (file, @@ -2607,11 +2437,10 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: %s # %s\n", "TARGET_READ_SP()", XSTRING (TARGET_READ_SP ())); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_READ_SP = <0x%08lx>\n", - (long) current_gdbarch->read_sp - /*TARGET_READ_SP ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_READ_SP = <0x%08lx>\n", + (long) current_gdbarch->read_sp + /*TARGET_READ_SP ()*/); #endif #ifdef TARGET_SHORT_BIT fprintf_unfiltered (file, @@ -2622,81 +2451,62 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) TARGET_SHORT_BIT); #endif #ifdef TARGET_VIRTUAL_FRAME_POINTER -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "TARGET_VIRTUAL_FRAME_POINTER(pc, frame_regnum, frame_offset)", XSTRING (TARGET_VIRTUAL_FRAME_POINTER (pc, frame_regnum, frame_offset))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_VIRTUAL_FRAME_POINTER = <0x%08lx>\n", - (long) current_gdbarch->virtual_frame_pointer - /*TARGET_VIRTUAL_FRAME_POINTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_VIRTUAL_FRAME_POINTER = <0x%08lx>\n", + (long) current_gdbarch->virtual_frame_pointer + /*TARGET_VIRTUAL_FRAME_POINTER ()*/); #endif #ifdef TARGET_WRITE_PC -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "TARGET_WRITE_PC(val, ptid)", XSTRING (TARGET_WRITE_PC (val, ptid))); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_WRITE_PC = <0x%08lx>\n", + (long) current_gdbarch->write_pc + /*TARGET_WRITE_PC ()*/); #endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_WRITE_PC = <0x%08lx>\n", - (long) current_gdbarch->write_pc - /*TARGET_WRITE_PC ()*/); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_unwind_dummy_id_p() = %d\n", - gdbarch_unwind_dummy_id_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: unwind_dummy_id = 0x%08lx\n", - (long) current_gdbarch->unwind_dummy_id); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_unwind_pc_p() = %d\n", - gdbarch_unwind_pc_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: unwind_pc = 0x%08lx\n", - (long) current_gdbarch->unwind_pc); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_unwind_sp_p() = %d\n", - gdbarch_unwind_sp_p (current_gdbarch)); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: unwind_sp = 0x%08lx\n", - (long) current_gdbarch->unwind_sp); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_unwind_dummy_id_p() = %d\n", + gdbarch_unwind_dummy_id_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: unwind_dummy_id = 0x%08lx\n", + (long) current_gdbarch->unwind_dummy_id); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_unwind_pc_p() = %d\n", + gdbarch_unwind_pc_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: unwind_pc = 0x%08lx\n", + (long) current_gdbarch->unwind_pc); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_unwind_sp_p() = %d\n", + gdbarch_unwind_sp_p (current_gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: unwind_sp = 0x%08lx\n", + (long) current_gdbarch->unwind_sp); #ifdef USE_STRUCT_CONVENTION fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "USE_STRUCT_CONVENTION(gcc_p, value_type)", XSTRING (USE_STRUCT_CONVENTION (gcc_p, value_type))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: USE_STRUCT_CONVENTION = <0x%08lx>\n", - (long) current_gdbarch->use_struct_convention - /*USE_STRUCT_CONVENTION ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: USE_STRUCT_CONVENTION = <0x%08lx>\n", + (long) current_gdbarch->use_struct_convention + /*USE_STRUCT_CONVENTION ()*/); #endif #ifdef VALUE_TO_REGISTER -#if GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "VALUE_TO_REGISTER(frame, regnum, type, buf)", XSTRING (VALUE_TO_REGISTER (frame, regnum, type, buf))); -#endif - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: VALUE_TO_REGISTER = <0x%08lx>\n", - (long) current_gdbarch->value_to_register - /*VALUE_TO_REGISTER ()*/); + fprintf_unfiltered (file, + "gdbarch_dump: VALUE_TO_REGISTER = <0x%08lx>\n", + (long) current_gdbarch->value_to_register + /*VALUE_TO_REGISTER ()*/); #endif if (current_gdbarch->dump_tdep != NULL) current_gdbarch->dump_tdep (current_gdbarch, file); @@ -3161,20 +2971,20 @@ set_gdbarch_fp0_regnum (struct gdbarch *gdbarch, } int -gdbarch_npc_regnum (struct gdbarch *gdbarch) +gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of npc_regnum, invalid_p == 0 */ + /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_npc_regnum called\n"); - return gdbarch->npc_regnum; + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_npc_regnum called\n"); + return gdbarch->deprecated_npc_regnum; } void -set_gdbarch_npc_regnum (struct gdbarch *gdbarch, - int npc_regnum) +set_gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch, + int deprecated_npc_regnum) { - gdbarch->npc_regnum = npc_regnum; + gdbarch->deprecated_npc_regnum = deprecated_npc_regnum; } int @@ -3699,21 +3509,28 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, gdbarch->call_dummy_location = call_dummy_location; } +int +gdbarch_deprecated_call_dummy_address_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->deprecated_call_dummy_address != NULL; +} + CORE_ADDR -gdbarch_call_dummy_address (struct gdbarch *gdbarch) +gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->call_dummy_address != NULL); + gdb_assert (gdbarch->deprecated_call_dummy_address != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_address called\n"); - return gdbarch->call_dummy_address (); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_address called\n"); + return gdbarch->deprecated_call_dummy_address (); } void -set_gdbarch_call_dummy_address (struct gdbarch *gdbarch, - gdbarch_call_dummy_address_ftype call_dummy_address) +set_gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch, + gdbarch_deprecated_call_dummy_address_ftype deprecated_call_dummy_address) { - gdbarch->call_dummy_address = call_dummy_address; + gdbarch->deprecated_call_dummy_address = deprecated_call_dummy_address; } CORE_ADDR @@ -5042,27 +4859,27 @@ set_gdbarch_frame_num_args (struct gdbarch *gdbarch, } int -gdbarch_stack_align_p (struct gdbarch *gdbarch) +gdbarch_deprecated_stack_align_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->stack_align != NULL; + return gdbarch->deprecated_stack_align != NULL; } CORE_ADDR -gdbarch_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp) +gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->stack_align != NULL); + gdb_assert (gdbarch->deprecated_stack_align != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stack_align called\n"); - return gdbarch->stack_align (sp); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_stack_align called\n"); + return gdbarch->deprecated_stack_align (sp); } void -set_gdbarch_stack_align (struct gdbarch *gdbarch, - gdbarch_stack_align_ftype stack_align) +set_gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, + gdbarch_deprecated_stack_align_ftype deprecated_stack_align) { - gdbarch->stack_align = stack_align; + gdbarch->deprecated_stack_align = deprecated_stack_align; } int @@ -5090,27 +4907,43 @@ set_gdbarch_frame_align (struct gdbarch *gdbarch, } int -gdbarch_reg_struct_has_addr_p (struct gdbarch *gdbarch) +gdbarch_deprecated_reg_struct_has_addr_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->deprecated_reg_struct_has_addr != NULL; +} + +int +gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, int gcc_p, struct type *type) { gdb_assert (gdbarch != NULL); - return gdbarch->reg_struct_has_addr != NULL; + gdb_assert (gdbarch->deprecated_reg_struct_has_addr != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_reg_struct_has_addr called\n"); + return gdbarch->deprecated_reg_struct_has_addr (gcc_p, type); +} + +void +set_gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, + gdbarch_deprecated_reg_struct_has_addr_ftype deprecated_reg_struct_has_addr) +{ + gdbarch->deprecated_reg_struct_has_addr = deprecated_reg_struct_has_addr; } int -gdbarch_reg_struct_has_addr (struct gdbarch *gdbarch, int gcc_p, struct type *type) +gdbarch_frame_red_zone_size (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->reg_struct_has_addr != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_reg_struct_has_addr called\n"); - return gdbarch->reg_struct_has_addr (gcc_p, type); + fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_red_zone_size called\n"); + return gdbarch->frame_red_zone_size; } void -set_gdbarch_reg_struct_has_addr (struct gdbarch *gdbarch, - gdbarch_reg_struct_has_addr_ftype reg_struct_has_addr) +set_gdbarch_frame_red_zone_size (struct gdbarch *gdbarch, + int frame_red_zone_size) { - gdbarch->reg_struct_has_addr = reg_struct_has_addr; + gdbarch->frame_red_zone_size = frame_red_zone_size; } int @@ -5253,7 +5086,7 @@ set_gdbarch_software_single_step (struct gdbarch *gdbarch, } int -gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, disassemble_info *info) +gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->print_insn != NULL); @@ -5835,37 +5668,30 @@ append_name (const char ***buf, int *nr, const char *name) const char ** gdbarch_printable_names (void) { - if (GDB_MULTI_ARCH) + /* Accumulate a list of names based on the registed list of + architectures. */ + enum bfd_architecture a; + int nr_arches = 0; + const char **arches = NULL; + struct gdbarch_registration *rego; + for (rego = gdbarch_registry; + rego != NULL; + rego = rego->next) { - /* Accumulate a list of names based on the registed list of - architectures. */ - enum bfd_architecture a; - int nr_arches = 0; - const char **arches = NULL; - struct gdbarch_registration *rego; - for (rego = gdbarch_registry; - rego != NULL; - rego = rego->next) - { - const struct bfd_arch_info *ap; - ap = bfd_lookup_arch (rego->bfd_architecture, 0); - if (ap == NULL) - internal_error (__FILE__, __LINE__, - "gdbarch_architecture_names: multi-arch unknown"); - do - { - append_name (&arches, &nr_arches, ap->printable_name); - ap = ap->next; - } - while (ap != NULL); - } - append_name (&arches, &nr_arches, NULL); - return arches; + const struct bfd_arch_info *ap; + ap = bfd_lookup_arch (rego->bfd_architecture, 0); + if (ap == NULL) + internal_error (__FILE__, __LINE__, + "gdbarch_architecture_names: multi-arch unknown"); + do + { + append_name (&arches, &nr_arches, ap->printable_name); + ap = ap->next; + } + while (ap != NULL); } - else - /* Just return all the architectures that BFD knows. Assume that - the legacy architecture framework supports them. */ - return bfd_arch_list (); + append_name (&arches, &nr_arches, NULL); + return arches; } @@ -5906,12 +5732,6 @@ gdbarch_register (enum bfd_architecture bfd_architecture, (*curr)->dump_tdep = dump_tdep; (*curr)->arches = NULL; (*curr)->next = NULL; - /* When non- multi-arch, install whatever target dump routine we've - been provided - hopefully that routine has been written correctly - and works regardless of multi-arch. */ - if (!GDB_MULTI_ARCH && dump_tdep != NULL - && startup_gdbarch.dump_tdep == NULL) - startup_gdbarch.dump_tdep = dump_tdep; } void @@ -6143,11 +5963,6 @@ gdbarch_update_p (struct gdbarch_info info) } -/* Disassembler */ - -/* Pointer to the target-dependent disassembly function. */ -int (*deprecated_tm_print_insn) (bfd_vma, disassemble_info *); - extern void _initialize_gdbarch (void); void |