X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdbarch.c;h=db71a5c79e902d0b10d5d10b22cb2f180e6dd3b6;hb=a46aefacc32f6658e75e4830d1e5d0fe779a3e5d;hp=b03c944cf9d9e50c2ece80f9cb8039efd35fc452;hpb=ea06eb3dd8f0780ee5ffa63354e60533990a890a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index b03c944cf9..db71a5c79e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -2,25 +2,23 @@ /* Dynamic architecture support for GDB, the GNU debugger. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* This file was created with the aid of ``gdbarch.sh''. @@ -46,10 +44,11 @@ #include "gdb_assert.h" #include "gdb_string.h" -#include "gdb-events.h" #include "reggroups.h" #include "osabi.h" #include "gdb_obstack.h" +#include "observer.h" +#include "regcache.h" /* Static function declarations */ @@ -92,6 +91,7 @@ struct gdbarch /* basic architectural information */ const struct bfd_arch_info * bfd_arch_info; int byte_order; + int byte_order_for_code; enum gdb_osabi osabi; const struct target_desc * target_desc; @@ -132,6 +132,7 @@ struct gdbarch */ + int bits_big_endian; int short_bit; int int_bit; int long_bit; @@ -144,7 +145,6 @@ struct gdbarch const struct floatformat ** long_double_format; int ptr_bit; int addr_bit; - int bfd_vma_bit; int char_signed; gdbarch_read_pc_ftype *read_pc; gdbarch_write_pc_ftype *write_pc; @@ -159,15 +159,13 @@ struct gdbarch int fp0_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; gdbarch_sdb_reg_to_regnum_ftype *sdb_reg_to_regnum; gdbarch_dwarf2_reg_to_regnum_ftype *dwarf2_reg_to_regnum; gdbarch_register_name_ftype *register_name; gdbarch_register_type_ftype *register_type; - gdbarch_unwind_dummy_id_ftype *unwind_dummy_id; + gdbarch_dummy_id_ftype *dummy_id; int deprecated_fp_regnum; gdbarch_push_dummy_call_ftype *push_dummy_call; - int deprecated_register_size; int call_dummy_location; gdbarch_push_dummy_code_ftype *push_dummy_code; gdbarch_print_registers_info_ftype *print_registers_info; @@ -186,11 +184,8 @@ struct gdbarch gdbarch_address_to_pointer_ftype *address_to_pointer; gdbarch_integer_to_address_ftype *integer_to_address; gdbarch_return_value_ftype *return_value; - gdbarch_extract_return_value_ftype *extract_return_value; - gdbarch_store_return_value_ftype *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_skip_prologue_ftype *skip_prologue; + gdbarch_skip_main_prologue_ftype *skip_main_prologue; gdbarch_inner_than_ftype *inner_than; gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; gdbarch_adjust_breakpoint_address_ftype *adjust_breakpoint_address; @@ -204,9 +199,7 @@ struct gdbarch gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_unwind_sp_ftype *unwind_sp; gdbarch_frame_num_args_ftype *frame_num_args; - gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; gdbarch_frame_align_ftype *frame_align; - gdbarch_deprecated_reg_struct_has_addr_ftype *deprecated_reg_struct_has_addr; gdbarch_stabs_argument_has_addr_ftype *stabs_argument_has_addr; int frame_red_zone_size; gdbarch_convert_from_func_ptr_addr_ftype *convert_from_func_ptr_addr; @@ -219,10 +212,8 @@ struct gdbarch gdbarch_skip_solib_resolver_ftype *skip_solib_resolver; gdbarch_in_solib_return_trampoline_ftype *in_solib_return_trampoline; gdbarch_in_function_epilogue_p_ftype *in_function_epilogue_p; - gdbarch_construct_inferior_arguments_ftype *construct_inferior_arguments; gdbarch_elf_make_msymbol_special_ftype *elf_make_msymbol_special; gdbarch_coff_make_msymbol_special_ftype *coff_make_msymbol_special; - const char * name_of_malloc; int cannot_step_breakpoint; int have_nonsteppable_watchpoint; gdbarch_address_class_type_flags_ftype *address_class_type_flags; @@ -231,10 +222,30 @@ struct gdbarch gdbarch_register_reggroup_p_ftype *register_reggroup_p; gdbarch_fetch_pointer_argument_ftype *fetch_pointer_argument; gdbarch_regset_from_core_section_ftype *regset_from_core_section; + int core_reg_section_encodes_pid; + struct core_regset_section * core_regset_sections; + gdbarch_core_xfer_shared_libraries_ftype *core_xfer_shared_libraries; + gdbarch_core_pid_to_str_ftype *core_pid_to_str; + const char * gcore_bfd_target; int vtable_function_descriptors; int vbit_in_delta; gdbarch_skip_permanent_breakpoint_ftype *skip_permanent_breakpoint; + ULONGEST max_insn_length; + gdbarch_displaced_step_copy_insn_ftype *displaced_step_copy_insn; + gdbarch_displaced_step_fixup_ftype *displaced_step_fixup; + gdbarch_displaced_step_free_closure_ftype *displaced_step_free_closure; + gdbarch_displaced_step_location_ftype *displaced_step_location; gdbarch_overlay_update_ftype *overlay_update; + gdbarch_core_read_description_ftype *core_read_description; + gdbarch_static_transform_name_ftype *static_transform_name; + int sofun_address_maybe_missing; + gdbarch_process_record_ftype *process_record; + gdbarch_target_signal_from_host_ftype *target_signal_from_host; + gdbarch_target_signal_to_host_ftype *target_signal_to_host; + gdbarch_get_siginfo_type_ftype *get_siginfo_type; + gdbarch_record_special_symbol_ftype *record_special_symbol; + int has_global_solist; + int has_global_breakpoints; }; @@ -250,6 +261,7 @@ struct gdbarch startup_gdbarch = /* basic architecture information */ &bfd_default_arch_struct, /* bfd_arch_info */ BFD_ENDIAN_BIG, /* byte_order */ + BFD_ENDIAN_BIG, /* byte_order_for_code */ GDB_OSABI_UNKNOWN, /* osabi */ 0, /* target_desc */ /* target specific vector and its dump routine */ @@ -257,6 +269,7 @@ struct gdbarch startup_gdbarch = /*per-architecture data-pointers and swap regions */ 0, NULL, NULL, /* Multi-arch values */ + 1, /* bits_big_endian */ 8 * sizeof (short), /* short_bit */ 8 * sizeof (int), /* int_bit */ 8 * sizeof (long), /* long_bit */ @@ -269,11 +282,10 @@ struct gdbarch startup_gdbarch = 0, /* long_double_format */ 8 * sizeof (void*), /* ptr_bit */ 8 * sizeof (void*), /* addr_bit */ - 8 * sizeof (void*), /* bfd_vma_bit */ 1, /* char_signed */ 0, /* read_pc */ 0, /* write_pc */ - 0, /* virtual_frame_pointer */ + legacy_virtual_frame_pointer, /* virtual_frame_pointer */ 0, /* pseudo_register_read */ 0, /* pseudo_register_write */ 0, /* num_regs */ @@ -282,45 +294,40 @@ struct gdbarch startup_gdbarch = -1, /* pc_regnum */ -1, /* ps_regnum */ 0, /* fp0_regnum */ - 0, /* stab_reg_to_regnum */ - 0, /* ecoff_reg_to_regnum */ - 0, /* dwarf_reg_to_regnum */ - 0, /* sdb_reg_to_regnum */ - 0, /* dwarf2_reg_to_regnum */ + no_op_reg_to_regnum, /* stab_reg_to_regnum */ + no_op_reg_to_regnum, /* ecoff_reg_to_regnum */ + no_op_reg_to_regnum, /* sdb_reg_to_regnum */ + no_op_reg_to_regnum, /* dwarf2_reg_to_regnum */ 0, /* register_name */ 0, /* register_type */ - 0, /* unwind_dummy_id */ + 0, /* dummy_id */ -1, /* deprecated_fp_regnum */ 0, /* push_dummy_call */ - 0, /* deprecated_register_size */ 0, /* call_dummy_location */ 0, /* push_dummy_code */ default_print_registers_info, /* print_registers_info */ 0, /* print_float_info */ 0, /* print_vector_info */ - 0, /* register_sim_regno */ - 0, /* cannot_fetch_register */ - 0, /* cannot_store_register */ + legacy_register_sim_regno, /* register_sim_regno */ + cannot_register_not, /* cannot_fetch_register */ + cannot_register_not, /* cannot_store_register */ 0, /* get_longjmp_target */ 0, /* believe_pcc_promotion */ - 0, /* convert_register_p */ + generic_convert_register_p, /* convert_register_p */ 0, /* register_to_value */ 0, /* value_to_register */ 0, /* value_from_register */ - 0, /* pointer_to_address */ - 0, /* address_to_pointer */ + unsigned_pointer_to_address, /* pointer_to_address */ + unsigned_address_to_pointer, /* address_to_pointer */ 0, /* integer_to_address */ 0, /* return_value */ - 0, /* extract_return_value */ - 0, /* store_return_value */ - 0, /* deprecated_use_struct_convention */ - 0, /* deprecated_extract_struct_value_address */ 0, /* skip_prologue */ + 0, /* skip_main_prologue */ 0, /* inner_than */ 0, /* breakpoint_from_pc */ 0, /* adjust_breakpoint_address */ - 0, /* memory_insert_breakpoint */ - 0, /* memory_remove_breakpoint */ + default_memory_insert_breakpoint, /* memory_insert_breakpoint */ + default_memory_remove_breakpoint, /* memory_remove_breakpoint */ 0, /* decr_pc_after_break */ 0, /* deprecated_function_start_offset */ default_remote_register_number, /* remote_register_number */ @@ -329,25 +336,21 @@ struct gdbarch startup_gdbarch = 0, /* unwind_pc */ 0, /* unwind_sp */ 0, /* frame_num_args */ - 0, /* deprecated_stack_align */ 0, /* frame_align */ - 0, /* deprecated_reg_struct_has_addr */ default_stabs_argument_has_addr, /* stabs_argument_has_addr */ 0, /* frame_red_zone_size */ convert_from_func_ptr_addr_identity, /* convert_from_func_ptr_addr */ - 0, /* addr_bits_remove */ - 0, /* smash_text_address */ + core_addr_identity, /* addr_bits_remove */ + core_addr_identity, /* smash_text_address */ 0, /* software_single_step */ 0, /* single_step_through_delay */ 0, /* print_insn */ 0, /* skip_trampoline_code */ generic_skip_solib_resolver, /* skip_solib_resolver */ - 0, /* in_solib_return_trampoline */ + generic_in_solib_return_trampoline, /* in_solib_return_trampoline */ generic_in_function_epilogue_p, /* in_function_epilogue_p */ - construct_inferior_arguments, /* construct_inferior_arguments */ 0, /* elf_make_msymbol_special */ 0, /* coff_make_msymbol_special */ - "malloc", /* name_of_malloc */ 0, /* cannot_step_breakpoint */ 0, /* have_nonsteppable_watchpoint */ 0, /* address_class_type_flags */ @@ -356,14 +359,34 @@ struct gdbarch startup_gdbarch = default_register_reggroup_p, /* register_reggroup_p */ 0, /* fetch_pointer_argument */ 0, /* regset_from_core_section */ + 0, /* core_reg_section_encodes_pid */ + 0, /* core_regset_sections */ + 0, /* core_xfer_shared_libraries */ + 0, /* core_pid_to_str */ + 0, /* gcore_bfd_target */ 0, /* vtable_function_descriptors */ 0, /* vbit_in_delta */ 0, /* skip_permanent_breakpoint */ + 0, /* max_insn_length */ + 0, /* displaced_step_copy_insn */ + 0, /* displaced_step_fixup */ + NULL, /* displaced_step_free_closure */ + NULL, /* displaced_step_location */ 0, /* overlay_update */ + 0, /* core_read_description */ + 0, /* static_transform_name */ + 0, /* sofun_address_maybe_missing */ + 0, /* process_record */ + default_target_signal_from_host, /* target_signal_from_host */ + default_target_signal_to_host, /* target_signal_to_host */ + 0, /* get_siginfo_type */ + 0, /* record_special_symbol */ + 0, /* has_global_solist */ + 0, /* has_global_breakpoints */ /* startup_gdbarch() */ }; -struct gdbarch *current_gdbarch = &startup_gdbarch; +struct gdbarch *target_gdbarch = &startup_gdbarch; /* Create a new ``struct gdbarch'' based on information provided by ``struct gdbarch_info''. */ @@ -372,85 +395,79 @@ struct gdbarch * gdbarch_alloc (const struct gdbarch_info *info, struct gdbarch_tdep *tdep) { - /* NOTE: The new architecture variable is named ``current_gdbarch'' - so that macros such as TARGET_ARCHITECTURE, when expanded, refer to - the current local architecture and not the previous global - architecture. This ensures that the new architectures initial - values are not influenced by the previous architecture. Once - everything is parameterised with gdbarch, this will go away. */ - struct gdbarch *current_gdbarch; + struct gdbarch *gdbarch; /* Create an obstack for allocating all the per-architecture memory, then use that to allocate the architecture vector. */ struct obstack *obstack = XMALLOC (struct obstack); obstack_init (obstack); - current_gdbarch = obstack_alloc (obstack, sizeof (*current_gdbarch)); - memset (current_gdbarch, 0, sizeof (*current_gdbarch)); - current_gdbarch->obstack = obstack; + gdbarch = obstack_alloc (obstack, sizeof (*gdbarch)); + memset (gdbarch, 0, sizeof (*gdbarch)); + gdbarch->obstack = obstack; - alloc_gdbarch_data (current_gdbarch); + alloc_gdbarch_data (gdbarch); - current_gdbarch->tdep = tdep; + gdbarch->tdep = tdep; - current_gdbarch->bfd_arch_info = info->bfd_arch_info; - current_gdbarch->byte_order = info->byte_order; - current_gdbarch->osabi = info->osabi; - current_gdbarch->target_desc = info->target_desc; + gdbarch->bfd_arch_info = info->bfd_arch_info; + gdbarch->byte_order = info->byte_order; + gdbarch->byte_order_for_code = info->byte_order_for_code; + gdbarch->osabi = info->osabi; + gdbarch->target_desc = info->target_desc; /* Force the explicit initialization of these. */ - current_gdbarch->short_bit = 2*TARGET_CHAR_BIT; - current_gdbarch->int_bit = 4*TARGET_CHAR_BIT; - current_gdbarch->long_bit = 4*TARGET_CHAR_BIT; - current_gdbarch->long_long_bit = 2*current_gdbarch->long_bit; - current_gdbarch->float_bit = 4*TARGET_CHAR_BIT; - current_gdbarch->double_bit = 8*TARGET_CHAR_BIT; - current_gdbarch->long_double_bit = 8*TARGET_CHAR_BIT; - current_gdbarch->ptr_bit = current_gdbarch->int_bit; - current_gdbarch->bfd_vma_bit = TARGET_ARCHITECTURE->bits_per_address; - current_gdbarch->char_signed = -1; - current_gdbarch->write_pc = generic_target_write_pc; - current_gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer; - current_gdbarch->num_regs = -1; - current_gdbarch->sp_regnum = -1; - current_gdbarch->pc_regnum = -1; - current_gdbarch->ps_regnum = -1; - current_gdbarch->fp0_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; - current_gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum; - current_gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum; - current_gdbarch->deprecated_fp_regnum = -1; - current_gdbarch->call_dummy_location = AT_ENTRY_POINT; - current_gdbarch->print_registers_info = default_print_registers_info; - current_gdbarch->register_sim_regno = legacy_register_sim_regno; - current_gdbarch->cannot_fetch_register = cannot_register_not; - current_gdbarch->cannot_store_register = cannot_register_not; - current_gdbarch->convert_register_p = generic_convert_register_p; - current_gdbarch->value_from_register = default_value_from_register; - current_gdbarch->pointer_to_address = unsigned_pointer_to_address; - current_gdbarch->address_to_pointer = unsigned_address_to_pointer; - current_gdbarch->return_value = legacy_return_value; - current_gdbarch->deprecated_use_struct_convention = generic_use_struct_convention; - current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; - current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; - current_gdbarch->remote_register_number = default_remote_register_number; - 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; - current_gdbarch->smash_text_address = core_addr_identity; - current_gdbarch->skip_trampoline_code = generic_skip_trampoline_code; - current_gdbarch->skip_solib_resolver = generic_skip_solib_resolver; - current_gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline; - current_gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p; - current_gdbarch->construct_inferior_arguments = construct_inferior_arguments; - current_gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special; - current_gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special; - current_gdbarch->name_of_malloc = "malloc"; - current_gdbarch->register_reggroup_p = default_register_reggroup_p; + gdbarch->bits_big_endian = (gdbarch->byte_order == BFD_ENDIAN_BIG); + gdbarch->short_bit = 2*TARGET_CHAR_BIT; + gdbarch->int_bit = 4*TARGET_CHAR_BIT; + gdbarch->long_bit = 4*TARGET_CHAR_BIT; + gdbarch->long_long_bit = 2*gdbarch->long_bit; + gdbarch->float_bit = 4*TARGET_CHAR_BIT; + gdbarch->double_bit = 8*TARGET_CHAR_BIT; + gdbarch->long_double_bit = 8*TARGET_CHAR_BIT; + gdbarch->ptr_bit = gdbarch->int_bit; + gdbarch->char_signed = -1; + gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer; + gdbarch->num_regs = -1; + gdbarch->sp_regnum = -1; + gdbarch->pc_regnum = -1; + gdbarch->ps_regnum = -1; + gdbarch->fp0_regnum = -1; + gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; + gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; + gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum; + gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum; + gdbarch->deprecated_fp_regnum = -1; + gdbarch->call_dummy_location = AT_ENTRY_POINT; + gdbarch->print_registers_info = default_print_registers_info; + gdbarch->register_sim_regno = legacy_register_sim_regno; + gdbarch->cannot_fetch_register = cannot_register_not; + gdbarch->cannot_store_register = cannot_register_not; + gdbarch->convert_register_p = generic_convert_register_p; + gdbarch->value_from_register = default_value_from_register; + gdbarch->pointer_to_address = unsigned_pointer_to_address; + gdbarch->address_to_pointer = unsigned_address_to_pointer; + gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; + gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; + gdbarch->remote_register_number = default_remote_register_number; + gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr; + gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity; + gdbarch->addr_bits_remove = core_addr_identity; + gdbarch->smash_text_address = core_addr_identity; + gdbarch->skip_trampoline_code = generic_skip_trampoline_code; + gdbarch->skip_solib_resolver = generic_skip_solib_resolver; + gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline; + gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p; + gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special; + gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special; + gdbarch->register_reggroup_p = default_register_reggroup_p; + gdbarch->displaced_step_fixup = NULL; + gdbarch->displaced_step_free_closure = NULL; + gdbarch->displaced_step_location = NULL; + gdbarch->target_signal_from_host = default_target_signal_from_host; + gdbarch->target_signal_to_host = default_target_signal_to_host; /* gdbarch_alloc() */ - return current_gdbarch; + return gdbarch; } @@ -485,14 +502,8 @@ gdbarch_free (struct gdbarch *arch) /* Ensure that all values in a GDBARCH are reasonable. */ -/* NOTE/WARNING: The parameter is called ``current_gdbarch'' so that it - just happens to match the global variable ``current_gdbarch''. That - way macros refering to that variable get the local and not the global - version - ulgh. Once everything is parameterised with gdbarch, this - will go away. */ - static void -verify_gdbarch (struct gdbarch *current_gdbarch) +verify_gdbarch (struct gdbarch *gdbarch) { struct ui_file *log; struct cleanup *cleanups; @@ -501,36 +512,36 @@ verify_gdbarch (struct gdbarch *current_gdbarch) log = mem_fileopen (); cleanups = make_cleanup_ui_file_delete (log); /* fundamental */ - if (current_gdbarch->byte_order == BFD_ENDIAN_UNKNOWN) + if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN) fprintf_unfiltered (log, "\n\tbyte-order"); - if (current_gdbarch->bfd_arch_info == NULL) + if (gdbarch->bfd_arch_info == NULL) fprintf_unfiltered (log, "\n\tbfd_arch_info"); /* Check those that need to be defined for the given multi-arch level. */ + /* Skip verify of bits_big_endian, invalid_p == 0 */ /* Skip verify of short_bit, invalid_p == 0 */ /* Skip verify of int_bit, invalid_p == 0 */ /* Skip verify of long_bit, invalid_p == 0 */ /* Skip verify of long_long_bit, invalid_p == 0 */ /* Skip verify of float_bit, invalid_p == 0 */ - if (current_gdbarch->float_format == 0) - current_gdbarch->float_format = floatformats_ieee_single; + if (gdbarch->float_format == 0) + gdbarch->float_format = floatformats_ieee_single; /* Skip verify of double_bit, invalid_p == 0 */ - if (current_gdbarch->double_format == 0) - current_gdbarch->double_format = floatformats_ieee_double; + if (gdbarch->double_format == 0) + gdbarch->double_format = floatformats_ieee_double; /* Skip verify of long_double_bit, invalid_p == 0 */ - if (current_gdbarch->long_double_format == 0) - current_gdbarch->long_double_format = floatformats_ieee_double; + if (gdbarch->long_double_format == 0) + gdbarch->long_double_format = floatformats_ieee_double; /* Skip verify of ptr_bit, invalid_p == 0 */ - if (current_gdbarch->addr_bit == 0) - current_gdbarch->addr_bit = TARGET_PTR_BIT; - /* Skip verify of bfd_vma_bit, invalid_p == 0 */ - if (current_gdbarch->char_signed == -1) - current_gdbarch->char_signed = 1; + if (gdbarch->addr_bit == 0) + gdbarch->addr_bit = gdbarch_ptr_bit (gdbarch); + if (gdbarch->char_signed == -1) + gdbarch->char_signed = 1; /* Skip verify of read_pc, has predicate */ - /* Skip verify of write_pc, invalid_p == 0 */ + /* Skip verify of write_pc, has predicate */ /* Skip verify of virtual_frame_pointer, invalid_p == 0 */ /* Skip verify of pseudo_register_read, has predicate */ /* Skip verify of pseudo_register_write, has predicate */ - if (current_gdbarch->num_regs == -1) + if (gdbarch->num_regs == -1) fprintf_unfiltered (log, "\n\tnum_regs"); /* Skip verify of num_pseudo_regs, invalid_p == 0 */ /* Skip verify of sp_regnum, invalid_p == 0 */ @@ -539,11 +550,12 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of fp0_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 */ /* Skip verify of sdb_reg_to_regnum, invalid_p == 0 */ /* Skip verify of dwarf2_reg_to_regnum, invalid_p == 0 */ + if (gdbarch->register_name == 0) + fprintf_unfiltered (log, "\n\tregister_name"); /* Skip verify of register_type, has predicate */ - /* Skip verify of unwind_dummy_id, has predicate */ + /* Skip verify of dummy_id, has predicate */ /* Skip verify of deprecated_fp_regnum, invalid_p == 0 */ /* Skip verify of push_dummy_call, has predicate */ /* Skip verify of call_dummy_location, invalid_p == 0 */ @@ -561,13 +573,12 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of address_to_pointer, invalid_p == 0 */ /* Skip verify of integer_to_address, has predicate */ /* Skip verify of return_value, has predicate */ - /* Skip verify of deprecated_use_struct_convention, invalid_p == 0 */ - /* Skip verify of deprecated_extract_struct_value_address, has predicate */ - if (current_gdbarch->skip_prologue == 0) + if (gdbarch->skip_prologue == 0) fprintf_unfiltered (log, "\n\tskip_prologue"); - if (current_gdbarch->inner_than == 0) + /* Skip verify of skip_main_prologue, has predicate */ + if (gdbarch->inner_than == 0) fprintf_unfiltered (log, "\n\tinner_than"); - if (current_gdbarch->breakpoint_from_pc == 0) + if (gdbarch->breakpoint_from_pc == 0) fprintf_unfiltered (log, "\n\tbreakpoint_from_pc"); /* Skip verify of adjust_breakpoint_address, has predicate */ /* Skip verify of memory_insert_breakpoint, invalid_p == 0 */ @@ -580,25 +591,21 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of unwind_pc, has predicate */ /* Skip verify of unwind_sp, has predicate */ /* Skip verify of frame_num_args, has predicate */ - /* Skip verify of deprecated_stack_align, has predicate */ /* Skip verify of frame_align, has predicate */ - /* Skip verify of deprecated_reg_struct_has_addr, has predicate */ /* Skip verify of stabs_argument_has_addr, invalid_p == 0 */ /* Skip verify of convert_from_func_ptr_addr, invalid_p == 0 */ /* 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 single_step_through_delay, has predicate */ - if (current_gdbarch->print_insn == 0) + if (gdbarch->print_insn == 0) fprintf_unfiltered (log, "\n\tprint_insn"); /* Skip verify of skip_trampoline_code, invalid_p == 0 */ /* Skip verify of skip_solib_resolver, invalid_p == 0 */ /* Skip verify of in_solib_return_trampoline, invalid_p == 0 */ /* Skip verify of in_function_epilogue_p, invalid_p == 0 */ - /* Skip verify of construct_inferior_arguments, invalid_p == 0 */ /* Skip verify of elf_make_msymbol_special, invalid_p == 0 */ /* Skip verify of coff_make_msymbol_special, invalid_p == 0 */ - /* Skip verify of name_of_malloc, invalid_p == 0 */ /* Skip verify of cannot_step_breakpoint, invalid_p == 0 */ /* Skip verify of have_nonsteppable_watchpoint, invalid_p == 0 */ /* Skip verify of address_class_type_flags, has predicate */ @@ -607,10 +614,31 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of register_reggroup_p, invalid_p == 0 */ /* Skip verify of fetch_pointer_argument, has predicate */ /* Skip verify of regset_from_core_section, has predicate */ + /* Skip verify of core_reg_section_encodes_pid, invalid_p == 0 */ + /* Skip verify of core_xfer_shared_libraries, has predicate */ + /* Skip verify of core_pid_to_str, has predicate */ + /* Skip verify of gcore_bfd_target, has predicate */ /* Skip verify of vtable_function_descriptors, invalid_p == 0 */ /* Skip verify of vbit_in_delta, invalid_p == 0 */ /* Skip verify of skip_permanent_breakpoint, has predicate */ + /* Skip verify of max_insn_length, has predicate */ + /* Skip verify of displaced_step_copy_insn, has predicate */ + /* Skip verify of displaced_step_fixup, has predicate */ + if ((! gdbarch->displaced_step_free_closure) != (! gdbarch->displaced_step_copy_insn)) + fprintf_unfiltered (log, "\n\tdisplaced_step_free_closure"); + if ((! gdbarch->displaced_step_location) != (! gdbarch->displaced_step_copy_insn)) + fprintf_unfiltered (log, "\n\tdisplaced_step_location"); /* Skip verify of overlay_update, has predicate */ + /* Skip verify of core_read_description, has predicate */ + /* Skip verify of static_transform_name, has predicate */ + /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */ + /* Skip verify of process_record, has predicate */ + /* Skip verify of target_signal_from_host, invalid_p == 0 */ + /* Skip verify of target_signal_to_host, invalid_p == 0 */ + /* Skip verify of get_siginfo_type, has predicate */ + /* Skip verify of record_special_symbol, has predicate */ + /* Skip verify of has_global_solist, invalid_p == 0 */ + /* Skip verify of has_global_breakpoints, invalid_p == 0 */ buf = ui_file_xstrdup (log, &dummy); make_cleanup (xfree, buf); if (strlen (buf) > 0) @@ -623,671 +651,495 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Print out the details of the current architecture. */ -/* NOTE/WARNING: The parameter is called ``current_gdbarch'' so that it - just happens to match the global variable ``current_gdbarch''. That - way macros refering to that variable get the local and not the global - version - ulgh. Once everything is parameterised with gdbarch, this - will go away. */ - void -gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) +gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) { - const char *gdb_xm_file = ""; const char *gdb_nm_file = ""; - const char *gdb_tm_file = ""; -#if defined (GDB_XM_FILE) - gdb_xm_file = GDB_XM_FILE; -#endif - fprintf_unfiltered (file, - "gdbarch_dump: GDB_XM_FILE = %s\n", - gdb_xm_file); #if defined (GDB_NM_FILE) gdb_nm_file = GDB_NM_FILE; #endif fprintf_unfiltered (file, "gdbarch_dump: GDB_NM_FILE = %s\n", gdb_nm_file); -#if defined (GDB_TM_FILE) - gdb_tm_file = GDB_TM_FILE; -#endif - fprintf_unfiltered (file, - "gdbarch_dump: GDB_TM_FILE = %s\n", - gdb_tm_file); -#ifdef TARGET_ADDR_BIT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ADDR_BIT # %s\n", - XSTRING (TARGET_ADDR_BIT)); -#endif fprintf_unfiltered (file, "gdbarch_dump: addr_bit = %s\n", - paddr_d (current_gdbarch->addr_bit)); + plongest (gdbarch->addr_bit)); fprintf_unfiltered (file, - "gdbarch_dump: addr_bits_remove = <0x%lx>\n", - (long) current_gdbarch->addr_bits_remove); + "gdbarch_dump: addr_bits_remove = <%s>\n", + host_address_to_string (gdbarch->addr_bits_remove)); 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)); + gdbarch_address_class_name_to_type_flags_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: address_class_name_to_type_flags = <0x%lx>\n", - (long) current_gdbarch->address_class_name_to_type_flags); + "gdbarch_dump: address_class_name_to_type_flags = <%s>\n", + host_address_to_string (gdbarch->address_class_name_to_type_flags)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_address_class_type_flags_p() = %d\n", - gdbarch_address_class_type_flags_p (current_gdbarch)); + gdbarch_address_class_type_flags_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: address_class_type_flags = <0x%lx>\n", - (long) current_gdbarch->address_class_type_flags); + "gdbarch_dump: address_class_type_flags = <%s>\n", + host_address_to_string (gdbarch->address_class_type_flags)); 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)); + gdbarch_address_class_type_flags_to_name_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: address_class_type_flags_to_name = <0x%lx>\n", - (long) current_gdbarch->address_class_type_flags_to_name); + "gdbarch_dump: address_class_type_flags_to_name = <%s>\n", + host_address_to_string (gdbarch->address_class_type_flags_to_name)); fprintf_unfiltered (file, - "gdbarch_dump: address_to_pointer = <0x%lx>\n", - (long) current_gdbarch->address_to_pointer); + "gdbarch_dump: address_to_pointer = <%s>\n", + host_address_to_string (gdbarch->address_to_pointer)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_adjust_breakpoint_address_p() = %d\n", - gdbarch_adjust_breakpoint_address_p (current_gdbarch)); + gdbarch_adjust_breakpoint_address_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: adjust_breakpoint_address = <0x%lx>\n", - (long) current_gdbarch->adjust_breakpoint_address); -#ifdef BELIEVE_PCC_PROMOTION - fprintf_unfiltered (file, - "gdbarch_dump: BELIEVE_PCC_PROMOTION # %s\n", - XSTRING (BELIEVE_PCC_PROMOTION)); -#endif + "gdbarch_dump: adjust_breakpoint_address = <%s>\n", + host_address_to_string (gdbarch->adjust_breakpoint_address)); fprintf_unfiltered (file, "gdbarch_dump: believe_pcc_promotion = %s\n", - paddr_d (current_gdbarch->believe_pcc_promotion)); -#ifdef TARGET_ARCHITECTURE - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ARCHITECTURE # %s\n", - XSTRING (TARGET_ARCHITECTURE)); -#endif + plongest (gdbarch->believe_pcc_promotion)); fprintf_unfiltered (file, "gdbarch_dump: bfd_arch_info = %s\n", - TARGET_ARCHITECTURE->printable_name); -#ifdef TARGET_BFD_VMA_BIT + gdbarch_bfd_arch_info (gdbarch)->printable_name); fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BFD_VMA_BIT # %s\n", - XSTRING (TARGET_BFD_VMA_BIT)); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: bfd_vma_bit = %s\n", - paddr_d (current_gdbarch->bfd_vma_bit)); -#ifdef BREAKPOINT_FROM_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "BREAKPOINT_FROM_PC(pcptr, lenptr)", - XSTRING (BREAKPOINT_FROM_PC (pcptr, lenptr))); -#endif + "gdbarch_dump: bits_big_endian = %s\n", + plongest (gdbarch->bits_big_endian)); fprintf_unfiltered (file, - "gdbarch_dump: breakpoint_from_pc = <0x%lx>\n", - (long) current_gdbarch->breakpoint_from_pc); + "gdbarch_dump: breakpoint_from_pc = <%s>\n", + host_address_to_string (gdbarch->breakpoint_from_pc)); fprintf_unfiltered (file, "gdbarch_dump: byte_order = %s\n", - paddr_d (current_gdbarch->byte_order)); + plongest (gdbarch->byte_order)); + fprintf_unfiltered (file, + "gdbarch_dump: byte_order_for_code = %s\n", + plongest (gdbarch->byte_order_for_code)); fprintf_unfiltered (file, "gdbarch_dump: call_dummy_location = %s\n", - paddr_d (current_gdbarch->call_dummy_location)); + plongest (gdbarch->call_dummy_location)); fprintf_unfiltered (file, - "gdbarch_dump: cannot_fetch_register = <0x%lx>\n", - (long) current_gdbarch->cannot_fetch_register); + "gdbarch_dump: cannot_fetch_register = <%s>\n", + host_address_to_string (gdbarch->cannot_fetch_register)); fprintf_unfiltered (file, "gdbarch_dump: cannot_step_breakpoint = %s\n", - paddr_d (current_gdbarch->cannot_step_breakpoint)); + plongest (gdbarch->cannot_step_breakpoint)); fprintf_unfiltered (file, - "gdbarch_dump: cannot_store_register = <0x%lx>\n", - (long) current_gdbarch->cannot_store_register); + "gdbarch_dump: cannot_store_register = <%s>\n", + host_address_to_string (gdbarch->cannot_store_register)); fprintf_unfiltered (file, "gdbarch_dump: char_signed = %s\n", - paddr_d (current_gdbarch->char_signed)); - fprintf_unfiltered (file, - "gdbarch_dump: coff_make_msymbol_special = <0x%lx>\n", - (long) current_gdbarch->coff_make_msymbol_special); - fprintf_unfiltered (file, - "gdbarch_dump: construct_inferior_arguments = <0x%lx>\n", - (long) current_gdbarch->construct_inferior_arguments); - fprintf_unfiltered (file, - "gdbarch_dump: convert_from_func_ptr_addr = <0x%lx>\n", - (long) current_gdbarch->convert_from_func_ptr_addr); -#ifdef CONVERT_REGISTER_P + plongest (gdbarch->char_signed)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "CONVERT_REGISTER_P(regnum, type)", - XSTRING (CONVERT_REGISTER_P (regnum, type))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: convert_register_p = <0x%lx>\n", - (long) current_gdbarch->convert_register_p); - fprintf_unfiltered (file, - "gdbarch_dump: decr_pc_after_break = 0x%s\n", - paddr_nz (current_gdbarch->decr_pc_after_break)); -#ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P()", - XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P ())); -#endif + "gdbarch_dump: coff_make_msymbol_special = <%s>\n", + host_address_to_string (gdbarch->coff_make_msymbol_special)); fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_extract_struct_value_address_p() = %d\n", - gdbarch_deprecated_extract_struct_value_address_p (current_gdbarch)); -#ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS + "gdbarch_dump: convert_from_func_ptr_addr = <%s>\n", + host_address_to_string (gdbarch->convert_from_func_ptr_addr)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regcache)", - XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (regcache))); -#endif + "gdbarch_dump: convert_register_p = <%s>\n", + host_address_to_string (gdbarch->convert_register_p)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_extract_struct_value_address = <0x%lx>\n", - (long) current_gdbarch->deprecated_extract_struct_value_address); -#ifdef DEPRECATED_FP_REGNUM + "gdbarch_dump: gdbarch_core_pid_to_str_p() = %d\n", + gdbarch_core_pid_to_str_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FP_REGNUM # %s\n", - XSTRING (DEPRECATED_FP_REGNUM)); -#endif + "gdbarch_dump: core_pid_to_str = <%s>\n", + host_address_to_string (gdbarch->core_pid_to_str)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_fp_regnum = %s\n", - paddr_d (current_gdbarch->deprecated_fp_regnum)); -#ifdef DEPRECATED_FUNCTION_START_OFFSET + "gdbarch_dump: gdbarch_core_read_description_p() = %d\n", + gdbarch_core_read_description_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FUNCTION_START_OFFSET # %s\n", - XSTRING (DEPRECATED_FUNCTION_START_OFFSET)); -#endif + "gdbarch_dump: core_read_description = <%s>\n", + host_address_to_string (gdbarch->core_read_description)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_function_start_offset = 0x%s\n", - paddr_nz (current_gdbarch->deprecated_function_start_offset)); -#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR_P + "gdbarch_dump: core_reg_section_encodes_pid = %s\n", + plongest (gdbarch->core_reg_section_encodes_pid)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_REG_STRUCT_HAS_ADDR_P()", - XSTRING (DEPRECATED_REG_STRUCT_HAS_ADDR_P ())); -#endif + "gdbarch_dump: core_regset_sections = %s\n", + host_address_to_string (gdbarch->core_regset_sections)); fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_reg_struct_has_addr_p() = %d\n", - gdbarch_deprecated_reg_struct_has_addr_p (current_gdbarch)); -#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR + "gdbarch_dump: gdbarch_core_xfer_shared_libraries_p() = %d\n", + gdbarch_core_xfer_shared_libraries_p (gdbarch)); 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))); -#endif + "gdbarch_dump: core_xfer_shared_libraries = <%s>\n", + host_address_to_string (gdbarch->core_xfer_shared_libraries)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_reg_struct_has_addr = <0x%lx>\n", - (long) current_gdbarch->deprecated_reg_struct_has_addr); -#ifdef DEPRECATED_REGISTER_SIZE + "gdbarch_dump: decr_pc_after_break = %s\n", + core_addr_to_string_nz (gdbarch->decr_pc_after_break)); fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_REGISTER_SIZE # %s\n", - XSTRING (DEPRECATED_REGISTER_SIZE)); -#endif + "gdbarch_dump: deprecated_fp_regnum = %s\n", + plongest (gdbarch->deprecated_fp_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_register_size = %s\n", - paddr_d (current_gdbarch->deprecated_register_size)); -#ifdef DEPRECATED_STACK_ALIGN_P + "gdbarch_dump: deprecated_function_start_offset = %s\n", + core_addr_to_string_nz (gdbarch->deprecated_function_start_offset)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_STACK_ALIGN_P()", - XSTRING (DEPRECATED_STACK_ALIGN_P ())); -#endif + "gdbarch_dump: gdbarch_displaced_step_copy_insn_p() = %d\n", + gdbarch_displaced_step_copy_insn_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_stack_align_p() = %d\n", - gdbarch_deprecated_stack_align_p (current_gdbarch)); -#ifdef DEPRECATED_STACK_ALIGN + "gdbarch_dump: displaced_step_copy_insn = <%s>\n", + host_address_to_string (gdbarch->displaced_step_copy_insn)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_STACK_ALIGN(sp)", - XSTRING (DEPRECATED_STACK_ALIGN (sp))); -#endif + "gdbarch_dump: gdbarch_displaced_step_fixup_p() = %d\n", + gdbarch_displaced_step_fixup_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_stack_align = <0x%lx>\n", - (long) current_gdbarch->deprecated_stack_align); -#ifdef DEPRECATED_USE_STRUCT_CONVENTION + "gdbarch_dump: displaced_step_fixup = <%s>\n", + host_address_to_string (gdbarch->displaced_step_fixup)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_USE_STRUCT_CONVENTION(gcc_p, value_type)", - XSTRING (DEPRECATED_USE_STRUCT_CONVENTION (gcc_p, value_type))); -#endif + "gdbarch_dump: displaced_step_free_closure = <%s>\n", + host_address_to_string (gdbarch->displaced_step_free_closure)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_use_struct_convention = <0x%lx>\n", - (long) current_gdbarch->deprecated_use_struct_convention); + "gdbarch_dump: displaced_step_location = <%s>\n", + host_address_to_string (gdbarch->displaced_step_location)); fprintf_unfiltered (file, "gdbarch_dump: double_bit = %s\n", - paddr_d (current_gdbarch->double_bit)); + plongest (gdbarch->double_bit)); fprintf_unfiltered (file, "gdbarch_dump: double_format = %s\n", - pformat (current_gdbarch->double_format)); -#ifdef DWARF2_REG_TO_REGNUM + pformat (gdbarch->double_format)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DWARF2_REG_TO_REGNUM(dwarf2_regnr)", - XSTRING (DWARF2_REG_TO_REGNUM (dwarf2_regnr))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: dwarf2_reg_to_regnum = <0x%lx>\n", - (long) current_gdbarch->dwarf2_reg_to_regnum); -#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))); -#endif + "gdbarch_dump: gdbarch_dummy_id_p() = %d\n", + gdbarch_dummy_id_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: dwarf_reg_to_regnum = <0x%lx>\n", - (long) current_gdbarch->dwarf_reg_to_regnum); -#ifdef ECOFF_REG_TO_REGNUM + "gdbarch_dump: dummy_id = <%s>\n", + host_address_to_string (gdbarch->dummy_id)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "ECOFF_REG_TO_REGNUM(ecoff_regnr)", - XSTRING (ECOFF_REG_TO_REGNUM (ecoff_regnr))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: ecoff_reg_to_regnum = <0x%lx>\n", - (long) current_gdbarch->ecoff_reg_to_regnum); + "gdbarch_dump: dwarf2_reg_to_regnum = <%s>\n", + host_address_to_string (gdbarch->dwarf2_reg_to_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: elf_make_msymbol_special = <0x%lx>\n", - (long) current_gdbarch->elf_make_msymbol_special); -#ifdef EXTRACT_RETURN_VALUE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "EXTRACT_RETURN_VALUE(type, regcache, valbuf)", - XSTRING (EXTRACT_RETURN_VALUE (type, regcache, valbuf))); -#endif + "gdbarch_dump: ecoff_reg_to_regnum = <%s>\n", + host_address_to_string (gdbarch->ecoff_reg_to_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: extract_return_value = <0x%lx>\n", - (long) current_gdbarch->extract_return_value); + "gdbarch_dump: elf_make_msymbol_special = <%s>\n", + host_address_to_string (gdbarch->elf_make_msymbol_special)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_fetch_pointer_argument_p() = %d\n", - gdbarch_fetch_pointer_argument_p (current_gdbarch)); + gdbarch_fetch_pointer_argument_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: fetch_pointer_argument = <0x%lx>\n", - (long) current_gdbarch->fetch_pointer_argument); + "gdbarch_dump: fetch_pointer_argument = <%s>\n", + host_address_to_string (gdbarch->fetch_pointer_argument)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_fetch_tls_load_module_address_p() = %d\n", - gdbarch_fetch_tls_load_module_address_p (current_gdbarch)); + gdbarch_fetch_tls_load_module_address_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: fetch_tls_load_module_address = <0x%lx>\n", - (long) current_gdbarch->fetch_tls_load_module_address); + "gdbarch_dump: fetch_tls_load_module_address = <%s>\n", + host_address_to_string (gdbarch->fetch_tls_load_module_address)); fprintf_unfiltered (file, "gdbarch_dump: float_bit = %s\n", - paddr_d (current_gdbarch->float_bit)); + plongest (gdbarch->float_bit)); fprintf_unfiltered (file, "gdbarch_dump: float_format = %s\n", - pformat (current_gdbarch->float_format)); -#ifdef FP0_REGNUM - fprintf_unfiltered (file, - "gdbarch_dump: FP0_REGNUM # %s\n", - XSTRING (FP0_REGNUM)); -#endif + pformat (gdbarch->float_format)); fprintf_unfiltered (file, "gdbarch_dump: fp0_regnum = %s\n", - paddr_d (current_gdbarch->fp0_regnum)); + plongest (gdbarch->fp0_regnum)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_frame_align_p() = %d\n", - gdbarch_frame_align_p (current_gdbarch)); + gdbarch_frame_align_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: frame_align = <0x%lx>\n", - (long) current_gdbarch->frame_align); + "gdbarch_dump: frame_align = <%s>\n", + host_address_to_string (gdbarch->frame_align)); fprintf_unfiltered (file, - "gdbarch_dump: frame_args_skip = 0x%s\n", - paddr_nz (current_gdbarch->frame_args_skip)); + "gdbarch_dump: frame_args_skip = %s\n", + core_addr_to_string_nz (gdbarch->frame_args_skip)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_frame_num_args_p() = %d\n", - gdbarch_frame_num_args_p (current_gdbarch)); + gdbarch_frame_num_args_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: frame_num_args = <0x%lx>\n", - (long) current_gdbarch->frame_num_args); + "gdbarch_dump: frame_num_args = <%s>\n", + host_address_to_string (gdbarch->frame_num_args)); fprintf_unfiltered (file, "gdbarch_dump: frame_red_zone_size = %s\n", - paddr_d (current_gdbarch->frame_red_zone_size)); + plongest (gdbarch->frame_red_zone_size)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_gcore_bfd_target_p() = %d\n", + gdbarch_gcore_bfd_target_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: gcore_bfd_target = %s\n", + gdbarch->gcore_bfd_target); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_get_longjmp_target_p() = %d\n", - gdbarch_get_longjmp_target_p (current_gdbarch)); + gdbarch_get_longjmp_target_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: get_longjmp_target = <%s>\n", + host_address_to_string (gdbarch->get_longjmp_target)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_get_siginfo_type_p() = %d\n", + gdbarch_get_siginfo_type_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: get_siginfo_type = <%s>\n", + host_address_to_string (gdbarch->get_siginfo_type)); + fprintf_unfiltered (file, + "gdbarch_dump: has_global_breakpoints = %s\n", + plongest (gdbarch->has_global_breakpoints)); fprintf_unfiltered (file, - "gdbarch_dump: get_longjmp_target = <0x%lx>\n", - (long) current_gdbarch->get_longjmp_target); + "gdbarch_dump: has_global_solist = %s\n", + plongest (gdbarch->has_global_solist)); fprintf_unfiltered (file, "gdbarch_dump: have_nonsteppable_watchpoint = %s\n", - paddr_d (current_gdbarch->have_nonsteppable_watchpoint)); + plongest (gdbarch->have_nonsteppable_watchpoint)); fprintf_unfiltered (file, - "gdbarch_dump: in_function_epilogue_p = <0x%lx>\n", - (long) current_gdbarch->in_function_epilogue_p); + "gdbarch_dump: in_function_epilogue_p = <%s>\n", + host_address_to_string (gdbarch->in_function_epilogue_p)); fprintf_unfiltered (file, - "gdbarch_dump: in_solib_return_trampoline = <0x%lx>\n", - (long) current_gdbarch->in_solib_return_trampoline); + "gdbarch_dump: in_solib_return_trampoline = <%s>\n", + host_address_to_string (gdbarch->in_solib_return_trampoline)); fprintf_unfiltered (file, - "gdbarch_dump: inner_than = <0x%lx>\n", - (long) current_gdbarch->inner_than); + "gdbarch_dump: inner_than = <%s>\n", + host_address_to_string (gdbarch->inner_than)); fprintf_unfiltered (file, "gdbarch_dump: int_bit = %s\n", - paddr_d (current_gdbarch->int_bit)); + plongest (gdbarch->int_bit)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_integer_to_address_p() = %d\n", - gdbarch_integer_to_address_p (current_gdbarch)); + gdbarch_integer_to_address_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: integer_to_address = <0x%lx>\n", - (long) current_gdbarch->integer_to_address); + "gdbarch_dump: integer_to_address = <%s>\n", + host_address_to_string (gdbarch->integer_to_address)); fprintf_unfiltered (file, "gdbarch_dump: long_bit = %s\n", - paddr_d (current_gdbarch->long_bit)); + plongest (gdbarch->long_bit)); fprintf_unfiltered (file, "gdbarch_dump: long_double_bit = %s\n", - paddr_d (current_gdbarch->long_double_bit)); + plongest (gdbarch->long_double_bit)); fprintf_unfiltered (file, "gdbarch_dump: long_double_format = %s\n", - pformat (current_gdbarch->long_double_format)); + pformat (gdbarch->long_double_format)); fprintf_unfiltered (file, "gdbarch_dump: long_long_bit = %s\n", - paddr_d (current_gdbarch->long_long_bit)); + plongest (gdbarch->long_long_bit)); fprintf_unfiltered (file, - "gdbarch_dump: memory_insert_breakpoint = <0x%lx>\n", - (long) current_gdbarch->memory_insert_breakpoint); + "gdbarch_dump: gdbarch_max_insn_length_p() = %d\n", + gdbarch_max_insn_length_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: memory_remove_breakpoint = <0x%lx>\n", - (long) current_gdbarch->memory_remove_breakpoint); + "gdbarch_dump: max_insn_length = %s\n", + plongest (gdbarch->max_insn_length)); fprintf_unfiltered (file, - "gdbarch_dump: name_of_malloc = %s\n", - current_gdbarch->name_of_malloc); + "gdbarch_dump: memory_insert_breakpoint = <%s>\n", + host_address_to_string (gdbarch->memory_insert_breakpoint)); + fprintf_unfiltered (file, + "gdbarch_dump: memory_remove_breakpoint = <%s>\n", + host_address_to_string (gdbarch->memory_remove_breakpoint)); fprintf_unfiltered (file, "gdbarch_dump: num_pseudo_regs = %s\n", - paddr_d (current_gdbarch->num_pseudo_regs)); + plongest (gdbarch->num_pseudo_regs)); fprintf_unfiltered (file, "gdbarch_dump: num_regs = %s\n", - paddr_d (current_gdbarch->num_regs)); + plongest (gdbarch->num_regs)); fprintf_unfiltered (file, "gdbarch_dump: osabi = %s\n", - paddr_d (current_gdbarch->osabi)); + plongest (gdbarch->osabi)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_overlay_update_p() = %d\n", - gdbarch_overlay_update_p (current_gdbarch)); - fprintf_unfiltered (file, - "gdbarch_dump: overlay_update = <0x%lx>\n", - (long) current_gdbarch->overlay_update); -#ifdef PC_REGNUM + gdbarch_overlay_update_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: PC_REGNUM # %s\n", - XSTRING (PC_REGNUM)); -#endif + "gdbarch_dump: overlay_update = <%s>\n", + host_address_to_string (gdbarch->overlay_update)); fprintf_unfiltered (file, "gdbarch_dump: pc_regnum = %s\n", - paddr_d (current_gdbarch->pc_regnum)); + plongest (gdbarch->pc_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: pointer_to_address = <0x%lx>\n", - (long) current_gdbarch->pointer_to_address); + "gdbarch_dump: pointer_to_address = <%s>\n", + host_address_to_string (gdbarch->pointer_to_address)); 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%lx>\n", - (long) current_gdbarch->print_float_info); -#ifdef TARGET_PRINT_INSN + gdbarch_print_float_info_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_PRINT_INSN(vma, info)", - XSTRING (TARGET_PRINT_INSN (vma, info))); -#endif + "gdbarch_dump: print_float_info = <%s>\n", + host_address_to_string (gdbarch->print_float_info)); fprintf_unfiltered (file, - "gdbarch_dump: print_insn = <0x%lx>\n", - (long) current_gdbarch->print_insn); + "gdbarch_dump: print_insn = <%s>\n", + host_address_to_string (gdbarch->print_insn)); fprintf_unfiltered (file, - "gdbarch_dump: print_registers_info = <0x%lx>\n", - (long) current_gdbarch->print_registers_info); + "gdbarch_dump: print_registers_info = <%s>\n", + host_address_to_string (gdbarch->print_registers_info)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_print_vector_info_p() = %d\n", - gdbarch_print_vector_info_p (current_gdbarch)); + gdbarch_print_vector_info_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: print_vector_info = <0x%lx>\n", - (long) current_gdbarch->print_vector_info); -#ifdef PS_REGNUM + "gdbarch_dump: print_vector_info = <%s>\n", + host_address_to_string (gdbarch->print_vector_info)); fprintf_unfiltered (file, - "gdbarch_dump: PS_REGNUM # %s\n", - XSTRING (PS_REGNUM)); -#endif + "gdbarch_dump: gdbarch_process_record_p() = %d\n", + gdbarch_process_record_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: process_record = <%s>\n", + host_address_to_string (gdbarch->process_record)); fprintf_unfiltered (file, "gdbarch_dump: ps_regnum = %s\n", - paddr_d (current_gdbarch->ps_regnum)); + plongest (gdbarch->ps_regnum)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_pseudo_register_read_p() = %d\n", - gdbarch_pseudo_register_read_p (current_gdbarch)); + gdbarch_pseudo_register_read_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: pseudo_register_read = <0x%lx>\n", - (long) current_gdbarch->pseudo_register_read); + "gdbarch_dump: pseudo_register_read = <%s>\n", + host_address_to_string (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%lx>\n", - (long) current_gdbarch->pseudo_register_write); -#ifdef TARGET_PTR_BIT + gdbarch_pseudo_register_write_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: TARGET_PTR_BIT # %s\n", - XSTRING (TARGET_PTR_BIT)); -#endif + "gdbarch_dump: pseudo_register_write = <%s>\n", + host_address_to_string (gdbarch->pseudo_register_write)); fprintf_unfiltered (file, "gdbarch_dump: ptr_bit = %s\n", - paddr_d (current_gdbarch->ptr_bit)); + plongest (gdbarch->ptr_bit)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_push_dummy_call_p() = %d\n", - gdbarch_push_dummy_call_p (current_gdbarch)); + gdbarch_push_dummy_call_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: push_dummy_call = <0x%lx>\n", - (long) current_gdbarch->push_dummy_call); + "gdbarch_dump: push_dummy_call = <%s>\n", + host_address_to_string (gdbarch->push_dummy_call)); fprintf_unfiltered (file, "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%lx>\n", - (long) current_gdbarch->push_dummy_code); -#ifdef TARGET_READ_PC_P + gdbarch_push_dummy_code_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_READ_PC_P()", - XSTRING (TARGET_READ_PC_P ())); -#endif + "gdbarch_dump: push_dummy_code = <%s>\n", + host_address_to_string (gdbarch->push_dummy_code)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_read_pc_p() = %d\n", - gdbarch_read_pc_p (current_gdbarch)); -#ifdef TARGET_READ_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_READ_PC(ptid)", - XSTRING (TARGET_READ_PC (ptid))); -#endif + gdbarch_read_pc_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: read_pc = <0x%lx>\n", - (long) current_gdbarch->read_pc); + "gdbarch_dump: read_pc = <%s>\n", + host_address_to_string (gdbarch->read_pc)); fprintf_unfiltered (file, - "gdbarch_dump: register_name = <0x%lx>\n", - (long) current_gdbarch->register_name); + "gdbarch_dump: gdbarch_record_special_symbol_p() = %d\n", + gdbarch_record_special_symbol_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: register_reggroup_p = <0x%lx>\n", - (long) current_gdbarch->register_reggroup_p); -#ifdef REGISTER_SIM_REGNO + "gdbarch_dump: record_special_symbol = <%s>\n", + host_address_to_string (gdbarch->record_special_symbol)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_SIM_REGNO(reg_nr)", - XSTRING (REGISTER_SIM_REGNO (reg_nr))); -#endif + "gdbarch_dump: register_name = <%s>\n", + host_address_to_string (gdbarch->register_name)); fprintf_unfiltered (file, - "gdbarch_dump: register_sim_regno = <0x%lx>\n", - (long) current_gdbarch->register_sim_regno); -#ifdef REGISTER_TO_VALUE + "gdbarch_dump: register_reggroup_p = <%s>\n", + host_address_to_string (gdbarch->register_reggroup_p)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_TO_VALUE(frame, regnum, type, buf)", - XSTRING (REGISTER_TO_VALUE (frame, regnum, type, buf))); -#endif + "gdbarch_dump: register_sim_regno = <%s>\n", + host_address_to_string (gdbarch->register_sim_regno)); fprintf_unfiltered (file, - "gdbarch_dump: register_to_value = <0x%lx>\n", - (long) current_gdbarch->register_to_value); + "gdbarch_dump: register_to_value = <%s>\n", + host_address_to_string (gdbarch->register_to_value)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_register_type_p() = %d\n", - gdbarch_register_type_p (current_gdbarch)); + gdbarch_register_type_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: register_type = <0x%lx>\n", - (long) current_gdbarch->register_type); + "gdbarch_dump: register_type = <%s>\n", + host_address_to_string (gdbarch->register_type)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_regset_from_core_section_p() = %d\n", - gdbarch_regset_from_core_section_p (current_gdbarch)); + gdbarch_regset_from_core_section_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: regset_from_core_section = <0x%lx>\n", - (long) current_gdbarch->regset_from_core_section); + "gdbarch_dump: regset_from_core_section = <%s>\n", + host_address_to_string (gdbarch->regset_from_core_section)); fprintf_unfiltered (file, - "gdbarch_dump: remote_register_number = <0x%lx>\n", - (long) current_gdbarch->remote_register_number); + "gdbarch_dump: remote_register_number = <%s>\n", + host_address_to_string (gdbarch->remote_register_number)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_return_value_p() = %d\n", - gdbarch_return_value_p (current_gdbarch)); - fprintf_unfiltered (file, - "gdbarch_dump: return_value = <0x%lx>\n", - (long) current_gdbarch->return_value); -#ifdef SDB_REG_TO_REGNUM + gdbarch_return_value_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SDB_REG_TO_REGNUM(sdb_regnr)", - XSTRING (SDB_REG_TO_REGNUM (sdb_regnr))); -#endif + "gdbarch_dump: return_value = <%s>\n", + host_address_to_string (gdbarch->return_value)); fprintf_unfiltered (file, - "gdbarch_dump: sdb_reg_to_regnum = <0x%lx>\n", - (long) current_gdbarch->sdb_reg_to_regnum); + "gdbarch_dump: sdb_reg_to_regnum = <%s>\n", + host_address_to_string (gdbarch->sdb_reg_to_regnum)); fprintf_unfiltered (file, "gdbarch_dump: short_bit = %s\n", - paddr_d (current_gdbarch->short_bit)); + plongest (gdbarch->short_bit)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_single_step_through_delay_p() = %d\n", - gdbarch_single_step_through_delay_p (current_gdbarch)); + gdbarch_single_step_through_delay_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: single_step_through_delay = <0x%lx>\n", - (long) current_gdbarch->single_step_through_delay); + "gdbarch_dump: single_step_through_delay = <%s>\n", + host_address_to_string (gdbarch->single_step_through_delay)); fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_skip_permanent_breakpoint_p() = %d\n", - gdbarch_skip_permanent_breakpoint_p (current_gdbarch)); + "gdbarch_dump: gdbarch_skip_main_prologue_p() = %d\n", + gdbarch_skip_main_prologue_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: skip_permanent_breakpoint = <0x%lx>\n", - (long) current_gdbarch->skip_permanent_breakpoint); + "gdbarch_dump: skip_main_prologue = <%s>\n", + host_address_to_string (gdbarch->skip_main_prologue)); fprintf_unfiltered (file, - "gdbarch_dump: skip_prologue = <0x%lx>\n", - (long) current_gdbarch->skip_prologue); + "gdbarch_dump: gdbarch_skip_permanent_breakpoint_p() = %d\n", + gdbarch_skip_permanent_breakpoint_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: skip_solib_resolver = <0x%lx>\n", - (long) current_gdbarch->skip_solib_resolver); + "gdbarch_dump: skip_permanent_breakpoint = <%s>\n", + host_address_to_string (gdbarch->skip_permanent_breakpoint)); fprintf_unfiltered (file, - "gdbarch_dump: skip_trampoline_code = <0x%lx>\n", - (long) current_gdbarch->skip_trampoline_code); -#ifdef SMASH_TEXT_ADDRESS + "gdbarch_dump: skip_prologue = <%s>\n", + host_address_to_string (gdbarch->skip_prologue)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SMASH_TEXT_ADDRESS(addr)", - XSTRING (SMASH_TEXT_ADDRESS (addr))); -#endif + "gdbarch_dump: skip_solib_resolver = <%s>\n", + host_address_to_string (gdbarch->skip_solib_resolver)); fprintf_unfiltered (file, - "gdbarch_dump: smash_text_address = <0x%lx>\n", - (long) current_gdbarch->smash_text_address); -#ifdef SOFTWARE_SINGLE_STEP_P + "gdbarch_dump: skip_trampoline_code = <%s>\n", + host_address_to_string (gdbarch->skip_trampoline_code)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SOFTWARE_SINGLE_STEP_P()", - XSTRING (SOFTWARE_SINGLE_STEP_P ())); -#endif + "gdbarch_dump: smash_text_address = <%s>\n", + host_address_to_string (gdbarch->smash_text_address)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_software_single_step_p() = %d\n", - gdbarch_software_single_step_p (current_gdbarch)); -#ifdef SOFTWARE_SINGLE_STEP - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SOFTWARE_SINGLE_STEP(regcache)", - XSTRING (SOFTWARE_SINGLE_STEP (regcache))); -#endif + gdbarch_software_single_step_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: software_single_step = <0x%lx>\n", - (long) current_gdbarch->software_single_step); -#ifdef SP_REGNUM + "gdbarch_dump: software_single_step = <%s>\n", + host_address_to_string (gdbarch->software_single_step)); fprintf_unfiltered (file, - "gdbarch_dump: SP_REGNUM # %s\n", - XSTRING (SP_REGNUM)); -#endif + "gdbarch_dump: sofun_address_maybe_missing = %s\n", + plongest (gdbarch->sofun_address_maybe_missing)); fprintf_unfiltered (file, "gdbarch_dump: sp_regnum = %s\n", - paddr_d (current_gdbarch->sp_regnum)); -#ifdef STAB_REG_TO_REGNUM + plongest (gdbarch->sp_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STAB_REG_TO_REGNUM(stab_regnr)", - XSTRING (STAB_REG_TO_REGNUM (stab_regnr))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: stab_reg_to_regnum = <0x%lx>\n", - (long) current_gdbarch->stab_reg_to_regnum); + "gdbarch_dump: stab_reg_to_regnum = <%s>\n", + host_address_to_string (gdbarch->stab_reg_to_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: stabs_argument_has_addr = <0x%lx>\n", - (long) current_gdbarch->stabs_argument_has_addr); -#ifdef STORE_RETURN_VALUE + "gdbarch_dump: stabs_argument_has_addr = <%s>\n", + host_address_to_string (gdbarch->stabs_argument_has_addr)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STORE_RETURN_VALUE(type, regcache, valbuf)", - XSTRING (STORE_RETURN_VALUE (type, regcache, valbuf))); -#endif + "gdbarch_dump: gdbarch_static_transform_name_p() = %d\n", + gdbarch_static_transform_name_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: store_return_value = <0x%lx>\n", - (long) current_gdbarch->store_return_value); + "gdbarch_dump: static_transform_name = <%s>\n", + host_address_to_string (gdbarch->static_transform_name)); fprintf_unfiltered (file, "gdbarch_dump: target_desc = %s\n", - paddr_d ((long) current_gdbarch->target_desc)); + host_address_to_string (gdbarch->target_desc)); fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_unwind_dummy_id_p() = %d\n", - gdbarch_unwind_dummy_id_p (current_gdbarch)); + "gdbarch_dump: target_signal_from_host = <%s>\n", + host_address_to_string (gdbarch->target_signal_from_host)); fprintf_unfiltered (file, - "gdbarch_dump: unwind_dummy_id = <0x%lx>\n", - (long) current_gdbarch->unwind_dummy_id); + "gdbarch_dump: target_signal_to_host = <%s>\n", + host_address_to_string (gdbarch->target_signal_to_host)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_unwind_pc_p() = %d\n", - gdbarch_unwind_pc_p (current_gdbarch)); + gdbarch_unwind_pc_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: unwind_pc = <0x%lx>\n", - (long) current_gdbarch->unwind_pc); + "gdbarch_dump: unwind_pc = <%s>\n", + host_address_to_string (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%lx>\n", - (long) current_gdbarch->unwind_sp); + gdbarch_unwind_sp_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: value_from_register = <0x%lx>\n", - (long) current_gdbarch->value_from_register); -#ifdef VALUE_TO_REGISTER + "gdbarch_dump: unwind_sp = <%s>\n", + host_address_to_string (gdbarch->unwind_sp)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "VALUE_TO_REGISTER(frame, regnum, type, buf)", - XSTRING (VALUE_TO_REGISTER (frame, regnum, type, buf))); -#endif + "gdbarch_dump: value_from_register = <%s>\n", + host_address_to_string (gdbarch->value_from_register)); fprintf_unfiltered (file, - "gdbarch_dump: value_to_register = <0x%lx>\n", - (long) current_gdbarch->value_to_register); + "gdbarch_dump: value_to_register = <%s>\n", + host_address_to_string (gdbarch->value_to_register)); fprintf_unfiltered (file, "gdbarch_dump: vbit_in_delta = %s\n", - paddr_d (current_gdbarch->vbit_in_delta)); -#ifdef TARGET_VIRTUAL_FRAME_POINTER - 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 + plongest (gdbarch->vbit_in_delta)); fprintf_unfiltered (file, - "gdbarch_dump: virtual_frame_pointer = <0x%lx>\n", - (long) current_gdbarch->virtual_frame_pointer); + "gdbarch_dump: virtual_frame_pointer = <%s>\n", + host_address_to_string (gdbarch->virtual_frame_pointer)); fprintf_unfiltered (file, "gdbarch_dump: vtable_function_descriptors = %s\n", - paddr_d (current_gdbarch->vtable_function_descriptors)); -#ifdef TARGET_WRITE_PC + plongest (gdbarch->vtable_function_descriptors)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_WRITE_PC(val, ptid)", - XSTRING (TARGET_WRITE_PC (val, ptid))); -#endif + "gdbarch_dump: gdbarch_write_pc_p() = %d\n", + gdbarch_write_pc_p (gdbarch)); fprintf_unfiltered (file, - "gdbarch_dump: write_pc = <0x%lx>\n", - (long) current_gdbarch->write_pc); - if (current_gdbarch->dump_tdep != NULL) - current_gdbarch->dump_tdep (current_gdbarch, file); + "gdbarch_dump: write_pc = <%s>\n", + host_address_to_string (gdbarch->write_pc)); + if (gdbarch->dump_tdep != NULL) + gdbarch->dump_tdep (gdbarch, file); } struct gdbarch_tdep * @@ -1317,6 +1169,15 @@ gdbarch_byte_order (struct gdbarch *gdbarch) return gdbarch->byte_order; } +int +gdbarch_byte_order_for_code (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_byte_order_for_code called\n"); + return gdbarch->byte_order_for_code; +} + enum gdb_osabi gdbarch_osabi (struct gdbarch *gdbarch) { @@ -1335,6 +1196,23 @@ gdbarch_target_desc (struct gdbarch *gdbarch) return gdbarch->target_desc; } +int +gdbarch_bits_big_endian (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of bits_big_endian, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_bits_big_endian called\n"); + return gdbarch->bits_big_endian; +} + +void +set_gdbarch_bits_big_endian (struct gdbarch *gdbarch, + int bits_big_endian) +{ + gdbarch->bits_big_endian = bits_big_endian; +} + int gdbarch_short_bit (struct gdbarch *gdbarch) { @@ -1537,23 +1415,6 @@ set_gdbarch_addr_bit (struct gdbarch *gdbarch, gdbarch->addr_bit = addr_bit; } -int -gdbarch_bfd_vma_bit (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of bfd_vma_bit, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_bfd_vma_bit called\n"); - return gdbarch->bfd_vma_bit; -} - -void -set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, - int bfd_vma_bit) -{ - gdbarch->bfd_vma_bit = bfd_vma_bit; -} - int gdbarch_char_signed (struct gdbarch *gdbarch) { @@ -1580,13 +1441,13 @@ gdbarch_read_pc_p (struct gdbarch *gdbarch) } CORE_ADDR -gdbarch_read_pc (struct gdbarch *gdbarch, ptid_t ptid) +gdbarch_read_pc (struct gdbarch *gdbarch, struct regcache *regcache) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->read_pc != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_read_pc called\n"); - return gdbarch->read_pc (ptid); + return gdbarch->read_pc (regcache); } void @@ -1596,14 +1457,21 @@ set_gdbarch_read_pc (struct gdbarch *gdbarch, gdbarch->read_pc = read_pc; } +int +gdbarch_write_pc_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->write_pc != NULL; +} + void -gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR val, ptid_t ptid) +gdbarch_write_pc (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR val) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->write_pc != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_write_pc called\n"); - gdbarch->write_pc (val, ptid); + gdbarch->write_pc (regcache, val); } void @@ -1620,7 +1488,7 @@ gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, int *frame gdb_assert (gdbarch->virtual_frame_pointer != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_virtual_frame_pointer called\n"); - gdbarch->virtual_frame_pointer (pc, frame_regnum, frame_offset); + gdbarch->virtual_frame_pointer (gdbarch, pc, frame_regnum, frame_offset); } void @@ -1788,7 +1656,7 @@ gdbarch_stab_reg_to_regnum (struct gdbarch *gdbarch, int stab_regnr) gdb_assert (gdbarch->stab_reg_to_regnum != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_stab_reg_to_regnum called\n"); - return gdbarch->stab_reg_to_regnum (stab_regnr); + return gdbarch->stab_reg_to_regnum (gdbarch, stab_regnr); } void @@ -1805,7 +1673,7 @@ gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, int ecoff_regnr) gdb_assert (gdbarch->ecoff_reg_to_regnum != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_ecoff_reg_to_regnum called\n"); - return gdbarch->ecoff_reg_to_regnum (ecoff_regnr); + return gdbarch->ecoff_reg_to_regnum (gdbarch, ecoff_regnr); } void @@ -1815,23 +1683,6 @@ set_gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, gdbarch->ecoff_reg_to_regnum = ecoff_reg_to_regnum; } -int -gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int dwarf_regnr) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->dwarf_reg_to_regnum != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_dwarf_reg_to_regnum called\n"); - return gdbarch->dwarf_reg_to_regnum (dwarf_regnr); -} - -void -set_gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, - gdbarch_dwarf_reg_to_regnum_ftype dwarf_reg_to_regnum) -{ - gdbarch->dwarf_reg_to_regnum = dwarf_reg_to_regnum; -} - int gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, int sdb_regnr) { @@ -1839,7 +1690,7 @@ gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, int sdb_regnr) gdb_assert (gdbarch->sdb_reg_to_regnum != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_sdb_reg_to_regnum called\n"); - return gdbarch->sdb_reg_to_regnum (sdb_regnr); + return gdbarch->sdb_reg_to_regnum (gdbarch, sdb_regnr); } void @@ -1856,7 +1707,7 @@ gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2_regnr) gdb_assert (gdbarch->dwarf2_reg_to_regnum != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_dwarf2_reg_to_regnum called\n"); - return gdbarch->dwarf2_reg_to_regnum (dwarf2_regnr); + return gdbarch->dwarf2_reg_to_regnum (gdbarch, dwarf2_regnr); } void @@ -1873,7 +1724,7 @@ gdbarch_register_name (struct gdbarch *gdbarch, int regnr) gdb_assert (gdbarch->register_name != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_name called\n"); - return gdbarch->register_name (regnr); + return gdbarch->register_name (gdbarch, regnr); } void @@ -1908,27 +1759,27 @@ set_gdbarch_register_type (struct gdbarch *gdbarch, } int -gdbarch_unwind_dummy_id_p (struct gdbarch *gdbarch) +gdbarch_dummy_id_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->unwind_dummy_id != NULL; + return gdbarch->dummy_id != NULL; } struct frame_id -gdbarch_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *info) +gdbarch_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->unwind_dummy_id != NULL); + gdb_assert (gdbarch->dummy_id != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_unwind_dummy_id called\n"); - return gdbarch->unwind_dummy_id (gdbarch, info); + fprintf_unfiltered (gdb_stdlog, "gdbarch_dummy_id called\n"); + return gdbarch->dummy_id (gdbarch, this_frame); } void -set_gdbarch_unwind_dummy_id (struct gdbarch *gdbarch, - gdbarch_unwind_dummy_id_ftype unwind_dummy_id) +set_gdbarch_dummy_id (struct gdbarch *gdbarch, + gdbarch_dummy_id_ftype dummy_id) { - gdbarch->unwind_dummy_id = unwind_dummy_id; + gdbarch->dummy_id = dummy_id; } int @@ -1972,22 +1823,6 @@ set_gdbarch_push_dummy_call (struct gdbarch *gdbarch, gdbarch->push_dummy_call = push_dummy_call; } -int -gdbarch_deprecated_register_size (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_register_size called\n"); - return gdbarch->deprecated_register_size; -} - -void -set_gdbarch_deprecated_register_size (struct gdbarch *gdbarch, - int deprecated_register_size) -{ - gdbarch->deprecated_register_size = deprecated_register_size; -} - int gdbarch_call_dummy_location (struct gdbarch *gdbarch) { @@ -2013,13 +1848,13 @@ gdbarch_push_dummy_code_p (struct gdbarch *gdbarch) } 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) +gdbarch_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp, CORE_ADDR funaddr, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr, struct regcache *regcache) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->push_dummy_code != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_code called\n"); - return gdbarch->push_dummy_code (gdbarch, sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr); + return gdbarch->push_dummy_code (gdbarch, sp, funaddr, args, nargs, value_type, real_pc, bp_addr, regcache); } void @@ -2101,7 +1936,7 @@ gdbarch_register_sim_regno (struct gdbarch *gdbarch, int reg_nr) gdb_assert (gdbarch->register_sim_regno != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_sim_regno called\n"); - return gdbarch->register_sim_regno (reg_nr); + return gdbarch->register_sim_regno (gdbarch, reg_nr); } void @@ -2118,7 +1953,7 @@ gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, int regnum) gdb_assert (gdbarch->cannot_fetch_register != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_cannot_fetch_register called\n"); - return gdbarch->cannot_fetch_register (regnum); + return gdbarch->cannot_fetch_register (gdbarch, regnum); } void @@ -2135,7 +1970,7 @@ gdbarch_cannot_store_register (struct gdbarch *gdbarch, int regnum) gdb_assert (gdbarch->cannot_store_register != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_cannot_store_register called\n"); - return gdbarch->cannot_store_register (regnum); + return gdbarch->cannot_store_register (gdbarch, regnum); } void @@ -2153,13 +1988,13 @@ gdbarch_get_longjmp_target_p (struct gdbarch *gdbarch) } int -gdbarch_get_longjmp_target (struct gdbarch *gdbarch, CORE_ADDR *pc) +gdbarch_get_longjmp_target (struct gdbarch *gdbarch, struct frame_info *frame, CORE_ADDR *pc) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->get_longjmp_target != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_get_longjmp_target called\n"); - return gdbarch->get_longjmp_target (pc); + return gdbarch->get_longjmp_target (frame, pc); } void @@ -2192,7 +2027,7 @@ gdbarch_convert_register_p (struct gdbarch *gdbarch, int regnum, struct type *ty gdb_assert (gdbarch->convert_register_p != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_convert_register_p called\n"); - return gdbarch->convert_register_p (regnum, type); + return gdbarch->convert_register_p (gdbarch, regnum, type); } void @@ -2260,7 +2095,7 @@ gdbarch_pointer_to_address (struct gdbarch *gdbarch, struct type *type, const gd gdb_assert (gdbarch->pointer_to_address != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_pointer_to_address called\n"); - return gdbarch->pointer_to_address (type, buf); + return gdbarch->pointer_to_address (gdbarch, type, buf); } void @@ -2277,7 +2112,7 @@ gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, gdb_byte gdb_assert (gdbarch->address_to_pointer != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_address_to_pointer called\n"); - gdbarch->address_to_pointer (type, buf, addr); + gdbarch->address_to_pointer (gdbarch, type, buf, addr); } void @@ -2315,18 +2150,17 @@ int gdbarch_return_value_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->return_value != legacy_return_value; + return gdbarch->return_value != NULL; } enum return_value_convention -gdbarch_return_value (struct gdbarch *gdbarch, struct type *valtype, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf) +gdbarch_return_value (struct gdbarch *gdbarch, struct type *functype, struct type *valtype, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->return_value != NULL); - /* Do not check predicate: gdbarch->return_value != legacy_return_value, allow call. */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_return_value called\n"); - return gdbarch->return_value (gdbarch, valtype, regcache, readbuf, writebuf); + return gdbarch->return_value (gdbarch, functype, valtype, regcache, readbuf, writebuf); } void @@ -2336,96 +2170,45 @@ set_gdbarch_return_value (struct gdbarch *gdbarch, gdbarch->return_value = return_value; } -void -gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, gdb_byte *valbuf) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->extract_return_value != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_return_value called\n"); - gdbarch->extract_return_value (type, regcache, valbuf); -} - -void -set_gdbarch_extract_return_value (struct gdbarch *gdbarch, - gdbarch_extract_return_value_ftype extract_return_value) -{ - gdbarch->extract_return_value = extract_return_value; -} - -void -gdbarch_store_return_value (struct gdbarch *gdbarch, struct type *type, struct regcache *regcache, const gdb_byte *valbuf) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->store_return_value != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_store_return_value called\n"); - gdbarch->store_return_value (type, regcache, valbuf); -} - -void -set_gdbarch_store_return_value (struct gdbarch *gdbarch, - gdbarch_store_return_value_ftype store_return_value) -{ - gdbarch->store_return_value = store_return_value; -} - -int -gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type) +CORE_ADDR +gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_use_struct_convention != NULL); + gdb_assert (gdbarch->skip_prologue != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_use_struct_convention called\n"); - return gdbarch->deprecated_use_struct_convention (gcc_p, value_type); + fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_prologue called\n"); + return gdbarch->skip_prologue (gdbarch, ip); } void -set_gdbarch_deprecated_use_struct_convention (struct gdbarch *gdbarch, - gdbarch_deprecated_use_struct_convention_ftype deprecated_use_struct_convention) +set_gdbarch_skip_prologue (struct gdbarch *gdbarch, + gdbarch_skip_prologue_ftype skip_prologue) { - gdbarch->deprecated_use_struct_convention = deprecated_use_struct_convention; + gdbarch->skip_prologue = skip_prologue; } int -gdbarch_deprecated_extract_struct_value_address_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_extract_struct_value_address != NULL; -} - -CORE_ADDR -gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, struct regcache *regcache) +gdbarch_skip_main_prologue_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_extract_struct_value_address != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_extract_struct_value_address called\n"); - return gdbarch->deprecated_extract_struct_value_address (regcache); -} - -void -set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, - gdbarch_deprecated_extract_struct_value_address_ftype deprecated_extract_struct_value_address) -{ - gdbarch->deprecated_extract_struct_value_address = deprecated_extract_struct_value_address; + return gdbarch->skip_main_prologue != NULL; } CORE_ADDR -gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) +gdbarch_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->skip_prologue != NULL); + gdb_assert (gdbarch->skip_main_prologue != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_prologue called\n"); - return gdbarch->skip_prologue (ip); + fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_main_prologue called\n"); + return gdbarch->skip_main_prologue (gdbarch, ip); } void -set_gdbarch_skip_prologue (struct gdbarch *gdbarch, - gdbarch_skip_prologue_ftype skip_prologue) +set_gdbarch_skip_main_prologue (struct gdbarch *gdbarch, + gdbarch_skip_main_prologue_ftype skip_main_prologue) { - gdbarch->skip_prologue = skip_prologue; + gdbarch->skip_main_prologue = skip_main_prologue; } int @@ -2452,7 +2235,7 @@ gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenp gdb_assert (gdbarch->breakpoint_from_pc != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_breakpoint_from_pc called\n"); - return gdbarch->breakpoint_from_pc (pcptr, lenptr); + return gdbarch->breakpoint_from_pc (gdbarch, pcptr, lenptr); } void @@ -2493,7 +2276,7 @@ gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, struct bp_target_info gdb_assert (gdbarch->memory_insert_breakpoint != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_insert_breakpoint called\n"); - return gdbarch->memory_insert_breakpoint (bp_tgt); + return gdbarch->memory_insert_breakpoint (gdbarch, bp_tgt); } void @@ -2510,7 +2293,7 @@ gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, struct bp_target_info gdb_assert (gdbarch->memory_remove_breakpoint != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_remove_breakpoint called\n"); - return gdbarch->memory_remove_breakpoint (bp_tgt); + return gdbarch->memory_remove_breakpoint (gdbarch, bp_tgt); } void @@ -2684,30 +2467,6 @@ set_gdbarch_frame_num_args (struct gdbarch *gdbarch, gdbarch->frame_num_args = frame_num_args; } -int -gdbarch_deprecated_stack_align_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_stack_align != NULL; -} - -CORE_ADDR -gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_stack_align != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_stack_align called\n"); - return gdbarch->deprecated_stack_align (sp); -} - -void -set_gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, - gdbarch_deprecated_stack_align_ftype deprecated_stack_align) -{ - gdbarch->deprecated_stack_align = deprecated_stack_align; -} - int gdbarch_frame_align_p (struct gdbarch *gdbarch) { @@ -2732,30 +2491,6 @@ set_gdbarch_frame_align (struct gdbarch *gdbarch, gdbarch->frame_align = frame_align; } -int -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); - 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_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type) { @@ -2813,7 +2548,7 @@ gdbarch_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr) gdb_assert (gdbarch->addr_bits_remove != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_addr_bits_remove called\n"); - return gdbarch->addr_bits_remove (addr); + return gdbarch->addr_bits_remove (gdbarch, addr); } void @@ -2830,7 +2565,7 @@ gdbarch_smash_text_address (struct gdbarch *gdbarch, CORE_ADDR addr) gdb_assert (gdbarch->smash_text_address != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_smash_text_address called\n"); - return gdbarch->smash_text_address (addr); + return gdbarch->smash_text_address (gdbarch, addr); } void @@ -2848,13 +2583,13 @@ gdbarch_software_single_step_p (struct gdbarch *gdbarch) } int -gdbarch_software_single_step (struct gdbarch *gdbarch, struct regcache *regcache) +gdbarch_software_single_step (struct gdbarch *gdbarch, struct frame_info *frame) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->software_single_step != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_software_single_step called\n"); - return gdbarch->software_single_step (regcache); + return gdbarch->software_single_step (frame); } void @@ -2906,13 +2641,13 @@ set_gdbarch_print_insn (struct gdbarch *gdbarch, } CORE_ADDR -gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, CORE_ADDR pc) +gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, struct frame_info *frame, CORE_ADDR pc) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->skip_trampoline_code != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_trampoline_code called\n"); - return gdbarch->skip_trampoline_code (pc); + return gdbarch->skip_trampoline_code (frame, pc); } void @@ -2946,7 +2681,7 @@ gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, char gdb_assert (gdbarch->in_solib_return_trampoline != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_in_solib_return_trampoline called\n"); - return gdbarch->in_solib_return_trampoline (pc, name); + return gdbarch->in_solib_return_trampoline (gdbarch, pc, name); } void @@ -2973,23 +2708,6 @@ set_gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch, gdbarch->in_function_epilogue_p = in_function_epilogue_p; } -char * -gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch, int argc, char **argv) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->construct_inferior_arguments != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_construct_inferior_arguments called\n"); - return gdbarch->construct_inferior_arguments (gdbarch, argc, argv); -} - -void -set_gdbarch_construct_inferior_arguments (struct gdbarch *gdbarch, - gdbarch_construct_inferior_arguments_ftype construct_inferior_arguments) -{ - gdbarch->construct_inferior_arguments = construct_inferior_arguments; -} - void gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, asymbol *sym, struct minimal_symbol *msym) { @@ -3024,23 +2742,6 @@ set_gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, gdbarch->coff_make_msymbol_special = coff_make_msymbol_special; } -const char * -gdbarch_name_of_malloc (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of name_of_malloc, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_name_of_malloc called\n"); - return gdbarch->name_of_malloc; -} - -void -set_gdbarch_name_of_malloc (struct gdbarch *gdbarch, - const char * name_of_malloc) -{ - gdbarch->name_of_malloc = name_of_malloc; -} - int gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch) { @@ -3213,63 +2914,277 @@ set_gdbarch_regset_from_core_section (struct gdbarch *gdbarch, } int -gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch) +gdbarch_core_reg_section_encodes_pid (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of vtable_function_descriptors, invalid_p == 0 */ + /* Skip verify of core_reg_section_encodes_pid, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_vtable_function_descriptors called\n"); - return gdbarch->vtable_function_descriptors; + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_reg_section_encodes_pid called\n"); + return gdbarch->core_reg_section_encodes_pid; } void -set_gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch, - int vtable_function_descriptors) +set_gdbarch_core_reg_section_encodes_pid (struct gdbarch *gdbarch, + int core_reg_section_encodes_pid) { - gdbarch->vtable_function_descriptors = vtable_function_descriptors; + gdbarch->core_reg_section_encodes_pid = core_reg_section_encodes_pid; } -int -gdbarch_vbit_in_delta (struct gdbarch *gdbarch) +struct core_regset_section * +gdbarch_core_regset_sections (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of vbit_in_delta, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_vbit_in_delta called\n"); - return gdbarch->vbit_in_delta; + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_regset_sections called\n"); + return gdbarch->core_regset_sections; } void -set_gdbarch_vbit_in_delta (struct gdbarch *gdbarch, - int vbit_in_delta) +set_gdbarch_core_regset_sections (struct gdbarch *gdbarch, + struct core_regset_section * core_regset_sections) { - gdbarch->vbit_in_delta = vbit_in_delta; + gdbarch->core_regset_sections = core_regset_sections; } int -gdbarch_skip_permanent_breakpoint_p (struct gdbarch *gdbarch) +gdbarch_core_xfer_shared_libraries_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->skip_permanent_breakpoint != NULL; + return gdbarch->core_xfer_shared_libraries != NULL; } -void -gdbarch_skip_permanent_breakpoint (struct gdbarch *gdbarch, struct regcache *regcache) +LONGEST +gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, LONGEST len) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->skip_permanent_breakpoint != NULL); + gdb_assert (gdbarch->core_xfer_shared_libraries != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_permanent_breakpoint called\n"); - gdbarch->skip_permanent_breakpoint (regcache); + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_xfer_shared_libraries called\n"); + return gdbarch->core_xfer_shared_libraries (gdbarch, readbuf, offset, len); } void -set_gdbarch_skip_permanent_breakpoint (struct gdbarch *gdbarch, +set_gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, + gdbarch_core_xfer_shared_libraries_ftype core_xfer_shared_libraries) +{ + gdbarch->core_xfer_shared_libraries = core_xfer_shared_libraries; +} + +int +gdbarch_core_pid_to_str_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->core_pid_to_str != NULL; +} + +char * +gdbarch_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->core_pid_to_str != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_pid_to_str called\n"); + return gdbarch->core_pid_to_str (gdbarch, ptid); +} + +void +set_gdbarch_core_pid_to_str (struct gdbarch *gdbarch, + gdbarch_core_pid_to_str_ftype core_pid_to_str) +{ + gdbarch->core_pid_to_str = core_pid_to_str; +} + +int +gdbarch_gcore_bfd_target_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->gcore_bfd_target != 0; +} + +const char * +gdbarch_gcore_bfd_target (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Check variable changed from pre-default. */ + gdb_assert (gdbarch->gcore_bfd_target != 0); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_gcore_bfd_target called\n"); + return gdbarch->gcore_bfd_target; +} + +void +set_gdbarch_gcore_bfd_target (struct gdbarch *gdbarch, + const char * gcore_bfd_target) +{ + gdbarch->gcore_bfd_target = gcore_bfd_target; +} + +int +gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of vtable_function_descriptors, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_vtable_function_descriptors called\n"); + return gdbarch->vtable_function_descriptors; +} + +void +set_gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch, + int vtable_function_descriptors) +{ + gdbarch->vtable_function_descriptors = vtable_function_descriptors; +} + +int +gdbarch_vbit_in_delta (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of vbit_in_delta, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_vbit_in_delta called\n"); + return gdbarch->vbit_in_delta; +} + +void +set_gdbarch_vbit_in_delta (struct gdbarch *gdbarch, + int vbit_in_delta) +{ + gdbarch->vbit_in_delta = vbit_in_delta; +} + +int +gdbarch_skip_permanent_breakpoint_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->skip_permanent_breakpoint != NULL; +} + +void +gdbarch_skip_permanent_breakpoint (struct gdbarch *gdbarch, struct regcache *regcache) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->skip_permanent_breakpoint != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_permanent_breakpoint called\n"); + gdbarch->skip_permanent_breakpoint (regcache); +} + +void +set_gdbarch_skip_permanent_breakpoint (struct gdbarch *gdbarch, gdbarch_skip_permanent_breakpoint_ftype skip_permanent_breakpoint) { gdbarch->skip_permanent_breakpoint = skip_permanent_breakpoint; } +int +gdbarch_max_insn_length_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->max_insn_length != 0; +} + +ULONGEST +gdbarch_max_insn_length (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Check variable changed from pre-default. */ + gdb_assert (gdbarch->max_insn_length != 0); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_max_insn_length called\n"); + return gdbarch->max_insn_length; +} + +void +set_gdbarch_max_insn_length (struct gdbarch *gdbarch, + ULONGEST max_insn_length) +{ + gdbarch->max_insn_length = max_insn_length; +} + +int +gdbarch_displaced_step_copy_insn_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->displaced_step_copy_insn != NULL; +} + +struct displaced_step_closure * +gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to, struct regcache *regs) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->displaced_step_copy_insn != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_displaced_step_copy_insn called\n"); + return gdbarch->displaced_step_copy_insn (gdbarch, from, to, regs); +} + +void +set_gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch, + gdbarch_displaced_step_copy_insn_ftype displaced_step_copy_insn) +{ + gdbarch->displaced_step_copy_insn = displaced_step_copy_insn; +} + +int +gdbarch_displaced_step_fixup_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->displaced_step_fixup != NULL; +} + +void +gdbarch_displaced_step_fixup (struct gdbarch *gdbarch, struct displaced_step_closure *closure, CORE_ADDR from, CORE_ADDR to, struct regcache *regs) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->displaced_step_fixup != NULL); + /* Do not check predicate: gdbarch->displaced_step_fixup != NULL, allow call. */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_displaced_step_fixup called\n"); + gdbarch->displaced_step_fixup (gdbarch, closure, from, to, regs); +} + +void +set_gdbarch_displaced_step_fixup (struct gdbarch *gdbarch, + gdbarch_displaced_step_fixup_ftype displaced_step_fixup) +{ + gdbarch->displaced_step_fixup = displaced_step_fixup; +} + +void +gdbarch_displaced_step_free_closure (struct gdbarch *gdbarch, struct displaced_step_closure *closure) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->displaced_step_free_closure != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_displaced_step_free_closure called\n"); + gdbarch->displaced_step_free_closure (gdbarch, closure); +} + +void +set_gdbarch_displaced_step_free_closure (struct gdbarch *gdbarch, + gdbarch_displaced_step_free_closure_ftype displaced_step_free_closure) +{ + gdbarch->displaced_step_free_closure = displaced_step_free_closure; +} + +CORE_ADDR +gdbarch_displaced_step_location (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->displaced_step_location != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_displaced_step_location called\n"); + return gdbarch->displaced_step_location (gdbarch); +} + +void +set_gdbarch_displaced_step_location (struct gdbarch *gdbarch, + gdbarch_displaced_step_location_ftype displaced_step_location) +{ + gdbarch->displaced_step_location = displaced_step_location; +} + int gdbarch_overlay_update_p (struct gdbarch *gdbarch) { @@ -3294,6 +3209,211 @@ set_gdbarch_overlay_update (struct gdbarch *gdbarch, gdbarch->overlay_update = overlay_update; } +int +gdbarch_core_read_description_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->core_read_description != NULL; +} + +const struct target_desc * +gdbarch_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->core_read_description != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_read_description called\n"); + return gdbarch->core_read_description (gdbarch, target, abfd); +} + +void +set_gdbarch_core_read_description (struct gdbarch *gdbarch, + gdbarch_core_read_description_ftype core_read_description) +{ + gdbarch->core_read_description = core_read_description; +} + +int +gdbarch_static_transform_name_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->static_transform_name != NULL; +} + +char * +gdbarch_static_transform_name (struct gdbarch *gdbarch, char *name) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->static_transform_name != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_static_transform_name called\n"); + return gdbarch->static_transform_name (name); +} + +void +set_gdbarch_static_transform_name (struct gdbarch *gdbarch, + gdbarch_static_transform_name_ftype static_transform_name) +{ + gdbarch->static_transform_name = static_transform_name; +} + +int +gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_sofun_address_maybe_missing called\n"); + return gdbarch->sofun_address_maybe_missing; +} + +void +set_gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch, + int sofun_address_maybe_missing) +{ + gdbarch->sofun_address_maybe_missing = sofun_address_maybe_missing; +} + +int +gdbarch_process_record_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->process_record != NULL; +} + +int +gdbarch_process_record (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->process_record != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_process_record called\n"); + return gdbarch->process_record (gdbarch, regcache, addr); +} + +void +set_gdbarch_process_record (struct gdbarch *gdbarch, + gdbarch_process_record_ftype process_record) +{ + gdbarch->process_record = process_record; +} + +enum target_signal +gdbarch_target_signal_from_host (struct gdbarch *gdbarch, int signo) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->target_signal_from_host != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_target_signal_from_host called\n"); + return gdbarch->target_signal_from_host (gdbarch, signo); +} + +void +set_gdbarch_target_signal_from_host (struct gdbarch *gdbarch, + gdbarch_target_signal_from_host_ftype target_signal_from_host) +{ + gdbarch->target_signal_from_host = target_signal_from_host; +} + +int +gdbarch_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->target_signal_to_host != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_target_signal_to_host called\n"); + return gdbarch->target_signal_to_host (gdbarch, ts); +} + +void +set_gdbarch_target_signal_to_host (struct gdbarch *gdbarch, + gdbarch_target_signal_to_host_ftype target_signal_to_host) +{ + gdbarch->target_signal_to_host = target_signal_to_host; +} + +int +gdbarch_get_siginfo_type_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->get_siginfo_type != NULL; +} + +struct type * +gdbarch_get_siginfo_type (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->get_siginfo_type != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_get_siginfo_type called\n"); + return gdbarch->get_siginfo_type (gdbarch); +} + +void +set_gdbarch_get_siginfo_type (struct gdbarch *gdbarch, + gdbarch_get_siginfo_type_ftype get_siginfo_type) +{ + gdbarch->get_siginfo_type = get_siginfo_type; +} + +int +gdbarch_record_special_symbol_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->record_special_symbol != NULL; +} + +void +gdbarch_record_special_symbol (struct gdbarch *gdbarch, struct objfile *objfile, asymbol *sym) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->record_special_symbol != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_record_special_symbol called\n"); + gdbarch->record_special_symbol (gdbarch, objfile, sym); +} + +void +set_gdbarch_record_special_symbol (struct gdbarch *gdbarch, + gdbarch_record_special_symbol_ftype record_special_symbol) +{ + gdbarch->record_special_symbol = record_special_symbol; +} + +int +gdbarch_has_global_solist (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of has_global_solist, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_has_global_solist called\n"); + return gdbarch->has_global_solist; +} + +void +set_gdbarch_has_global_solist (struct gdbarch *gdbarch, + int has_global_solist) +{ + gdbarch->has_global_solist = has_global_solist; +} + +int +gdbarch_has_global_breakpoints (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of has_global_breakpoints, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_has_global_breakpoints called\n"); + return gdbarch->has_global_breakpoints; +} + +void +set_gdbarch_has_global_breakpoints (struct gdbarch *gdbarch, + int has_global_breakpoints) +{ + gdbarch->has_global_breakpoints = has_global_breakpoints; +} + /* Keep a registry of per-architecture data-pointers required by GDB modules. */ @@ -3418,107 +3538,6 @@ gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *data) } - -/* Keep a registry of swapped data required by GDB modules. */ - -struct gdbarch_swap -{ - void *swap; - struct gdbarch_swap_registration *source; - struct gdbarch_swap *next; -}; - -struct gdbarch_swap_registration -{ - void *data; - unsigned long sizeof_data; - gdbarch_swap_ftype *init; - struct gdbarch_swap_registration *next; -}; - -struct gdbarch_swap_registry -{ - int nr; - struct gdbarch_swap_registration *registrations; -}; - -struct gdbarch_swap_registry gdbarch_swap_registry = -{ - 0, NULL, -}; - -void -deprecated_register_gdbarch_swap (void *data, - unsigned long sizeof_data, - gdbarch_swap_ftype *init) -{ - struct gdbarch_swap_registration **rego; - for (rego = &gdbarch_swap_registry.registrations; - (*rego) != NULL; - rego = &(*rego)->next); - (*rego) = XMALLOC (struct gdbarch_swap_registration); - (*rego)->next = NULL; - (*rego)->init = init; - (*rego)->data = data; - (*rego)->sizeof_data = sizeof_data; -} - -static void -current_gdbarch_swap_init_hack (void) -{ - struct gdbarch_swap_registration *rego; - struct gdbarch_swap **curr = ¤t_gdbarch->swap; - for (rego = gdbarch_swap_registry.registrations; - rego != NULL; - rego = rego->next) - { - if (rego->data != NULL) - { - (*curr) = GDBARCH_OBSTACK_ZALLOC (current_gdbarch, - struct gdbarch_swap); - (*curr)->source = rego; - (*curr)->swap = gdbarch_obstack_zalloc (current_gdbarch, - rego->sizeof_data); - (*curr)->next = NULL; - curr = &(*curr)->next; - } - if (rego->init != NULL) - rego->init (); - } -} - -static struct gdbarch * -current_gdbarch_swap_out_hack (void) -{ - struct gdbarch *old_gdbarch = current_gdbarch; - struct gdbarch_swap *curr; - - gdb_assert (old_gdbarch != NULL); - for (curr = old_gdbarch->swap; - curr != NULL; - curr = curr->next) - { - memcpy (curr->swap, curr->source->data, curr->source->sizeof_data); - memset (curr->source->data, 0, curr->source->sizeof_data); - } - current_gdbarch = NULL; - return old_gdbarch; -} - -static void -current_gdbarch_swap_in_hack (struct gdbarch *new_gdbarch) -{ - struct gdbarch_swap *curr; - - gdb_assert (current_gdbarch == NULL); - for (curr = new_gdbarch->swap; - curr != NULL; - curr = curr->next) - memcpy (curr->source->data, curr->swap, curr->source->sizeof_data); - current_gdbarch = new_gdbarch; -} - - /* Keep a registry of the architectures known by GDB. */ struct gdbarch_registration @@ -3597,9 +3616,9 @@ gdbarch_register (enum bfd_architecture bfd_architecture, } /* log it */ if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "register_gdbarch_init (%s, 0x%08lx)\n", + fprintf_unfiltered (gdb_stdlog, "register_gdbarch_init (%s, %s)\n", bfd_arch_info->printable_name, - (long) init); + host_address_to_string (init)); /* Append it */ (*curr) = XMALLOC (struct gdbarch_registration); (*curr)->bfd_architecture = bfd_architecture; @@ -3640,19 +3659,14 @@ gdbarch_list_lookup_by_info (struct gdbarch_list *arches, /* Find an architecture that matches the specified INFO. Create a new - architecture if needed. Return that new architecture. Assumes - that there is no current architecture. */ + architecture if needed. Return that new architecture. */ -static struct gdbarch * -find_arch_by_info (struct gdbarch_info info) +struct gdbarch * +gdbarch_find_by_info (struct gdbarch_info info) { struct gdbarch *new_gdbarch; struct gdbarch_registration *rego; - /* The existing architecture has been swapped out - all this code - works from a clean slate. */ - gdb_assert (current_gdbarch == NULL); - /* Fill in missing parts of the INFO struct using a number of sources: "set ..."; INFOabfd supplied; and the global defaults. */ @@ -3664,25 +3678,25 @@ find_arch_by_info (struct gdbarch_info info) if (gdbarch_debug) { fprintf_unfiltered (gdb_stdlog, - "find_arch_by_info: info.bfd_arch_info %s\n", + "gdbarch_find_by_info: info.bfd_arch_info %s\n", (info.bfd_arch_info != NULL ? info.bfd_arch_info->printable_name : "(null)")); fprintf_unfiltered (gdb_stdlog, - "find_arch_by_info: info.byte_order %d (%s)\n", + "gdbarch_find_by_info: info.byte_order %d (%s)\n", info.byte_order, (info.byte_order == BFD_ENDIAN_BIG ? "big" : info.byte_order == BFD_ENDIAN_LITTLE ? "little" : "default")); fprintf_unfiltered (gdb_stdlog, - "find_arch_by_info: info.osabi %d (%s)\n", + "gdbarch_find_by_info: info.osabi %d (%s)\n", info.osabi, gdbarch_osabi_name (info.osabi)); fprintf_unfiltered (gdb_stdlog, - "find_arch_by_info: info.abfd 0x%lx\n", - (long) info.abfd); + "gdbarch_find_by_info: info.abfd %s\n", + host_address_to_string (info.abfd)); fprintf_unfiltered (gdb_stdlog, - "find_arch_by_info: info.tdep_info 0x%lx\n", - (long) info.tdep_info); + "gdbarch_find_by_info: info.tdep_info %s\n", + host_address_to_string (info.tdep_info)); } /* Find the tdep code that knows about this architecture. */ @@ -3694,7 +3708,7 @@ find_arch_by_info (struct gdbarch_info info) if (rego == NULL) { if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "find_arch_by_info: " + fprintf_unfiltered (gdb_stdlog, "gdbarch_find_by_info: " "No matching architecture\n"); return 0; } @@ -3707,7 +3721,7 @@ find_arch_by_info (struct gdbarch_info info) if (new_gdbarch == NULL) { if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "find_arch_by_info: " + fprintf_unfiltered (gdb_stdlog, "gdbarch_find_by_info: " "Target rejected architecture\n"); return NULL; } @@ -3720,9 +3734,9 @@ find_arch_by_info (struct gdbarch_info info) struct gdbarch_list **list; struct gdbarch_list *this; if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "find_arch_by_info: " - "Previous architecture 0x%08lx (%s) selected\n", - (long) new_gdbarch, + fprintf_unfiltered (gdb_stdlog, "gdbarch_find_by_info: " + "Previous architecture %s (%s) selected\n", + host_address_to_string (new_gdbarch), new_gdbarch->bfd_arch_info->printable_name); /* Find the existing arch in the list. */ for (list = ®o->arches; @@ -3742,9 +3756,9 @@ find_arch_by_info (struct gdbarch_info info) /* It's a new architecture. */ if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "find_arch_by_info: " - "New architecture 0x%08lx (%s) selected\n", - (long) new_gdbarch, + fprintf_unfiltered (gdb_stdlog, "gdbarch_find_by_info: " + "New architecture %s (%s) selected\n", + host_address_to_string (new_gdbarch), new_gdbarch->bfd_arch_info->printable_name); /* Insert the new architecture into the front of the architecture @@ -3762,53 +3776,22 @@ find_arch_by_info (struct gdbarch_info info) verify_gdbarch (new_gdbarch); new_gdbarch->initialized_p = 1; - /* Initialize any per-architecture swap areas. This phase requires - a valid global CURRENT_GDBARCH. Set it momentarially, and then - swap the entire architecture out. */ - current_gdbarch = new_gdbarch; - current_gdbarch_swap_init_hack (); - current_gdbarch_swap_out_hack (); - if (gdbarch_debug) gdbarch_dump (new_gdbarch, gdb_stdlog); return new_gdbarch; } -struct gdbarch * -gdbarch_find_by_info (struct gdbarch_info info) -{ - /* Save the previously selected architecture, setting the global to - NULL. This stops things like gdbarch->init() trying to use the - previous architecture's configuration. The previous architecture - may not even be of the same architecture family. The most recent - architecture of the same family is found at the head of the - rego->arches list. */ - struct gdbarch *old_gdbarch = current_gdbarch_swap_out_hack (); - - /* Find the specified architecture. */ - struct gdbarch *new_gdbarch = find_arch_by_info (info); - - /* Restore the existing architecture. */ - gdb_assert (current_gdbarch == NULL); - current_gdbarch_swap_in_hack (old_gdbarch); - - return new_gdbarch; -} - -/* Make the specified architecture current, swapping the existing one - out. */ +/* Make the specified architecture current. */ void -deprecated_current_gdbarch_select_hack (struct gdbarch *new_gdbarch) +deprecated_target_gdbarch_select_hack (struct gdbarch *new_gdbarch) { gdb_assert (new_gdbarch != NULL); - gdb_assert (current_gdbarch != NULL); gdb_assert (new_gdbarch->initialized_p); - current_gdbarch_swap_out_hack (); - current_gdbarch_swap_in_hack (new_gdbarch); - architecture_changed_event (); - reinit_frame_cache (); + target_gdbarch = new_gdbarch; + observer_notify_architecture_changed (new_gdbarch); + registers_changed (); } extern void _initialize_gdbarch (void);