X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbarch.c;h=6990953c0c8c7d3c5eb99e76b354b70a0aabb37b;hb=a8cdafbd4e8dbf81a28d98de6a046bd9bc5cc097;hp=5754aa477103911c3295985db0ac80e2dbc4b78b;hpb=7e73cedf75b6388ab7786d5c8bd06368f94ee69b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 5754aa4771..6990953c0c 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -1,7 +1,7 @@ /* *INDENT-OFF* */ /* THIS FILE IS GENERATED */ /* Dynamic architecture support for GDB, the GNU debugger. - Copyright 1998-1999, Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GDB. @@ -55,26 +55,26 @@ #include "gdbthread.h" #include "annotate.h" #include "symfile.h" /* for overlay functions */ +#include "value.h" /* For old tm.h/nm.h macros. */ #endif #include "symcat.h" #include "floatformat.h" +#include "gdb_assert.h" +#include "gdb-events.h" + /* Static function declarations */ static void verify_gdbarch (struct gdbarch *gdbarch); +static void alloc_gdbarch_data (struct gdbarch *); static void init_gdbarch_data (struct gdbarch *); +static void free_gdbarch_data (struct gdbarch *); static void init_gdbarch_swap (struct gdbarch *); +static void clear_gdbarch_swap (struct gdbarch *); static void swapout_gdbarch_swap (struct gdbarch *); static void swapin_gdbarch_swap (struct gdbarch *); -/* Convenience macro for allocting typesafe memory. */ - -#ifndef XMALLOC -#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE)) -#endif - - /* Non-zero if we want to trace architecture code. */ #ifndef GDBARCH_DEBUG @@ -96,7 +96,7 @@ struct gdbarch gdbarch_dump_tdep_ftype *dump_tdep; /* per-architecture data-pointers */ - int nr_data; + unsigned nr_data; void **data; /* per-architecture swap-regions */ @@ -138,21 +138,28 @@ struct gdbarch int ptr_bit; int addr_bit; int bfd_vma_bit; - int ieee_float; + int char_signed; gdbarch_read_pc_ftype *read_pc; gdbarch_write_pc_ftype *write_pc; gdbarch_read_fp_ftype *read_fp; - gdbarch_write_fp_ftype *write_fp; gdbarch_read_sp_ftype *read_sp; gdbarch_write_sp_ftype *write_sp; + gdbarch_virtual_frame_pointer_ftype *virtual_frame_pointer; + gdbarch_register_read_ftype *register_read; + gdbarch_register_write_ftype *register_write; int num_regs; int num_pseudo_regs; int sp_regnum; int fp_regnum; int pc_regnum; + int ps_regnum; int fp0_regnum; int npc_regnum; - int nnpc_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; int register_size; int register_bytes; @@ -163,7 +170,12 @@ struct gdbarch int max_register_virtual_size; gdbarch_register_virtual_type_ftype *register_virtual_type; gdbarch_do_registers_info_ftype *do_registers_info; + gdbarch_print_float_info_ftype *print_float_info; gdbarch_register_sim_regno_ftype *register_sim_regno; + gdbarch_register_bytes_ok_ftype *register_bytes_ok; + gdbarch_cannot_fetch_register_ftype *cannot_fetch_register; + gdbarch_cannot_store_register_ftype *cannot_store_register; + gdbarch_get_longjmp_target_ftype *get_longjmp_target; int use_generic_dummy_frames; int call_dummy_location; gdbarch_call_dummy_address_ftype *call_dummy_address; @@ -178,6 +190,8 @@ struct gdbarch int call_dummy_stack_adjust_p; int call_dummy_stack_adjust; gdbarch_fix_call_dummy_ftype *fix_call_dummy; + gdbarch_init_frame_pc_first_ftype *init_frame_pc_first; + gdbarch_init_frame_pc_ftype *init_frame_pc; int believe_pcc_promotion; int believe_pcc_promotion_type; gdbarch_coerce_float_to_double_ftype *coerce_float_to_double; @@ -185,22 +199,20 @@ struct gdbarch gdbarch_register_convertible_ftype *register_convertible; gdbarch_register_convert_to_virtual_ftype *register_convert_to_virtual; gdbarch_register_convert_to_raw_ftype *register_convert_to_raw; + gdbarch_convert_register_p_ftype *convert_register_p; + gdbarch_register_to_value_ftype *register_to_value; + gdbarch_value_to_register_ftype *value_to_register; gdbarch_fetch_pseudo_register_ftype *fetch_pseudo_register; gdbarch_store_pseudo_register_ftype *store_pseudo_register; gdbarch_pointer_to_address_ftype *pointer_to_address; gdbarch_address_to_pointer_ftype *address_to_pointer; + gdbarch_integer_to_address_ftype *integer_to_address; gdbarch_return_value_on_stack_ftype *return_value_on_stack; gdbarch_extract_return_value_ftype *extract_return_value; gdbarch_push_arguments_ftype *push_arguments; gdbarch_push_dummy_frame_ftype *push_dummy_frame; gdbarch_push_return_address_ftype *push_return_address; gdbarch_pop_frame_ftype *pop_frame; - gdbarch_d10v_make_daddr_ftype *d10v_make_daddr; - gdbarch_d10v_make_iaddr_ftype *d10v_make_iaddr; - gdbarch_d10v_daddr_p_ftype *d10v_daddr_p; - gdbarch_d10v_iaddr_p_ftype *d10v_iaddr_p; - gdbarch_d10v_convert_daddr_to_raw_ftype *d10v_convert_daddr_to_raw; - gdbarch_d10v_convert_iaddr_to_raw_ftype *d10v_convert_iaddr_to_raw; gdbarch_store_struct_return_ftype *store_struct_return; gdbarch_store_return_value_ftype *store_return_value; gdbarch_extract_struct_value_address_ftype *extract_struct_value_address; @@ -214,6 +226,7 @@ struct gdbarch gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint; gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint; CORE_ADDR decr_pc_after_break; + gdbarch_prepare_to_proceed_ftype *prepare_to_proceed; CORE_ADDR function_start_offset; gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address; CORE_ADDR frame_args_skip; @@ -229,10 +242,23 @@ struct gdbarch int extra_stack_alignment_needed; gdbarch_reg_struct_has_addr_ftype *reg_struct_has_addr; gdbarch_save_dummy_frame_tos_ftype *save_dummy_frame_tos; + int parm_boundary; const struct floatformat * float_format; const struct floatformat * double_format; const struct floatformat * long_double_format; gdbarch_convert_from_func_ptr_addr_ftype *convert_from_func_ptr_addr; + gdbarch_addr_bits_remove_ftype *addr_bits_remove; + gdbarch_smash_text_address_ftype *smash_text_address; + gdbarch_software_single_step_ftype *software_single_step; + gdbarch_print_insn_ftype *print_insn; + gdbarch_skip_trampoline_code_ftype *skip_trampoline_code; + gdbarch_in_solib_call_trampoline_ftype *in_solib_call_trampoline; + gdbarch_pc_in_sigtramp_ftype *pc_in_sigtramp; + gdbarch_in_function_epilogue_p_ftype *in_function_epilogue_p; + gdbarch_construct_inferior_arguments_ftype *construct_inferior_arguments; + gdbarch_dwarf2_build_frame_info_ftype *dwarf2_build_frame_info; + gdbarch_elf_make_msymbol_special_ftype *elf_make_msymbol_special; + gdbarch_coff_make_msymbol_special_ftype *coff_make_msymbol_special; }; @@ -245,7 +271,7 @@ struct gdbarch startup_gdbarch = { /* basic architecture information */ &bfd_default_arch_struct, - BIG_ENDIAN, + BFD_ENDIAN_BIG, /* target specific vector and its dump routine */ NULL, NULL, /*per-architecture data-pointers and swap regions */ @@ -261,6 +287,10 @@ struct gdbarch startup_gdbarch = 8 * sizeof (void*), 8 * sizeof (void*), 8 * sizeof (void*), + 1, + 0, + 0, + 0, 0, 0, 0, @@ -268,6 +298,10 @@ struct gdbarch startup_gdbarch = 0, 0, 0, + -1, + -1, + -1, + -1, 0, 0, 0, @@ -279,6 +313,12 @@ struct gdbarch startup_gdbarch = 0, 0, 0, + generic_register_size, + 0, + generic_register_size, + 0, + 0, + 0, 0, 0, 0, @@ -356,11 +396,36 @@ struct gdbarch startup_gdbarch = 0, 0, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + generic_in_function_epilogue_p, + construct_inferior_arguments, + 0, + 0, + 0, /* startup_gdbarch() */ }; struct gdbarch *current_gdbarch = &startup_gdbarch; +/* Do any initialization needed for a non-multiarch configuration + after the _initialize_MODULE functions have been run. */ +void +initialize_non_multiarch () +{ + alloc_gdbarch_data (&startup_gdbarch); + /* Ensure that all swap areas are zeroed so that they again think + they are starting from scratch. */ + clear_gdbarch_swap (&startup_gdbarch); + init_gdbarch_swap (&startup_gdbarch); + init_gdbarch_data (&startup_gdbarch); +} + /* Create a new ``struct gdbarch'' based on information provided by ``struct gdbarch_info''. */ @@ -369,72 +434,110 @@ struct gdbarch * gdbarch_alloc (const struct gdbarch_info *info, struct gdbarch_tdep *tdep) { - struct gdbarch *gdbarch = XMALLOC (struct gdbarch); - memset (gdbarch, 0, sizeof (*gdbarch)); + /* NOTE: The new architecture variable is named ``current_gdbarch'' + so that macros such as TARGET_DOUBLE_BIT, 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 = XMALLOC (struct gdbarch); + memset (current_gdbarch, 0, sizeof (*current_gdbarch)); - gdbarch->tdep = tdep; + alloc_gdbarch_data (current_gdbarch); - gdbarch->bfd_arch_info = info->bfd_arch_info; - gdbarch->byte_order = info->byte_order; + current_gdbarch->tdep = tdep; + + current_gdbarch->bfd_arch_info = info->bfd_arch_info; + current_gdbarch->byte_order = info->byte_order; /* Force the explicit initialization of these. */ - 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*TARGET_LONG_BIT; - gdbarch->float_bit = 4*TARGET_CHAR_BIT; - gdbarch->double_bit = 8*TARGET_CHAR_BIT; - gdbarch->long_double_bit = 2*TARGET_DOUBLE_BIT; - gdbarch->ptr_bit = TARGET_INT_BIT; - gdbarch->bfd_vma_bit = TARGET_ARCHITECTURE->bits_per_address; - gdbarch->read_pc = generic_target_read_pc; - gdbarch->write_pc = generic_target_write_pc; - gdbarch->read_fp = generic_target_read_fp; - gdbarch->write_fp = generic_target_write_fp; - gdbarch->read_sp = generic_target_read_sp; - gdbarch->write_sp = generic_target_write_sp; - gdbarch->num_regs = -1; - gdbarch->sp_regnum = -1; - gdbarch->fp_regnum = -1; - gdbarch->pc_regnum = -1; - gdbarch->fp0_regnum = -1; - gdbarch->npc_regnum = -1; - gdbarch->nnpc_regnum = -1; - gdbarch->register_name = legacy_register_name; - gdbarch->register_size = -1; - gdbarch->register_bytes = -1; - gdbarch->max_register_raw_size = -1; - gdbarch->max_register_virtual_size = -1; - gdbarch->do_registers_info = do_registers_info; - gdbarch->register_sim_regno = default_register_sim_regno; - gdbarch->use_generic_dummy_frames = -1; - gdbarch->call_dummy_start_offset = -1; - gdbarch->call_dummy_breakpoint_offset = -1; - gdbarch->call_dummy_breakpoint_offset_p = -1; - gdbarch->call_dummy_length = -1; - gdbarch->call_dummy_p = -1; - gdbarch->call_dummy_words = legacy_call_dummy_words; - gdbarch->sizeof_call_dummy_words = legacy_sizeof_call_dummy_words; - gdbarch->call_dummy_stack_adjust_p = -1; - gdbarch->coerce_float_to_double = default_coerce_float_to_double; - gdbarch->register_convertible = generic_register_convertible_not; - gdbarch->pointer_to_address = unsigned_pointer_to_address; - gdbarch->address_to_pointer = unsigned_address_to_pointer; - gdbarch->return_value_on_stack = generic_return_value_on_stack_not; - gdbarch->prologue_frameless_p = generic_prologue_frameless_p; - gdbarch->breakpoint_from_pc = legacy_breakpoint_from_pc; - gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; - gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; - gdbarch->decr_pc_after_break = -1; - gdbarch->function_start_offset = -1; - gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address; - gdbarch->frame_args_skip = -1; - gdbarch->frameless_function_invocation = generic_frameless_function_invocation_not; - gdbarch->extra_stack_alignment_needed = 1; - gdbarch->convert_from_func_ptr_addr = default_convert_from_func_ptr_addr; + 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*TARGET_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 = TARGET_INT_BIT; + current_gdbarch->bfd_vma_bit = TARGET_ARCHITECTURE->bits_per_address; + current_gdbarch->char_signed = -1; + current_gdbarch->read_pc = generic_target_read_pc; + current_gdbarch->write_pc = generic_target_write_pc; + current_gdbarch->read_fp = generic_target_read_fp; + current_gdbarch->read_sp = generic_target_read_sp; + current_gdbarch->write_sp = generic_target_write_sp; + current_gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer; + current_gdbarch->num_regs = -1; + current_gdbarch->sp_regnum = -1; + current_gdbarch->fp_regnum = -1; + current_gdbarch->pc_regnum = -1; + current_gdbarch->ps_regnum = -1; + current_gdbarch->fp0_regnum = -1; + current_gdbarch->npc_regnum = -1; + current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; + current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; + current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum; + current_gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum; + current_gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum; + current_gdbarch->register_name = legacy_register_name; + current_gdbarch->register_size = -1; + current_gdbarch->register_bytes = -1; + current_gdbarch->register_raw_size = generic_register_size; + current_gdbarch->max_register_raw_size = -1; + current_gdbarch->register_virtual_size = generic_register_size; + current_gdbarch->max_register_virtual_size = -1; + current_gdbarch->do_registers_info = do_registers_info; + current_gdbarch->print_float_info = default_print_float_info; + current_gdbarch->register_sim_regno = default_register_sim_regno; + current_gdbarch->cannot_fetch_register = cannot_register_not; + current_gdbarch->cannot_store_register = cannot_register_not; + current_gdbarch->use_generic_dummy_frames = -1; + current_gdbarch->call_dummy_start_offset = -1; + current_gdbarch->call_dummy_breakpoint_offset = -1; + current_gdbarch->call_dummy_breakpoint_offset_p = -1; + current_gdbarch->call_dummy_length = -1; + current_gdbarch->call_dummy_p = -1; + current_gdbarch->call_dummy_words = legacy_call_dummy_words; + current_gdbarch->sizeof_call_dummy_words = legacy_sizeof_call_dummy_words; + current_gdbarch->call_dummy_stack_adjust_p = -1; + current_gdbarch->init_frame_pc_first = init_frame_pc_noop; + current_gdbarch->init_frame_pc = init_frame_pc_default; + current_gdbarch->coerce_float_to_double = default_coerce_float_to_double; + current_gdbarch->register_convertible = generic_register_convertible_not; + current_gdbarch->convert_register_p = legacy_convert_register_p; + current_gdbarch->register_to_value = legacy_register_to_value; + current_gdbarch->value_to_register = legacy_value_to_register; + current_gdbarch->pointer_to_address = unsigned_pointer_to_address; + current_gdbarch->address_to_pointer = unsigned_address_to_pointer; + current_gdbarch->return_value_on_stack = generic_return_value_on_stack_not; + current_gdbarch->push_arguments = default_push_arguments; + current_gdbarch->use_struct_convention = generic_use_struct_convention; + current_gdbarch->prologue_frameless_p = generic_prologue_frameless_p; + current_gdbarch->breakpoint_from_pc = legacy_breakpoint_from_pc; + current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; + current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; + current_gdbarch->decr_pc_after_break = -1; + current_gdbarch->prepare_to_proceed = default_prepare_to_proceed; + current_gdbarch->function_start_offset = -1; + current_gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address; + current_gdbarch->frame_args_skip = -1; + current_gdbarch->frameless_function_invocation = generic_frameless_function_invocation_not; + current_gdbarch->frame_chain_valid = func_frame_chain_valid; + current_gdbarch->extra_stack_alignment_needed = 1; + current_gdbarch->convert_from_func_ptr_addr = core_addr_identity; + current_gdbarch->addr_bits_remove = core_addr_identity; + current_gdbarch->smash_text_address = core_addr_identity; + current_gdbarch->print_insn = legacy_print_insn; + current_gdbarch->skip_trampoline_code = generic_skip_trampoline_code; + current_gdbarch->in_solib_call_trampoline = generic_in_solib_call_trampoline; + current_gdbarch->pc_in_sigtramp = legacy_pc_in_sigtramp; + 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; /* gdbarch_alloc() */ - return gdbarch; + return current_gdbarch; } @@ -447,8 +550,9 @@ gdbarch_alloc (const struct gdbarch_info *info, void gdbarch_free (struct gdbarch *arch) { - /* At the moment, this is trivial. */ - free (arch); + gdb_assert (arch != NULL); + free_gdbarch_data (arch); + xfree (arch); } @@ -457,14 +561,20 @@ gdbarch_free (struct gdbarch *arch) static void verify_gdbarch (struct gdbarch *gdbarch) { + struct ui_file *log; + struct cleanup *cleanups; + long dummy; + char *buf; /* Only perform sanity checks on a multi-arch target. */ if (!GDB_MULTI_ARCH) return; + log = mem_fileopen (); + cleanups = make_cleanup_ui_file_delete (log); /* fundamental */ - if (gdbarch->byte_order == 0) - internal_error ("verify_gdbarch: byte-order unset"); + if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN) + fprintf_unfiltered (log, "\n\tbyte-order"); if (gdbarch->bfd_arch_info == NULL) - internal_error ("verify_gdbarch: bfd_arch_info unset"); + fprintf_unfiltered (log, "\n\tbfd_arch_info"); /* Check those that need to be defined for the given multi-arch level. */ /* Skip verify of short_bit, invalid_p == 0 */ /* Skip verify of int_bit, invalid_p == 0 */ @@ -477,187 +587,179 @@ verify_gdbarch (struct gdbarch *gdbarch) if (gdbarch->addr_bit == 0) gdbarch->addr_bit = TARGET_PTR_BIT; /* Skip verify of bfd_vma_bit, invalid_p == 0 */ - /* Skip verify of ieee_float, invalid_p == 0 */ + if (gdbarch->char_signed == -1) + gdbarch->char_signed = 1; /* Skip verify of read_pc, invalid_p == 0 */ /* Skip verify of write_pc, invalid_p == 0 */ /* Skip verify of read_fp, invalid_p == 0 */ - /* Skip verify of write_fp, invalid_p == 0 */ /* Skip verify of read_sp, invalid_p == 0 */ /* Skip verify of write_sp, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + /* Skip verify of virtual_frame_pointer, invalid_p == 0 */ + /* Skip verify of register_read, has predicate */ + /* Skip verify of register_write, has predicate */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->num_regs == -1)) - internal_error ("gdbarch: verify_gdbarch: num_regs invalid"); + fprintf_unfiltered (log, "\n\tnum_regs"); /* Skip verify of num_pseudo_regs, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->sp_regnum == -1)) - internal_error ("gdbarch: verify_gdbarch: sp_regnum invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->fp_regnum == -1)) - internal_error ("gdbarch: verify_gdbarch: fp_regnum invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->pc_regnum == -1)) - internal_error ("gdbarch: verify_gdbarch: pc_regnum invalid"); + /* Skip verify of sp_regnum, invalid_p == 0 */ + /* Skip verify of fp_regnum, invalid_p == 0 */ + /* Skip verify of pc_regnum, invalid_p == 0 */ + /* Skip verify of ps_regnum, invalid_p == 0 */ /* Skip verify of fp0_regnum, invalid_p == 0 */ /* Skip verify of npc_regnum, invalid_p == 0 */ - /* Skip verify of nnpc_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 */ /* Skip verify of register_name, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->register_size == -1)) - internal_error ("gdbarch: verify_gdbarch: register_size invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tregister_size"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->register_bytes == -1)) - internal_error ("gdbarch: verify_gdbarch: register_bytes invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tregister_bytes"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->register_byte == 0)) - internal_error ("gdbarch: verify_gdbarch: register_byte invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->register_raw_size == 0)) - internal_error ("gdbarch: verify_gdbarch: register_raw_size invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tregister_byte"); + /* Skip verify of register_raw_size, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->max_register_raw_size == -1)) - internal_error ("gdbarch: verify_gdbarch: max_register_raw_size invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->register_virtual_size == 0)) - internal_error ("gdbarch: verify_gdbarch: register_virtual_size invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tmax_register_raw_size"); + /* Skip verify of register_virtual_size, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->max_register_virtual_size == -1)) - internal_error ("gdbarch: verify_gdbarch: max_register_virtual_size invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tmax_register_virtual_size"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->register_virtual_type == 0)) - internal_error ("gdbarch: verify_gdbarch: register_virtual_type invalid"); + fprintf_unfiltered (log, "\n\tregister_virtual_type"); /* Skip verify of do_registers_info, invalid_p == 0 */ + /* Skip verify of print_float_info, invalid_p == 0 */ /* Skip verify of register_sim_regno, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 1) + /* Skip verify of register_bytes_ok, has predicate */ + /* Skip verify of cannot_fetch_register, invalid_p == 0 */ + /* Skip verify of cannot_store_register, invalid_p == 0 */ + /* Skip verify of get_longjmp_target, has predicate */ + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->use_generic_dummy_frames == -1)) - internal_error ("gdbarch: verify_gdbarch: use_generic_dummy_frames invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tuse_generic_dummy_frames"); + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_location == 0)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_location invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_location"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_location == AT_ENTRY_POINT && gdbarch->call_dummy_address == 0)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_address invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_address"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_start_offset == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_start_offset invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->call_dummy_breakpoint_offset == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_breakpoint_offset invalid"); - if ((GDB_MULTI_ARCH >= 1) + fprintf_unfiltered (log, "\n\tcall_dummy_start_offset"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) + && (gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1)) + fprintf_unfiltered (log, "\n\tcall_dummy_breakpoint_offset"); + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_breakpoint_offset_p == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_breakpoint_offset_p invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_breakpoint_offset_p"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_length == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_length invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_length"); + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->pc_in_call_dummy == 0)) - internal_error ("gdbarch: verify_gdbarch: pc_in_call_dummy invalid"); - if ((GDB_MULTI_ARCH >= 1) + fprintf_unfiltered (log, "\n\tpc_in_call_dummy"); + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_p == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_p invalid"); + fprintf_unfiltered (log, "\n\tcall_dummy_p"); /* Skip verify of call_dummy_words, invalid_p == 0 */ /* Skip verify of sizeof_call_dummy_words, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 1) + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_stack_adjust_p == -1)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_stack_adjust_p invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_stack_adjust_p"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->call_dummy_stack_adjust_p && gdbarch->call_dummy_stack_adjust == 0)) - internal_error ("gdbarch: verify_gdbarch: call_dummy_stack_adjust invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tcall_dummy_stack_adjust"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->fix_call_dummy == 0)) - internal_error ("gdbarch: verify_gdbarch: fix_call_dummy invalid"); + fprintf_unfiltered (log, "\n\tfix_call_dummy"); + /* Skip verify of init_frame_pc_first, invalid_p == 0 */ + /* Skip verify of init_frame_pc, invalid_p == 0 */ /* Skip verify of coerce_float_to_double, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 1) + if ((GDB_MULTI_ARCH >= GDB_MULTI_ARCH_PARTIAL) && (gdbarch->get_saved_register == 0)) - internal_error ("gdbarch: verify_gdbarch: get_saved_register invalid"); + fprintf_unfiltered (log, "\n\tget_saved_register"); /* Skip verify of register_convertible, invalid_p == 0 */ /* Skip verify of register_convert_to_virtual, invalid_p == 0 */ /* Skip verify of register_convert_to_raw, invalid_p == 0 */ - /* Skip verify of fetch_pseudo_register, invalid_p == 0 */ - /* Skip verify of store_pseudo_register, invalid_p == 0 */ + /* Skip verify of convert_register_p, invalid_p == 0 */ + /* Skip verify of register_to_value, invalid_p == 0 */ + /* Skip verify of value_to_register, invalid_p == 0 */ + /* Skip verify of fetch_pseudo_register, has predicate */ + /* Skip verify of store_pseudo_register, has predicate */ /* Skip verify of pointer_to_address, invalid_p == 0 */ /* Skip verify of address_to_pointer, invalid_p == 0 */ + /* Skip verify of integer_to_address, has predicate */ /* Skip verify of return_value_on_stack, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->extract_return_value == 0)) - internal_error ("gdbarch: verify_gdbarch: extract_return_value invalid"); - if ((GDB_MULTI_ARCH >= 1) - && (gdbarch->push_arguments == 0)) - internal_error ("gdbarch: verify_gdbarch: push_arguments invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\textract_return_value"); + /* Skip verify of push_arguments, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->push_dummy_frame == 0)) - internal_error ("gdbarch: verify_gdbarch: push_dummy_frame invalid"); - if ((GDB_MULTI_ARCH >= 1) - && (gdbarch->push_return_address == 0)) - internal_error ("gdbarch: verify_gdbarch: push_return_address invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tpush_dummy_frame"); + /* Skip verify of push_return_address, has predicate */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->pop_frame == 0)) - internal_error ("gdbarch: verify_gdbarch: pop_frame invalid"); - /* Skip verify of d10v_make_daddr, invalid_p == 0 */ - /* Skip verify of d10v_make_iaddr, invalid_p == 0 */ - /* Skip verify of d10v_daddr_p, invalid_p == 0 */ - /* Skip verify of d10v_iaddr_p, invalid_p == 0 */ - /* Skip verify of d10v_convert_daddr_to_raw, invalid_p == 0 */ - /* Skip verify of d10v_convert_iaddr_to_raw, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tpop_frame"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->store_struct_return == 0)) - internal_error ("gdbarch: verify_gdbarch: store_struct_return invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tstore_struct_return"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->store_return_value == 0)) - internal_error ("gdbarch: verify_gdbarch: store_return_value invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->extract_struct_value_address == 0)) - internal_error ("gdbarch: verify_gdbarch: extract_struct_value_address invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->use_struct_convention == 0)) - internal_error ("gdbarch: verify_gdbarch: use_struct_convention invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tstore_return_value"); + /* Skip verify of extract_struct_value_address, has predicate */ + /* Skip verify of use_struct_convention, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_init_saved_regs == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_init_saved_regs invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->init_extra_frame_info == 0)) - internal_error ("gdbarch: verify_gdbarch: init_extra_frame_info invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tframe_init_saved_regs"); + /* Skip verify of init_extra_frame_info, has predicate */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->skip_prologue == 0)) - internal_error ("gdbarch: verify_gdbarch: skip_prologue invalid"); + fprintf_unfiltered (log, "\n\tskip_prologue"); /* Skip verify of prologue_frameless_p, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->inner_than == 0)) - internal_error ("gdbarch: verify_gdbarch: inner_than invalid"); + fprintf_unfiltered (log, "\n\tinner_than"); /* Skip verify of breakpoint_from_pc, invalid_p == 0 */ /* Skip verify of memory_insert_breakpoint, invalid_p == 0 */ /* Skip verify of memory_remove_breakpoint, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->decr_pc_after_break == -1)) - internal_error ("gdbarch: verify_gdbarch: decr_pc_after_break invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tdecr_pc_after_break"); + /* Skip verify of prepare_to_proceed, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->function_start_offset == -1)) - internal_error ("gdbarch: verify_gdbarch: function_start_offset invalid"); + fprintf_unfiltered (log, "\n\tfunction_start_offset"); /* Skip verify of remote_translate_xfer_address, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_args_skip == -1)) - internal_error ("gdbarch: verify_gdbarch: frame_args_skip invalid"); + fprintf_unfiltered (log, "\n\tframe_args_skip"); /* Skip verify of frameless_function_invocation, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_chain == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_chain invalid"); - if ((GDB_MULTI_ARCH >= 1) - && (gdbarch->frame_chain_valid == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_chain_valid invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tframe_chain"); + /* Skip verify of frame_chain_valid, invalid_p == 0 */ + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_saved_pc == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_saved_pc invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tframe_saved_pc"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_args_address == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_args_address invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tframe_args_address"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_locals_address == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_locals_address invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tframe_locals_address"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->saved_pc_after_call == 0)) - internal_error ("gdbarch: verify_gdbarch: saved_pc_after_call invalid"); - if ((GDB_MULTI_ARCH >= 2) + fprintf_unfiltered (log, "\n\tsaved_pc_after_call"); + if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_num_args == 0)) - internal_error ("gdbarch: verify_gdbarch: frame_num_args invalid"); + fprintf_unfiltered (log, "\n\tframe_num_args"); /* Skip verify of stack_align, has predicate */ /* Skip verify of extra_stack_alignment_needed, invalid_p == 0 */ /* Skip verify of reg_struct_has_addr, has predicate */ @@ -667,8 +769,27 @@ verify_gdbarch (struct gdbarch *gdbarch) if (gdbarch->double_format == 0) gdbarch->double_format = default_double_format (gdbarch); if (gdbarch->long_double_format == 0) - gdbarch->long_double_format = &floatformat_unknown; + gdbarch->long_double_format = default_double_format (gdbarch); /* 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 print_insn, invalid_p == 0 */ + /* Skip verify of skip_trampoline_code, invalid_p == 0 */ + /* Skip verify of in_solib_call_trampoline, invalid_p == 0 */ + /* Skip verify of pc_in_sigtramp, 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 dwarf2_build_frame_info, has predicate */ + /* Skip verify of elf_make_msymbol_special, invalid_p == 0 */ + /* Skip verify of coff_make_msymbol_special, invalid_p == 0 */ + buf = ui_file_xstrdup (log, &dummy); + make_cleanup (xfree, buf); + if (strlen (buf) > 0) + internal_error (__FILE__, __LINE__, + "verify_gdbarch: the following are invalid ...%s", + buf); + do_cleanups (cleanups); } @@ -686,1285 +807,1393 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: GDB_MULTI_ARCH = %d\n", GDB_MULTI_ARCH); -#ifdef TARGET_ARCHITECTURE + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: in_function_epilogue_p = 0x%08lx\n", + (long) current_gdbarch->in_function_epilogue_p); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: register_read = 0x%08lx\n", + (long) current_gdbarch->register_read); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: register_write = 0x%08lx\n", + (long) current_gdbarch->register_write); +#ifdef ADDRESS_TO_POINTER +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ARCHITECTURE # %s\n", - XSTRING (TARGET_ARCHITECTURE)); + "gdbarch_dump: %s # %s\n", + "ADDRESS_TO_POINTER(type, buf, addr)", + XSTRING (ADDRESS_TO_POINTER (type, buf, addr))); #endif -#ifdef TARGET_BYTE_ORDER + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: ADDRESS_TO_POINTER = 0x%08lx\n", + (long) current_gdbarch->address_to_pointer + /*ADDRESS_TO_POINTER ()*/); +#endif +#ifdef ADDR_BITS_REMOVE fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BYTE_ORDER # %s\n", - XSTRING (TARGET_BYTE_ORDER)); + "gdbarch_dump: %s # %s\n", + "ADDR_BITS_REMOVE(addr)", + XSTRING (ADDR_BITS_REMOVE (addr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: ADDR_BITS_REMOVE = 0x%08lx\n", + (long) current_gdbarch->addr_bits_remove + /*ADDR_BITS_REMOVE ()*/); #endif -#ifdef TARGET_SHORT_BIT +#ifdef BELIEVE_PCC_PROMOTION fprintf_unfiltered (file, - "gdbarch_dump: TARGET_SHORT_BIT # %s\n", - XSTRING (TARGET_SHORT_BIT)); + "gdbarch_dump: BELIEVE_PCC_PROMOTION # %s\n", + XSTRING (BELIEVE_PCC_PROMOTION)); + fprintf_unfiltered (file, + "gdbarch_dump: BELIEVE_PCC_PROMOTION = %d\n", + BELIEVE_PCC_PROMOTION); #endif -#ifdef TARGET_INT_BIT +#ifdef BELIEVE_PCC_PROMOTION_TYPE fprintf_unfiltered (file, - "gdbarch_dump: TARGET_INT_BIT # %s\n", - XSTRING (TARGET_INT_BIT)); + "gdbarch_dump: BELIEVE_PCC_PROMOTION_TYPE # %s\n", + XSTRING (BELIEVE_PCC_PROMOTION_TYPE)); + fprintf_unfiltered (file, + "gdbarch_dump: BELIEVE_PCC_PROMOTION_TYPE = %d\n", + BELIEVE_PCC_PROMOTION_TYPE); #endif -#ifdef TARGET_LONG_BIT +#ifdef BREAKPOINT_FROM_PC fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_BIT # %s\n", - XSTRING (TARGET_LONG_BIT)); + "gdbarch_dump: %s # %s\n", + "BREAKPOINT_FROM_PC(pcptr, lenptr)", + XSTRING (BREAKPOINT_FROM_PC (pcptr, lenptr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: BREAKPOINT_FROM_PC = 0x%08lx\n", + (long) current_gdbarch->breakpoint_from_pc + /*BREAKPOINT_FROM_PC ()*/); #endif -#ifdef TARGET_LONG_LONG_BIT +#ifdef CALL_DUMMY_ADDRESS fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_LONG_BIT # %s\n", - XSTRING (TARGET_LONG_LONG_BIT)); + "gdbarch_dump: %s # %s\n", + "CALL_DUMMY_ADDRESS()", + XSTRING (CALL_DUMMY_ADDRESS ())); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->call_dummy_address + /*CALL_DUMMY_ADDRESS ()*/); #endif -#ifdef TARGET_FLOAT_BIT +#ifdef CALL_DUMMY_BREAKPOINT_OFFSET fprintf_unfiltered (file, - "gdbarch_dump: TARGET_FLOAT_BIT # %s\n", - XSTRING (TARGET_FLOAT_BIT)); + "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET # %s\n", + XSTRING (CALL_DUMMY_BREAKPOINT_OFFSET)); + if (CALL_DUMMY_BREAKPOINT_OFFSET_P) + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET = 0x%08lx\n", + (long) CALL_DUMMY_BREAKPOINT_OFFSET); #endif -#ifdef TARGET_DOUBLE_BIT +#ifdef CALL_DUMMY_BREAKPOINT_OFFSET_P fprintf_unfiltered (file, - "gdbarch_dump: TARGET_DOUBLE_BIT # %s\n", - XSTRING (TARGET_DOUBLE_BIT)); + "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET_P # %s\n", + XSTRING (CALL_DUMMY_BREAKPOINT_OFFSET_P)); + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET_P = %d\n", + CALL_DUMMY_BREAKPOINT_OFFSET_P); #endif -#ifdef TARGET_LONG_DOUBLE_BIT +#ifdef CALL_DUMMY_LENGTH fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_DOUBLE_BIT # %s\n", - XSTRING (TARGET_LONG_DOUBLE_BIT)); + "gdbarch_dump: CALL_DUMMY_LENGTH # %s\n", + XSTRING (CALL_DUMMY_LENGTH)); + if (CALL_DUMMY_LOCATION == BEFORE_TEXT_END || CALL_DUMMY_LOCATION == AFTER_TEXT_END) + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_LENGTH = %d\n", + CALL_DUMMY_LENGTH); #endif -#ifdef TARGET_PTR_BIT +#ifdef CALL_DUMMY_LOCATION fprintf_unfiltered (file, - "gdbarch_dump: TARGET_PTR_BIT # %s\n", - XSTRING (TARGET_PTR_BIT)); + "gdbarch_dump: CALL_DUMMY_LOCATION # %s\n", + XSTRING (CALL_DUMMY_LOCATION)); + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_LOCATION = %d\n", + CALL_DUMMY_LOCATION); #endif -#ifdef TARGET_ADDR_BIT +#ifdef CALL_DUMMY_P fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ADDR_BIT # %s\n", - XSTRING (TARGET_ADDR_BIT)); + "gdbarch_dump: CALL_DUMMY_P # %s\n", + XSTRING (CALL_DUMMY_P)); + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_P = %d\n", + CALL_DUMMY_P); #endif -#ifdef TARGET_BFD_VMA_BIT +#ifdef CALL_DUMMY_STACK_ADJUST fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BFD_VMA_BIT # %s\n", - XSTRING (TARGET_BFD_VMA_BIT)); + "gdbarch_dump: CALL_DUMMY_STACK_ADJUST # %s\n", + XSTRING (CALL_DUMMY_STACK_ADJUST)); + if (CALL_DUMMY_STACK_ADJUST_P) + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_STACK_ADJUST = 0x%08lx\n", + (long) CALL_DUMMY_STACK_ADJUST); #endif -#ifdef IEEE_FLOAT +#ifdef CALL_DUMMY_STACK_ADJUST_P + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_STACK_ADJUST_P # %s\n", + XSTRING (CALL_DUMMY_STACK_ADJUST_P)); fprintf_unfiltered (file, - "gdbarch_dump: IEEE_FLOAT # %s\n", - XSTRING (IEEE_FLOAT)); + "gdbarch_dump: CALL_DUMMY_STACK_ADJUST_P = 0x%08lx\n", + (long) CALL_DUMMY_STACK_ADJUST_P); #endif -#ifdef TARGET_READ_PC +#ifdef CALL_DUMMY_START_OFFSET fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_READ_PC(pid)", - XSTRING (TARGET_READ_PC (pid))); + "gdbarch_dump: CALL_DUMMY_START_OFFSET # %s\n", + XSTRING (CALL_DUMMY_START_OFFSET)); + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_START_OFFSET = 0x%08lx\n", + (long) CALL_DUMMY_START_OFFSET); #endif -#if defined (TARGET_WRITE_PC) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ +#ifdef CALL_DUMMY_WORDS fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_WRITE_PC(val, pid)", - XSTRING (TARGET_WRITE_PC (val, pid))); + "gdbarch_dump: CALL_DUMMY_WORDS # %s\n", + XSTRING (CALL_DUMMY_WORDS)); + fprintf_unfiltered (file, + "gdbarch_dump: CALL_DUMMY_WORDS = 0x%08lx\n", + (long) CALL_DUMMY_WORDS); #endif -#ifdef TARGET_READ_FP +#ifdef CANNOT_FETCH_REGISTER fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "TARGET_READ_FP()", - XSTRING (TARGET_READ_FP ())); + "CANNOT_FETCH_REGISTER(regnum)", + XSTRING (CANNOT_FETCH_REGISTER (regnum))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: CANNOT_FETCH_REGISTER = 0x%08lx\n", + (long) current_gdbarch->cannot_fetch_register + /*CANNOT_FETCH_REGISTER ()*/); #endif -#if defined (TARGET_WRITE_FP) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ +#ifdef CANNOT_STORE_REGISTER fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "TARGET_WRITE_FP(val)", - XSTRING (TARGET_WRITE_FP (val))); + "CANNOT_STORE_REGISTER(regnum)", + XSTRING (CANNOT_STORE_REGISTER (regnum))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: CANNOT_STORE_REGISTER = 0x%08lx\n", + (long) current_gdbarch->cannot_store_register + /*CANNOT_STORE_REGISTER ()*/); #endif -#ifdef TARGET_READ_SP +#ifdef COERCE_FLOAT_TO_DOUBLE fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "TARGET_READ_SP()", - XSTRING (TARGET_READ_SP ())); + "COERCE_FLOAT_TO_DOUBLE(formal, actual)", + XSTRING (COERCE_FLOAT_TO_DOUBLE (formal, actual))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: COERCE_FLOAT_TO_DOUBLE = 0x%08lx\n", + (long) current_gdbarch->coerce_float_to_double + /*COERCE_FLOAT_TO_DOUBLE ()*/); #endif -#if defined (TARGET_WRITE_SP) && GDB_MULTI_ARCH +#ifdef COFF_MAKE_MSYMBOL_SPECIAL +#if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "TARGET_WRITE_SP(val)", - XSTRING (TARGET_WRITE_SP (val))); + "COFF_MAKE_MSYMBOL_SPECIAL(val, msym)", + XSTRING (COFF_MAKE_MSYMBOL_SPECIAL (val, msym))); #endif -#ifdef NUM_REGS - fprintf_unfiltered (file, - "gdbarch_dump: NUM_REGS # %s\n", - XSTRING (NUM_REGS)); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: COFF_MAKE_MSYMBOL_SPECIAL = 0x%08lx\n", + (long) current_gdbarch->coff_make_msymbol_special + /*COFF_MAKE_MSYMBOL_SPECIAL ()*/); #endif -#ifdef NUM_PSEUDO_REGS + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: construct_inferior_arguments = 0x%08lx\n", + (long) current_gdbarch->construct_inferior_arguments); +#ifdef CONVERT_FROM_FUNC_PTR_ADDR fprintf_unfiltered (file, - "gdbarch_dump: NUM_PSEUDO_REGS # %s\n", - XSTRING (NUM_PSEUDO_REGS)); + "gdbarch_dump: %s # %s\n", + "CONVERT_FROM_FUNC_PTR_ADDR(addr)", + XSTRING (CONVERT_FROM_FUNC_PTR_ADDR (addr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: CONVERT_FROM_FUNC_PTR_ADDR = 0x%08lx\n", + (long) current_gdbarch->convert_from_func_ptr_addr + /*CONVERT_FROM_FUNC_PTR_ADDR ()*/); #endif -#ifdef SP_REGNUM +#ifdef CONVERT_REGISTER_P fprintf_unfiltered (file, - "gdbarch_dump: SP_REGNUM # %s\n", - XSTRING (SP_REGNUM)); + "gdbarch_dump: %s # %s\n", + "CONVERT_REGISTER_P(regnum)", + XSTRING (CONVERT_REGISTER_P (regnum))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: CONVERT_REGISTER_P = 0x%08lx\n", + (long) current_gdbarch->convert_register_p + /*CONVERT_REGISTER_P ()*/); #endif -#ifdef FP_REGNUM +#ifdef DECR_PC_AFTER_BREAK fprintf_unfiltered (file, - "gdbarch_dump: FP_REGNUM # %s\n", - XSTRING (FP_REGNUM)); -#endif -#ifdef PC_REGNUM + "gdbarch_dump: DECR_PC_AFTER_BREAK # %s\n", + XSTRING (DECR_PC_AFTER_BREAK)); fprintf_unfiltered (file, - "gdbarch_dump: PC_REGNUM # %s\n", - XSTRING (PC_REGNUM)); + "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n", + (long) DECR_PC_AFTER_BREAK); #endif -#ifdef FP0_REGNUM +#ifdef DO_REGISTERS_INFO +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: FP0_REGNUM # %s\n", - XSTRING (FP0_REGNUM)); + "gdbarch_dump: %s # %s\n", + "DO_REGISTERS_INFO(reg_nr, fpregs)", + XSTRING (DO_REGISTERS_INFO (reg_nr, fpregs))); #endif -#ifdef NPC_REGNUM - fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM # %s\n", - XSTRING (NPC_REGNUM)); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DO_REGISTERS_INFO = 0x%08lx\n", + (long) current_gdbarch->do_registers_info + /*DO_REGISTERS_INFO ()*/); #endif -#ifdef NNPC_REGNUM +#ifdef DWARF2_BUILD_FRAME_INFO +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: NNPC_REGNUM # %s\n", - XSTRING (NNPC_REGNUM)); + "gdbarch_dump: %s # %s\n", + "DWARF2_BUILD_FRAME_INFO(objfile)", + XSTRING (DWARF2_BUILD_FRAME_INFO (objfile))); #endif -#ifdef REGISTER_NAME + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DWARF2_BUILD_FRAME_INFO = 0x%08lx\n", + (long) current_gdbarch->dwarf2_build_frame_info + /*DWARF2_BUILD_FRAME_INFO ()*/); +#endif +#ifdef DWARF2_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "REGISTER_NAME(regnr)", - XSTRING (REGISTER_NAME (regnr))); + "DWARF2_REG_TO_REGNUM(dwarf2_regnr)", + XSTRING (DWARF2_REG_TO_REGNUM (dwarf2_regnr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DWARF2_REG_TO_REGNUM = 0x%08lx\n", + (long) current_gdbarch->dwarf2_reg_to_regnum + /*DWARF2_REG_TO_REGNUM ()*/); #endif -#ifdef REGISTER_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_SIZE # %s\n", - XSTRING (REGISTER_SIZE)); -#endif -#ifdef REGISTER_BYTES - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTES # %s\n", - XSTRING (REGISTER_BYTES)); -#endif -#ifdef REGISTER_BYTE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_BYTE(reg_nr)", - XSTRING (REGISTER_BYTE (reg_nr))); -#endif -#ifdef REGISTER_RAW_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_RAW_SIZE(reg_nr)", - XSTRING (REGISTER_RAW_SIZE (reg_nr))); -#endif -#ifdef MAX_REGISTER_RAW_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: MAX_REGISTER_RAW_SIZE # %s\n", - XSTRING (MAX_REGISTER_RAW_SIZE)); -#endif -#ifdef REGISTER_VIRTUAL_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_VIRTUAL_SIZE(reg_nr)", - XSTRING (REGISTER_VIRTUAL_SIZE (reg_nr))); -#endif -#ifdef MAX_REGISTER_VIRTUAL_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: MAX_REGISTER_VIRTUAL_SIZE # %s\n", - XSTRING (MAX_REGISTER_VIRTUAL_SIZE)); -#endif -#ifdef REGISTER_VIRTUAL_TYPE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_VIRTUAL_TYPE(reg_nr)", - XSTRING (REGISTER_VIRTUAL_TYPE (reg_nr))); -#endif -#if defined (DO_REGISTERS_INFO) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DO_REGISTERS_INFO(reg_nr, fpregs)", - XSTRING (DO_REGISTERS_INFO (reg_nr, fpregs))); -#endif -#ifdef REGISTER_SIM_REGNO - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_SIM_REGNO(reg_nr)", - XSTRING (REGISTER_SIM_REGNO (reg_nr))); -#endif -#ifdef USE_GENERIC_DUMMY_FRAMES - fprintf_unfiltered (file, - "gdbarch_dump: USE_GENERIC_DUMMY_FRAMES # %s\n", - XSTRING (USE_GENERIC_DUMMY_FRAMES)); -#endif -#ifdef CALL_DUMMY_LOCATION - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LOCATION # %s\n", - XSTRING (CALL_DUMMY_LOCATION)); -#endif -#ifdef CALL_DUMMY_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "CALL_DUMMY_ADDRESS()", - XSTRING (CALL_DUMMY_ADDRESS ())); -#endif -#ifdef CALL_DUMMY_START_OFFSET - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_START_OFFSET # %s\n", - XSTRING (CALL_DUMMY_START_OFFSET)); -#endif -#ifdef CALL_DUMMY_BREAKPOINT_OFFSET - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET # %s\n", - XSTRING (CALL_DUMMY_BREAKPOINT_OFFSET)); -#endif -#ifdef CALL_DUMMY_BREAKPOINT_OFFSET_P - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET_P # %s\n", - XSTRING (CALL_DUMMY_BREAKPOINT_OFFSET_P)); -#endif -#ifdef CALL_DUMMY_LENGTH - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LENGTH # %s\n", - XSTRING (CALL_DUMMY_LENGTH)); -#endif -#ifdef PC_IN_CALL_DUMMY +#ifdef DWARF_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "PC_IN_CALL_DUMMY(pc, sp, frame_address)", - XSTRING (PC_IN_CALL_DUMMY (pc, sp, frame_address))); -#endif -#ifdef CALL_DUMMY_P - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_P # %s\n", - XSTRING (CALL_DUMMY_P)); -#endif -#ifdef CALL_DUMMY_WORDS - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_WORDS # %s\n", - XSTRING (CALL_DUMMY_WORDS)); -#endif -#ifdef SIZEOF_CALL_DUMMY_WORDS - fprintf_unfiltered (file, - "gdbarch_dump: SIZEOF_CALL_DUMMY_WORDS # %s\n", - XSTRING (SIZEOF_CALL_DUMMY_WORDS)); -#endif -#ifdef CALL_DUMMY_STACK_ADJUST_P - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_STACK_ADJUST_P # %s\n", - XSTRING (CALL_DUMMY_STACK_ADJUST_P)); -#endif -#ifdef CALL_DUMMY_STACK_ADJUST - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_STACK_ADJUST # %s\n", - XSTRING (CALL_DUMMY_STACK_ADJUST)); -#endif -#if defined (FIX_CALL_DUMMY) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p)", - XSTRING (FIX_CALL_DUMMY (dummy, pc, fun, nargs, args, type, gcc_p))); -#endif -#ifdef BELIEVE_PCC_PROMOTION - fprintf_unfiltered (file, - "gdbarch_dump: BELIEVE_PCC_PROMOTION # %s\n", - XSTRING (BELIEVE_PCC_PROMOTION)); -#endif -#ifdef BELIEVE_PCC_PROMOTION_TYPE - fprintf_unfiltered (file, - "gdbarch_dump: BELIEVE_PCC_PROMOTION_TYPE # %s\n", - XSTRING (BELIEVE_PCC_PROMOTION_TYPE)); -#endif -#ifdef COERCE_FLOAT_TO_DOUBLE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "COERCE_FLOAT_TO_DOUBLE(formal, actual)", - XSTRING (COERCE_FLOAT_TO_DOUBLE (formal, actual))); -#endif -#if defined (GET_SAVED_REGISTER) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval)", - XSTRING (GET_SAVED_REGISTER (raw_buffer, optimized, addrp, frame, regnum, lval))); -#endif -#ifdef REGISTER_CONVERTIBLE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_CONVERTIBLE(nr)", - XSTRING (REGISTER_CONVERTIBLE (nr))); -#endif -#if defined (REGISTER_CONVERT_TO_VIRTUAL) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_CONVERT_TO_VIRTUAL(regnum, type, from, to)", - XSTRING (REGISTER_CONVERT_TO_VIRTUAL (regnum, type, from, to))); -#endif -#if defined (REGISTER_CONVERT_TO_RAW) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_CONVERT_TO_RAW(type, regnum, from, to)", - XSTRING (REGISTER_CONVERT_TO_RAW (type, regnum, from, to))); -#endif -#if defined (FETCH_PSEUDO_REGISTER) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FETCH_PSEUDO_REGISTER(regnum)", - XSTRING (FETCH_PSEUDO_REGISTER (regnum))); -#endif -#if defined (STORE_PSEUDO_REGISTER) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STORE_PSEUDO_REGISTER(regnum)", - XSTRING (STORE_PSEUDO_REGISTER (regnum))); + "DWARF_REG_TO_REGNUM(dwarf_regnr)", + XSTRING (DWARF_REG_TO_REGNUM (dwarf_regnr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DWARF_REG_TO_REGNUM = 0x%08lx\n", + (long) current_gdbarch->dwarf_reg_to_regnum + /*DWARF_REG_TO_REGNUM ()*/); #endif -#ifdef POINTER_TO_ADDRESS +#ifdef ECOFF_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "POINTER_TO_ADDRESS(type, buf)", - XSTRING (POINTER_TO_ADDRESS (type, buf))); + "ECOFF_REG_TO_REGNUM(ecoff_regnr)", + XSTRING (ECOFF_REG_TO_REGNUM (ecoff_regnr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: ECOFF_REG_TO_REGNUM = 0x%08lx\n", + (long) current_gdbarch->ecoff_reg_to_regnum + /*ECOFF_REG_TO_REGNUM ()*/); #endif -#if defined (ADDRESS_TO_POINTER) && GDB_MULTI_ARCH +#ifdef ELF_MAKE_MSYMBOL_SPECIAL +#if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "ADDRESS_TO_POINTER(type, buf, addr)", - XSTRING (ADDRESS_TO_POINTER (type, buf, addr))); + "ELF_MAKE_MSYMBOL_SPECIAL(sym, msym)", + XSTRING (ELF_MAKE_MSYMBOL_SPECIAL (sym, msym))); #endif -#ifdef RETURN_VALUE_ON_STACK - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "RETURN_VALUE_ON_STACK(type)", - XSTRING (RETURN_VALUE_ON_STACK (type))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: ELF_MAKE_MSYMBOL_SPECIAL = 0x%08lx\n", + (long) current_gdbarch->elf_make_msymbol_special + /*ELF_MAKE_MSYMBOL_SPECIAL ()*/); #endif -#if defined (EXTRACT_RETURN_VALUE) && GDB_MULTI_ARCH +#ifdef EXTRACT_RETURN_VALUE +#if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "EXTRACT_RETURN_VALUE(type, regbuf, valbuf)", XSTRING (EXTRACT_RETURN_VALUE (type, regbuf, valbuf))); #endif -#ifdef PUSH_ARGUMENTS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr)", - XSTRING (PUSH_ARGUMENTS (nargs, args, sp, struct_return, struct_addr))); -#endif -#if defined (PUSH_DUMMY_FRAME) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "PUSH_DUMMY_FRAME(-)", - XSTRING (PUSH_DUMMY_FRAME (-))); -#endif -#ifdef PUSH_RETURN_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "PUSH_RETURN_ADDRESS(pc, sp)", - XSTRING (PUSH_RETURN_ADDRESS (pc, sp))); -#endif -#if defined (POP_FRAME) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "POP_FRAME(-)", - XSTRING (POP_FRAME (-))); -#endif -#ifdef D10V_MAKE_DADDR - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_MAKE_DADDR(x)", - XSTRING (D10V_MAKE_DADDR (x))); -#endif -#ifdef D10V_MAKE_IADDR - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_MAKE_IADDR(x)", - XSTRING (D10V_MAKE_IADDR (x))); -#endif -#ifdef D10V_DADDR_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_DADDR_P(x)", - XSTRING (D10V_DADDR_P (x))); -#endif -#ifdef D10V_IADDR_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_IADDR_P(x)", - XSTRING (D10V_IADDR_P (x))); -#endif -#ifdef D10V_CONVERT_DADDR_TO_RAW - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_CONVERT_DADDR_TO_RAW(x)", - XSTRING (D10V_CONVERT_DADDR_TO_RAW (x))); -#endif -#ifdef D10V_CONVERT_IADDR_TO_RAW - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "D10V_CONVERT_IADDR_TO_RAW(x)", - XSTRING (D10V_CONVERT_IADDR_TO_RAW (x))); -#endif -#if defined (STORE_STRUCT_RETURN) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STORE_STRUCT_RETURN(addr, sp)", - XSTRING (STORE_STRUCT_RETURN (addr, sp))); -#endif -#if defined (STORE_RETURN_VALUE) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "STORE_RETURN_VALUE(type, valbuf)", - XSTRING (STORE_RETURN_VALUE (type, valbuf))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: EXTRACT_RETURN_VALUE = 0x%08lx\n", + (long) current_gdbarch->extract_return_value + /*EXTRACT_RETURN_VALUE ()*/); #endif #ifdef EXTRACT_STRUCT_VALUE_ADDRESS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "EXTRACT_STRUCT_VALUE_ADDRESS(regbuf)", XSTRING (EXTRACT_STRUCT_VALUE_ADDRESS (regbuf))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: EXTRACT_STRUCT_VALUE_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->extract_struct_value_address + /*EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif -#ifdef USE_STRUCT_CONVENTION +#ifdef EXTRA_STACK_ALIGNMENT_NEEDED fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "USE_STRUCT_CONVENTION(gcc_p, value_type)", - XSTRING (USE_STRUCT_CONVENTION (gcc_p, value_type))); -#endif -#if defined (FRAME_INIT_SAVED_REGS) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ + "gdbarch_dump: EXTRA_STACK_ALIGNMENT_NEEDED # %s\n", + XSTRING (EXTRA_STACK_ALIGNMENT_NEEDED)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAME_INIT_SAVED_REGS(frame)", - XSTRING (FRAME_INIT_SAVED_REGS (frame))); + "gdbarch_dump: EXTRA_STACK_ALIGNMENT_NEEDED = %d\n", + EXTRA_STACK_ALIGNMENT_NEEDED); #endif -#if defined (INIT_EXTRA_FRAME_INFO) && GDB_MULTI_ARCH +#ifdef FETCH_PSEUDO_REGISTER +#if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "INIT_EXTRA_FRAME_INFO(fromleaf, frame)", - XSTRING (INIT_EXTRA_FRAME_INFO (fromleaf, frame))); -#endif -#ifdef SKIP_PROLOGUE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SKIP_PROLOGUE(ip)", - XSTRING (SKIP_PROLOGUE (ip))); + "FETCH_PSEUDO_REGISTER(regnum)", + XSTRING (FETCH_PSEUDO_REGISTER (regnum))); #endif -#ifdef PROLOGUE_FRAMELESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "PROLOGUE_FRAMELESS_P(ip)", - XSTRING (PROLOGUE_FRAMELESS_P (ip))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FETCH_PSEUDO_REGISTER = 0x%08lx\n", + (long) current_gdbarch->fetch_pseudo_register + /*FETCH_PSEUDO_REGISTER ()*/); #endif -#ifdef INNER_THAN +#ifdef FIX_CALL_DUMMY +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "INNER_THAN(lhs, rhs)", - XSTRING (INNER_THAN (lhs, rhs))); + "FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p)", + XSTRING (FIX_CALL_DUMMY (dummy, pc, fun, nargs, args, type, gcc_p))); #endif -#ifdef BREAKPOINT_FROM_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "BREAKPOINT_FROM_PC(pcptr, lenptr)", - XSTRING (BREAKPOINT_FROM_PC (pcptr, lenptr))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FIX_CALL_DUMMY = 0x%08lx\n", + (long) current_gdbarch->fix_call_dummy + /*FIX_CALL_DUMMY ()*/); #endif -#ifdef MEMORY_INSERT_BREAKPOINT +#ifdef FP0_REGNUM fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "MEMORY_INSERT_BREAKPOINT(addr, contents_cache)", - XSTRING (MEMORY_INSERT_BREAKPOINT (addr, contents_cache))); -#endif -#ifdef MEMORY_REMOVE_BREAKPOINT + "gdbarch_dump: FP0_REGNUM # %s\n", + XSTRING (FP0_REGNUM)); fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "MEMORY_REMOVE_BREAKPOINT(addr, contents_cache)", - XSTRING (MEMORY_REMOVE_BREAKPOINT (addr, contents_cache))); + "gdbarch_dump: FP0_REGNUM = %d\n", + FP0_REGNUM); #endif -#ifdef DECR_PC_AFTER_BREAK +#ifdef FP_REGNUM fprintf_unfiltered (file, - "gdbarch_dump: DECR_PC_AFTER_BREAK # %s\n", - XSTRING (DECR_PC_AFTER_BREAK)); + "gdbarch_dump: FP_REGNUM # %s\n", + XSTRING (FP_REGNUM)); + fprintf_unfiltered (file, + "gdbarch_dump: FP_REGNUM = %d\n", + FP_REGNUM); #endif -#ifdef FUNCTION_START_OFFSET +#ifdef FRAMELESS_FUNCTION_INVOCATION fprintf_unfiltered (file, - "gdbarch_dump: FUNCTION_START_OFFSET # %s\n", - XSTRING (FUNCTION_START_OFFSET)); + "gdbarch_dump: %s # %s\n", + "FRAMELESS_FUNCTION_INVOCATION(fi)", + XSTRING (FRAMELESS_FUNCTION_INVOCATION (fi))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAMELESS_FUNCTION_INVOCATION = 0x%08lx\n", + (long) current_gdbarch->frameless_function_invocation + /*FRAMELESS_FUNCTION_INVOCATION ()*/); #endif -#if defined (REMOTE_TRANSLATE_XFER_ADDRESS) && GDB_MULTI_ARCH - /* Macro might contain `[{}]' when not multi-arch */ +#ifdef FRAME_ARGS_ADDRESS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "REMOTE_TRANSLATE_XFER_ADDRESS(gdb_addr, gdb_len, rem_addr, rem_len)", - XSTRING (REMOTE_TRANSLATE_XFER_ADDRESS (gdb_addr, gdb_len, rem_addr, rem_len))); + "FRAME_ARGS_ADDRESS(fi)", + XSTRING (FRAME_ARGS_ADDRESS (fi))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_ARGS_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->frame_args_address + /*FRAME_ARGS_ADDRESS ()*/); #endif #ifdef FRAME_ARGS_SKIP fprintf_unfiltered (file, "gdbarch_dump: FRAME_ARGS_SKIP # %s\n", XSTRING (FRAME_ARGS_SKIP)); -#endif -#ifdef FRAMELESS_FUNCTION_INVOCATION fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAMELESS_FUNCTION_INVOCATION(fi)", - XSTRING (FRAMELESS_FUNCTION_INVOCATION (fi))); + "gdbarch_dump: FRAME_ARGS_SKIP = %ld\n", + (long) FRAME_ARGS_SKIP); #endif #ifdef FRAME_CHAIN fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "FRAME_CHAIN(frame)", XSTRING (FRAME_CHAIN (frame))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_CHAIN = 0x%08lx\n", + (long) current_gdbarch->frame_chain + /*FRAME_CHAIN ()*/); #endif #ifdef FRAME_CHAIN_VALID fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "FRAME_CHAIN_VALID(chain, thisframe)", XSTRING (FRAME_CHAIN_VALID (chain, thisframe))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_CHAIN_VALID = 0x%08lx\n", + (long) current_gdbarch->frame_chain_valid + /*FRAME_CHAIN_VALID ()*/); #endif -#ifdef FRAME_SAVED_PC +#ifdef FRAME_INIT_SAVED_REGS +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "FRAME_SAVED_PC(fi)", - XSTRING (FRAME_SAVED_PC (fi))); + "FRAME_INIT_SAVED_REGS(frame)", + XSTRING (FRAME_INIT_SAVED_REGS (frame))); #endif -#ifdef FRAME_ARGS_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAME_ARGS_ADDRESS(fi)", - XSTRING (FRAME_ARGS_ADDRESS (fi))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_INIT_SAVED_REGS = 0x%08lx\n", + (long) current_gdbarch->frame_init_saved_regs + /*FRAME_INIT_SAVED_REGS ()*/); #endif #ifdef FRAME_LOCALS_ADDRESS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "FRAME_LOCALS_ADDRESS(fi)", XSTRING (FRAME_LOCALS_ADDRESS (fi))); -#endif -#ifdef SAVED_PC_AFTER_CALL - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SAVED_PC_AFTER_CALL(frame)", - XSTRING (SAVED_PC_AFTER_CALL (frame))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_LOCALS_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->frame_locals_address + /*FRAME_LOCALS_ADDRESS ()*/); #endif #ifdef FRAME_NUM_ARGS fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", "FRAME_NUM_ARGS(frame)", XSTRING (FRAME_NUM_ARGS (frame))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_NUM_ARGS = 0x%08lx\n", + (long) current_gdbarch->frame_num_args + /*FRAME_NUM_ARGS ()*/); #endif -#ifdef STACK_ALIGN +#ifdef FRAME_SAVED_PC fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "STACK_ALIGN(sp)", - XSTRING (STACK_ALIGN (sp))); + "FRAME_SAVED_PC(fi)", + XSTRING (FRAME_SAVED_PC (fi))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FRAME_SAVED_PC = 0x%08lx\n", + (long) current_gdbarch->frame_saved_pc + /*FRAME_SAVED_PC ()*/); #endif -#ifdef EXTRA_STACK_ALIGNMENT_NEEDED +#ifdef FUNCTION_START_OFFSET fprintf_unfiltered (file, - "gdbarch_dump: EXTRA_STACK_ALIGNMENT_NEEDED # %s\n", - XSTRING (EXTRA_STACK_ALIGNMENT_NEEDED)); + "gdbarch_dump: FUNCTION_START_OFFSET # %s\n", + XSTRING (FUNCTION_START_OFFSET)); + fprintf_unfiltered (file, + "gdbarch_dump: FUNCTION_START_OFFSET = %ld\n", + (long) FUNCTION_START_OFFSET); #endif -#ifdef REG_STRUCT_HAS_ADDR +#ifdef GET_LONGJMP_TARGET fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "REG_STRUCT_HAS_ADDR(gcc_p, type)", - XSTRING (REG_STRUCT_HAS_ADDR (gcc_p, type))); + "GET_LONGJMP_TARGET(pc)", + XSTRING (GET_LONGJMP_TARGET (pc))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: GET_LONGJMP_TARGET = 0x%08lx\n", + (long) current_gdbarch->get_longjmp_target + /*GET_LONGJMP_TARGET ()*/); #endif -#if defined (SAVE_DUMMY_FRAME_TOS) && GDB_MULTI_ARCH +#ifdef GET_SAVED_REGISTER +#if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "SAVE_DUMMY_FRAME_TOS(sp)", - XSTRING (SAVE_DUMMY_FRAME_TOS (sp))); -#endif -#ifdef TARGET_FLOAT_FORMAT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_FLOAT_FORMAT # %s\n", - XSTRING (TARGET_FLOAT_FORMAT)); -#endif -#ifdef TARGET_DOUBLE_FORMAT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_DOUBLE_FORMAT # %s\n", - XSTRING (TARGET_DOUBLE_FORMAT)); + "GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval)", + XSTRING (GET_SAVED_REGISTER (raw_buffer, optimized, addrp, frame, regnum, lval))); #endif -#ifdef TARGET_LONG_DOUBLE_FORMAT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_DOUBLE_FORMAT # %s\n", - XSTRING (TARGET_LONG_DOUBLE_FORMAT)); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: GET_SAVED_REGISTER = 0x%08lx\n", + (long) current_gdbarch->get_saved_register + /*GET_SAVED_REGISTER ()*/); #endif -#ifdef CONVERT_FROM_FUNC_PTR_ADDR +#ifdef INIT_EXTRA_FRAME_INFO +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", - "CONVERT_FROM_FUNC_PTR_ADDR(addr)", - XSTRING (CONVERT_FROM_FUNC_PTR_ADDR (addr))); + "INIT_EXTRA_FRAME_INFO(fromleaf, frame)", + XSTRING (INIT_EXTRA_FRAME_INFO (fromleaf, frame))); #endif -#ifdef TARGET_ARCHITECTURE - if (TARGET_ARCHITECTURE != NULL) + if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ARCHITECTURE = %s\n", - TARGET_ARCHITECTURE->printable_name); + "gdbarch_dump: INIT_EXTRA_FRAME_INFO = 0x%08lx\n", + (long) current_gdbarch->init_extra_frame_info + /*INIT_EXTRA_FRAME_INFO ()*/); #endif -#ifdef TARGET_BYTE_ORDER +#ifdef INIT_FRAME_PC +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BYTE_ORDER = %ld\n", - (long) TARGET_BYTE_ORDER); + "gdbarch_dump: %s # %s\n", + "INIT_FRAME_PC(fromleaf, prev)", + XSTRING (INIT_FRAME_PC (fromleaf, prev))); #endif -#ifdef TARGET_SHORT_BIT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_SHORT_BIT = %ld\n", - (long) TARGET_SHORT_BIT); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: INIT_FRAME_PC = 0x%08lx\n", + (long) current_gdbarch->init_frame_pc + /*INIT_FRAME_PC ()*/); #endif -#ifdef TARGET_INT_BIT +#ifdef INIT_FRAME_PC_FIRST +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: TARGET_INT_BIT = %ld\n", - (long) TARGET_INT_BIT); + "gdbarch_dump: %s # %s\n", + "INIT_FRAME_PC_FIRST(fromleaf, prev)", + XSTRING (INIT_FRAME_PC_FIRST (fromleaf, prev))); #endif -#ifdef TARGET_LONG_BIT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_BIT = %ld\n", - (long) TARGET_LONG_BIT); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: INIT_FRAME_PC_FIRST = 0x%08lx\n", + (long) current_gdbarch->init_frame_pc_first + /*INIT_FRAME_PC_FIRST ()*/); #endif -#ifdef TARGET_LONG_LONG_BIT +#ifdef INNER_THAN fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_LONG_BIT = %ld\n", - (long) TARGET_LONG_LONG_BIT); + "gdbarch_dump: %s # %s\n", + "INNER_THAN(lhs, rhs)", + XSTRING (INNER_THAN (lhs, rhs))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: INNER_THAN = 0x%08lx\n", + (long) current_gdbarch->inner_than + /*INNER_THAN ()*/); #endif -#ifdef TARGET_FLOAT_BIT +#ifdef INTEGER_TO_ADDRESS fprintf_unfiltered (file, - "gdbarch_dump: TARGET_FLOAT_BIT = %ld\n", - (long) TARGET_FLOAT_BIT); + "gdbarch_dump: %s # %s\n", + "INTEGER_TO_ADDRESS(type, buf)", + XSTRING (INTEGER_TO_ADDRESS (type, buf))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: INTEGER_TO_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->integer_to_address + /*INTEGER_TO_ADDRESS ()*/); #endif -#ifdef TARGET_DOUBLE_BIT +#ifdef IN_SOLIB_CALL_TRAMPOLINE fprintf_unfiltered (file, - "gdbarch_dump: TARGET_DOUBLE_BIT = %ld\n", - (long) TARGET_DOUBLE_BIT); + "gdbarch_dump: %s # %s\n", + "IN_SOLIB_CALL_TRAMPOLINE(pc, name)", + XSTRING (IN_SOLIB_CALL_TRAMPOLINE (pc, name))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: IN_SOLIB_CALL_TRAMPOLINE = 0x%08lx\n", + (long) current_gdbarch->in_solib_call_trampoline + /*IN_SOLIB_CALL_TRAMPOLINE ()*/); #endif -#ifdef TARGET_LONG_DOUBLE_BIT +#ifdef MAX_REGISTER_RAW_SIZE fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_DOUBLE_BIT = %ld\n", - (long) TARGET_LONG_DOUBLE_BIT); -#endif -#ifdef TARGET_PTR_BIT + "gdbarch_dump: MAX_REGISTER_RAW_SIZE # %s\n", + XSTRING (MAX_REGISTER_RAW_SIZE)); fprintf_unfiltered (file, - "gdbarch_dump: TARGET_PTR_BIT = %ld\n", - (long) TARGET_PTR_BIT); + "gdbarch_dump: MAX_REGISTER_RAW_SIZE = %d\n", + MAX_REGISTER_RAW_SIZE); #endif -#ifdef TARGET_ADDR_BIT +#ifdef MAX_REGISTER_VIRTUAL_SIZE fprintf_unfiltered (file, - "gdbarch_dump: TARGET_ADDR_BIT = %ld\n", - (long) TARGET_ADDR_BIT); -#endif -#ifdef TARGET_BFD_VMA_BIT + "gdbarch_dump: MAX_REGISTER_VIRTUAL_SIZE # %s\n", + XSTRING (MAX_REGISTER_VIRTUAL_SIZE)); fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BFD_VMA_BIT = %ld\n", - (long) TARGET_BFD_VMA_BIT); + "gdbarch_dump: MAX_REGISTER_VIRTUAL_SIZE = %d\n", + MAX_REGISTER_VIRTUAL_SIZE); #endif -#ifdef IEEE_FLOAT +#ifdef MEMORY_INSERT_BREAKPOINT fprintf_unfiltered (file, - "gdbarch_dump: IEEE_FLOAT = %ld\n", - (long) IEEE_FLOAT); -#endif -#ifdef TARGET_READ_PC - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_READ_PC = 0x%08lx\n", - (long) current_gdbarch->read_pc - /*TARGET_READ_PC ()*/); -#endif -#ifdef TARGET_WRITE_PC - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_WRITE_PC = 0x%08lx\n", - (long) current_gdbarch->write_pc - /*TARGET_WRITE_PC ()*/); -#endif -#ifdef TARGET_READ_FP - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_READ_FP = 0x%08lx\n", - (long) current_gdbarch->read_fp - /*TARGET_READ_FP ()*/); -#endif -#ifdef TARGET_WRITE_FP - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_WRITE_FP = 0x%08lx\n", - (long) current_gdbarch->write_fp - /*TARGET_WRITE_FP ()*/); -#endif -#ifdef TARGET_READ_SP + "gdbarch_dump: %s # %s\n", + "MEMORY_INSERT_BREAKPOINT(addr, contents_cache)", + XSTRING (MEMORY_INSERT_BREAKPOINT (addr, contents_cache))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: TARGET_READ_SP = 0x%08lx\n", - (long) current_gdbarch->read_sp - /*TARGET_READ_SP ()*/); + "gdbarch_dump: MEMORY_INSERT_BREAKPOINT = 0x%08lx\n", + (long) current_gdbarch->memory_insert_breakpoint + /*MEMORY_INSERT_BREAKPOINT ()*/); #endif -#ifdef TARGET_WRITE_SP +#ifdef MEMORY_REMOVE_BREAKPOINT + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "MEMORY_REMOVE_BREAKPOINT(addr, contents_cache)", + XSTRING (MEMORY_REMOVE_BREAKPOINT (addr, contents_cache))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: TARGET_WRITE_SP = 0x%08lx\n", - (long) current_gdbarch->write_sp - /*TARGET_WRITE_SP ()*/); + "gdbarch_dump: MEMORY_REMOVE_BREAKPOINT = 0x%08lx\n", + (long) current_gdbarch->memory_remove_breakpoint + /*MEMORY_REMOVE_BREAKPOINT ()*/); #endif -#ifdef NUM_REGS +#ifdef NPC_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: NPC_REGNUM # %s\n", + XSTRING (NPC_REGNUM)); fprintf_unfiltered (file, - "gdbarch_dump: NUM_REGS = %ld\n", - (long) NUM_REGS); + "gdbarch_dump: NPC_REGNUM = %d\n", + NPC_REGNUM); #endif #ifdef NUM_PSEUDO_REGS fprintf_unfiltered (file, - "gdbarch_dump: NUM_PSEUDO_REGS = %ld\n", - (long) NUM_PSEUDO_REGS); -#endif -#ifdef SP_REGNUM + "gdbarch_dump: NUM_PSEUDO_REGS # %s\n", + XSTRING (NUM_PSEUDO_REGS)); fprintf_unfiltered (file, - "gdbarch_dump: SP_REGNUM = %ld\n", - (long) SP_REGNUM); + "gdbarch_dump: NUM_PSEUDO_REGS = %d\n", + NUM_PSEUDO_REGS); #endif -#ifdef FP_REGNUM +#ifdef NUM_REGS fprintf_unfiltered (file, - "gdbarch_dump: FP_REGNUM = %ld\n", - (long) FP_REGNUM); -#endif -#ifdef PC_REGNUM + "gdbarch_dump: NUM_REGS # %s\n", + XSTRING (NUM_REGS)); fprintf_unfiltered (file, - "gdbarch_dump: PC_REGNUM = %ld\n", - (long) PC_REGNUM); + "gdbarch_dump: NUM_REGS = %d\n", + NUM_REGS); #endif -#ifdef FP0_REGNUM +#ifdef PARM_BOUNDARY fprintf_unfiltered (file, - "gdbarch_dump: FP0_REGNUM = %ld\n", - (long) FP0_REGNUM); -#endif -#ifdef NPC_REGNUM + "gdbarch_dump: PARM_BOUNDARY # %s\n", + XSTRING (PARM_BOUNDARY)); fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM = %ld\n", - (long) NPC_REGNUM); + "gdbarch_dump: PARM_BOUNDARY = %d\n", + PARM_BOUNDARY); #endif -#ifdef NNPC_REGNUM +#ifdef PC_IN_CALL_DUMMY fprintf_unfiltered (file, - "gdbarch_dump: NNPC_REGNUM = %ld\n", - (long) NNPC_REGNUM); -#endif -#ifdef REGISTER_NAME + "gdbarch_dump: %s # %s\n", + "PC_IN_CALL_DUMMY(pc, sp, frame_address)", + XSTRING (PC_IN_CALL_DUMMY (pc, sp, frame_address))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_NAME = 0x%08lx\n", - (long) current_gdbarch->register_name - /*REGISTER_NAME ()*/); -#endif -#ifdef REGISTER_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_SIZE = %ld\n", - (long) REGISTER_SIZE); + "gdbarch_dump: PC_IN_CALL_DUMMY = 0x%08lx\n", + (long) current_gdbarch->pc_in_call_dummy + /*PC_IN_CALL_DUMMY ()*/); #endif -#ifdef REGISTER_BYTES +#ifdef PC_IN_SIGTRAMP fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTES = %ld\n", - (long) REGISTER_BYTES); -#endif -#ifdef REGISTER_BYTE + "gdbarch_dump: %s # %s\n", + "PC_IN_SIGTRAMP(pc, name)", + XSTRING (PC_IN_SIGTRAMP (pc, name))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTE = 0x%08lx\n", - (long) current_gdbarch->register_byte - /*REGISTER_BYTE ()*/); + "gdbarch_dump: PC_IN_SIGTRAMP = 0x%08lx\n", + (long) current_gdbarch->pc_in_sigtramp + /*PC_IN_SIGTRAMP ()*/); #endif -#ifdef REGISTER_RAW_SIZE +#ifdef PC_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: PC_REGNUM # %s\n", + XSTRING (PC_REGNUM)); + fprintf_unfiltered (file, + "gdbarch_dump: PC_REGNUM = %d\n", + PC_REGNUM); +#endif +#ifdef POINTER_TO_ADDRESS + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "POINTER_TO_ADDRESS(type, buf)", + XSTRING (POINTER_TO_ADDRESS (type, buf))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_RAW_SIZE = 0x%08lx\n", - (long) current_gdbarch->register_raw_size - /*REGISTER_RAW_SIZE ()*/); + "gdbarch_dump: POINTER_TO_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->pointer_to_address + /*POINTER_TO_ADDRESS ()*/); #endif -#ifdef MAX_REGISTER_RAW_SIZE +#ifdef POP_FRAME +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: MAX_REGISTER_RAW_SIZE = %ld\n", - (long) MAX_REGISTER_RAW_SIZE); + "gdbarch_dump: %s # %s\n", + "POP_FRAME(-)", + XSTRING (POP_FRAME (-))); #endif -#ifdef REGISTER_VIRTUAL_SIZE if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_VIRTUAL_SIZE = 0x%08lx\n", - (long) current_gdbarch->register_virtual_size - /*REGISTER_VIRTUAL_SIZE ()*/); + "gdbarch_dump: POP_FRAME = 0x%08lx\n", + (long) current_gdbarch->pop_frame + /*POP_FRAME ()*/); #endif -#ifdef MAX_REGISTER_VIRTUAL_SIZE +#ifdef PREPARE_TO_PROCEED fprintf_unfiltered (file, - "gdbarch_dump: MAX_REGISTER_VIRTUAL_SIZE = %ld\n", - (long) MAX_REGISTER_VIRTUAL_SIZE); -#endif -#ifdef REGISTER_VIRTUAL_TYPE + "gdbarch_dump: %s # %s\n", + "PREPARE_TO_PROCEED(select_it)", + XSTRING (PREPARE_TO_PROCEED (select_it))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_VIRTUAL_TYPE = 0x%08lx\n", - (long) current_gdbarch->register_virtual_type - /*REGISTER_VIRTUAL_TYPE ()*/); + "gdbarch_dump: PREPARE_TO_PROCEED = 0x%08lx\n", + (long) current_gdbarch->prepare_to_proceed + /*PREPARE_TO_PROCEED ()*/); +#endif +#ifdef PRINT_FLOAT_INFO +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "PRINT_FLOAT_INFO()", + XSTRING (PRINT_FLOAT_INFO ())); #endif -#ifdef DO_REGISTERS_INFO if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: DO_REGISTERS_INFO = 0x%08lx\n", - (long) current_gdbarch->do_registers_info - /*DO_REGISTERS_INFO ()*/); + "gdbarch_dump: PRINT_FLOAT_INFO = 0x%08lx\n", + (long) current_gdbarch->print_float_info + /*PRINT_FLOAT_INFO ()*/); #endif -#ifdef REGISTER_SIM_REGNO +#ifdef PROLOGUE_FRAMELESS_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "PROLOGUE_FRAMELESS_P(ip)", + XSTRING (PROLOGUE_FRAMELESS_P (ip))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_SIM_REGNO = 0x%08lx\n", - (long) current_gdbarch->register_sim_regno - /*REGISTER_SIM_REGNO ()*/); + "gdbarch_dump: PROLOGUE_FRAMELESS_P = 0x%08lx\n", + (long) current_gdbarch->prologue_frameless_p + /*PROLOGUE_FRAMELESS_P ()*/); #endif -#ifdef USE_GENERIC_DUMMY_FRAMES +#ifdef PS_REGNUM fprintf_unfiltered (file, - "gdbarch_dump: USE_GENERIC_DUMMY_FRAMES = %ld\n", - (long) USE_GENERIC_DUMMY_FRAMES); -#endif -#ifdef CALL_DUMMY_LOCATION + "gdbarch_dump: PS_REGNUM # %s\n", + XSTRING (PS_REGNUM)); fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LOCATION = %ld\n", - (long) CALL_DUMMY_LOCATION); + "gdbarch_dump: PS_REGNUM = %d\n", + PS_REGNUM); #endif -#ifdef CALL_DUMMY_ADDRESS +#ifdef PUSH_ARGUMENTS + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr)", + XSTRING (PUSH_ARGUMENTS (nargs, args, sp, struct_return, struct_addr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->call_dummy_address - /*CALL_DUMMY_ADDRESS ()*/); + "gdbarch_dump: PUSH_ARGUMENTS = 0x%08lx\n", + (long) current_gdbarch->push_arguments + /*PUSH_ARGUMENTS ()*/); #endif -#ifdef CALL_DUMMY_START_OFFSET +#ifdef PUSH_DUMMY_FRAME +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_START_OFFSET = 0x%08lx\n", - (long) CALL_DUMMY_START_OFFSET); + "gdbarch_dump: %s # %s\n", + "PUSH_DUMMY_FRAME(-)", + XSTRING (PUSH_DUMMY_FRAME (-))); #endif -#ifdef CALL_DUMMY_BREAKPOINT_OFFSET - if (CALL_DUMMY_BREAKPOINT_OFFSET_P) + if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET = 0x%08lx\n", - (long) CALL_DUMMY_BREAKPOINT_OFFSET); + "gdbarch_dump: PUSH_DUMMY_FRAME = 0x%08lx\n", + (long) current_gdbarch->push_dummy_frame + /*PUSH_DUMMY_FRAME ()*/); #endif -#ifdef CALL_DUMMY_BREAKPOINT_OFFSET_P +#ifdef PUSH_RETURN_ADDRESS fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_BREAKPOINT_OFFSET_P = %ld\n", - (long) CALL_DUMMY_BREAKPOINT_OFFSET_P); -#endif -#ifdef CALL_DUMMY_LENGTH - if (CALL_DUMMY_LOCATION == BEFORE_TEXT_END || CALL_DUMMY_LOCATION == AFTER_TEXT_END) + "gdbarch_dump: %s # %s\n", + "PUSH_RETURN_ADDRESS(pc, sp)", + XSTRING (PUSH_RETURN_ADDRESS (pc, sp))); + if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LENGTH = %ld\n", - (long) CALL_DUMMY_LENGTH); + "gdbarch_dump: PUSH_RETURN_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->push_return_address + /*PUSH_RETURN_ADDRESS ()*/); #endif -#ifdef PC_IN_CALL_DUMMY +#ifdef REGISTER_BYTE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_BYTE(reg_nr)", + XSTRING (REGISTER_BYTE (reg_nr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: PC_IN_CALL_DUMMY = 0x%08lx\n", - (long) current_gdbarch->pc_in_call_dummy - /*PC_IN_CALL_DUMMY ()*/); + "gdbarch_dump: REGISTER_BYTE = 0x%08lx\n", + (long) current_gdbarch->register_byte + /*REGISTER_BYTE ()*/); #endif -#ifdef CALL_DUMMY_P +#ifdef REGISTER_BYTES fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_P = %ld\n", - (long) CALL_DUMMY_P); -#endif -#ifdef CALL_DUMMY_WORDS + "gdbarch_dump: REGISTER_BYTES # %s\n", + XSTRING (REGISTER_BYTES)); fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_WORDS = 0x%08lx\n", - (long) CALL_DUMMY_WORDS); + "gdbarch_dump: REGISTER_BYTES = %d\n", + REGISTER_BYTES); #endif -#ifdef SIZEOF_CALL_DUMMY_WORDS +#ifdef REGISTER_BYTES_OK fprintf_unfiltered (file, - "gdbarch_dump: SIZEOF_CALL_DUMMY_WORDS = 0x%08lx\n", - (long) SIZEOF_CALL_DUMMY_WORDS); + "gdbarch_dump: %s # %s\n", + "REGISTER_BYTES_OK(nr_bytes)", + XSTRING (REGISTER_BYTES_OK (nr_bytes))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_BYTES_OK = 0x%08lx\n", + (long) current_gdbarch->register_bytes_ok + /*REGISTER_BYTES_OK ()*/); #endif -#ifdef CALL_DUMMY_STACK_ADJUST_P +#ifdef REGISTER_CONVERTIBLE fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_STACK_ADJUST_P = 0x%08lx\n", - (long) CALL_DUMMY_STACK_ADJUST_P); -#endif -#ifdef CALL_DUMMY_STACK_ADJUST - if (CALL_DUMMY_STACK_ADJUST_P) + "gdbarch_dump: %s # %s\n", + "REGISTER_CONVERTIBLE(nr)", + XSTRING (REGISTER_CONVERTIBLE (nr))); + if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_STACK_ADJUST = 0x%08lx\n", - (long) CALL_DUMMY_STACK_ADJUST); + "gdbarch_dump: REGISTER_CONVERTIBLE = 0x%08lx\n", + (long) current_gdbarch->register_convertible + /*REGISTER_CONVERTIBLE ()*/); +#endif +#ifdef REGISTER_CONVERT_TO_RAW +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_CONVERT_TO_RAW(type, regnum, from, to)", + XSTRING (REGISTER_CONVERT_TO_RAW (type, regnum, from, to))); #endif -#ifdef FIX_CALL_DUMMY if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FIX_CALL_DUMMY = 0x%08lx\n", - (long) current_gdbarch->fix_call_dummy - /*FIX_CALL_DUMMY ()*/); + "gdbarch_dump: REGISTER_CONVERT_TO_RAW = 0x%08lx\n", + (long) current_gdbarch->register_convert_to_raw + /*REGISTER_CONVERT_TO_RAW ()*/); #endif -#ifdef BELIEVE_PCC_PROMOTION +#ifdef REGISTER_CONVERT_TO_VIRTUAL +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: BELIEVE_PCC_PROMOTION = %ld\n", - (long) BELIEVE_PCC_PROMOTION); + "gdbarch_dump: %s # %s\n", + "REGISTER_CONVERT_TO_VIRTUAL(regnum, type, from, to)", + XSTRING (REGISTER_CONVERT_TO_VIRTUAL (regnum, type, from, to))); #endif -#ifdef BELIEVE_PCC_PROMOTION_TYPE - fprintf_unfiltered (file, - "gdbarch_dump: BELIEVE_PCC_PROMOTION_TYPE = %ld\n", - (long) BELIEVE_PCC_PROMOTION_TYPE); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_CONVERT_TO_VIRTUAL = 0x%08lx\n", + (long) current_gdbarch->register_convert_to_virtual + /*REGISTER_CONVERT_TO_VIRTUAL ()*/); #endif -#ifdef COERCE_FLOAT_TO_DOUBLE +#ifdef REGISTER_NAME + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_NAME(regnr)", + XSTRING (REGISTER_NAME (regnr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: COERCE_FLOAT_TO_DOUBLE = 0x%08lx\n", - (long) current_gdbarch->coerce_float_to_double - /*COERCE_FLOAT_TO_DOUBLE ()*/); + "gdbarch_dump: REGISTER_NAME = 0x%08lx\n", + (long) current_gdbarch->register_name + /*REGISTER_NAME ()*/); #endif -#ifdef GET_SAVED_REGISTER +#ifdef REGISTER_RAW_SIZE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_RAW_SIZE(reg_nr)", + XSTRING (REGISTER_RAW_SIZE (reg_nr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: GET_SAVED_REGISTER = 0x%08lx\n", - (long) current_gdbarch->get_saved_register - /*GET_SAVED_REGISTER ()*/); + "gdbarch_dump: REGISTER_RAW_SIZE = 0x%08lx\n", + (long) current_gdbarch->register_raw_size + /*REGISTER_RAW_SIZE ()*/); #endif -#ifdef REGISTER_CONVERTIBLE +#ifdef REGISTER_SIM_REGNO + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_SIM_REGNO(reg_nr)", + XSTRING (REGISTER_SIM_REGNO (reg_nr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_CONVERTIBLE = 0x%08lx\n", - (long) current_gdbarch->register_convertible - /*REGISTER_CONVERTIBLE ()*/); + "gdbarch_dump: REGISTER_SIM_REGNO = 0x%08lx\n", + (long) current_gdbarch->register_sim_regno + /*REGISTER_SIM_REGNO ()*/); +#endif +#ifdef REGISTER_SIZE + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_SIZE # %s\n", + XSTRING (REGISTER_SIZE)); + fprintf_unfiltered (file, + "gdbarch_dump: REGISTER_SIZE = %d\n", + REGISTER_SIZE); #endif -#ifdef REGISTER_CONVERT_TO_VIRTUAL - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_CONVERT_TO_VIRTUAL = 0x%08lx\n", - (long) current_gdbarch->register_convert_to_virtual - /*REGISTER_CONVERT_TO_VIRTUAL ()*/); +#ifdef REGISTER_TO_VALUE +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_TO_VALUE(regnum, type, from, to)", + XSTRING (REGISTER_TO_VALUE (regnum, type, from, to))); #endif -#ifdef REGISTER_CONVERT_TO_RAW if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_CONVERT_TO_RAW = 0x%08lx\n", - (long) current_gdbarch->register_convert_to_raw - /*REGISTER_CONVERT_TO_RAW ()*/); + "gdbarch_dump: REGISTER_TO_VALUE = 0x%08lx\n", + (long) current_gdbarch->register_to_value + /*REGISTER_TO_VALUE ()*/); #endif -#ifdef FETCH_PSEUDO_REGISTER +#ifdef REGISTER_VIRTUAL_SIZE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_VIRTUAL_SIZE(reg_nr)", + XSTRING (REGISTER_VIRTUAL_SIZE (reg_nr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FETCH_PSEUDO_REGISTER = 0x%08lx\n", - (long) current_gdbarch->fetch_pseudo_register - /*FETCH_PSEUDO_REGISTER ()*/); + "gdbarch_dump: REGISTER_VIRTUAL_SIZE = 0x%08lx\n", + (long) current_gdbarch->register_virtual_size + /*REGISTER_VIRTUAL_SIZE ()*/); #endif -#ifdef STORE_PSEUDO_REGISTER +#ifdef REGISTER_VIRTUAL_TYPE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REGISTER_VIRTUAL_TYPE(reg_nr)", + XSTRING (REGISTER_VIRTUAL_TYPE (reg_nr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: STORE_PSEUDO_REGISTER = 0x%08lx\n", - (long) current_gdbarch->store_pseudo_register - /*STORE_PSEUDO_REGISTER ()*/); + "gdbarch_dump: REGISTER_VIRTUAL_TYPE = 0x%08lx\n", + (long) current_gdbarch->register_virtual_type + /*REGISTER_VIRTUAL_TYPE ()*/); #endif -#ifdef POINTER_TO_ADDRESS +#ifdef REG_STRUCT_HAS_ADDR + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REG_STRUCT_HAS_ADDR(gcc_p, type)", + XSTRING (REG_STRUCT_HAS_ADDR (gcc_p, type))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: POINTER_TO_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->pointer_to_address - /*POINTER_TO_ADDRESS ()*/); + "gdbarch_dump: REG_STRUCT_HAS_ADDR = 0x%08lx\n", + (long) current_gdbarch->reg_struct_has_addr + /*REG_STRUCT_HAS_ADDR ()*/); +#endif +#ifdef REMOTE_TRANSLATE_XFER_ADDRESS +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "REMOTE_TRANSLATE_XFER_ADDRESS(gdb_addr, gdb_len, rem_addr, rem_len)", + XSTRING (REMOTE_TRANSLATE_XFER_ADDRESS (gdb_addr, gdb_len, rem_addr, rem_len))); #endif -#ifdef ADDRESS_TO_POINTER if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: ADDRESS_TO_POINTER = 0x%08lx\n", - (long) current_gdbarch->address_to_pointer - /*ADDRESS_TO_POINTER ()*/); + "gdbarch_dump: REMOTE_TRANSLATE_XFER_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->remote_translate_xfer_address + /*REMOTE_TRANSLATE_XFER_ADDRESS ()*/); #endif #ifdef RETURN_VALUE_ON_STACK + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "RETURN_VALUE_ON_STACK(type)", + XSTRING (RETURN_VALUE_ON_STACK (type))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, "gdbarch_dump: RETURN_VALUE_ON_STACK = 0x%08lx\n", (long) current_gdbarch->return_value_on_stack /*RETURN_VALUE_ON_STACK ()*/); #endif -#ifdef EXTRACT_RETURN_VALUE +#ifdef SAVED_PC_AFTER_CALL + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SAVED_PC_AFTER_CALL(frame)", + XSTRING (SAVED_PC_AFTER_CALL (frame))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: EXTRACT_RETURN_VALUE = 0x%08lx\n", - (long) current_gdbarch->extract_return_value - /*EXTRACT_RETURN_VALUE ()*/); + "gdbarch_dump: SAVED_PC_AFTER_CALL = 0x%08lx\n", + (long) current_gdbarch->saved_pc_after_call + /*SAVED_PC_AFTER_CALL ()*/); #endif -#ifdef PUSH_ARGUMENTS - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: PUSH_ARGUMENTS = 0x%08lx\n", - (long) current_gdbarch->push_arguments - /*PUSH_ARGUMENTS ()*/); +#ifdef SAVE_DUMMY_FRAME_TOS +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SAVE_DUMMY_FRAME_TOS(sp)", + XSTRING (SAVE_DUMMY_FRAME_TOS (sp))); #endif -#ifdef PUSH_DUMMY_FRAME if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: PUSH_DUMMY_FRAME = 0x%08lx\n", - (long) current_gdbarch->push_dummy_frame - /*PUSH_DUMMY_FRAME ()*/); + "gdbarch_dump: SAVE_DUMMY_FRAME_TOS = 0x%08lx\n", + (long) current_gdbarch->save_dummy_frame_tos + /*SAVE_DUMMY_FRAME_TOS ()*/); #endif -#ifdef PUSH_RETURN_ADDRESS +#ifdef SDB_REG_TO_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SDB_REG_TO_REGNUM(sdb_regnr)", + XSTRING (SDB_REG_TO_REGNUM (sdb_regnr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: PUSH_RETURN_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->push_return_address - /*PUSH_RETURN_ADDRESS ()*/); + "gdbarch_dump: SDB_REG_TO_REGNUM = 0x%08lx\n", + (long) current_gdbarch->sdb_reg_to_regnum + /*SDB_REG_TO_REGNUM ()*/); #endif -#ifdef POP_FRAME - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: POP_FRAME = 0x%08lx\n", - (long) current_gdbarch->pop_frame - /*POP_FRAME ()*/); +#ifdef SIZEOF_CALL_DUMMY_WORDS + fprintf_unfiltered (file, + "gdbarch_dump: SIZEOF_CALL_DUMMY_WORDS # %s\n", + XSTRING (SIZEOF_CALL_DUMMY_WORDS)); + fprintf_unfiltered (file, + "gdbarch_dump: SIZEOF_CALL_DUMMY_WORDS = 0x%08lx\n", + (long) SIZEOF_CALL_DUMMY_WORDS); #endif -#ifdef D10V_MAKE_DADDR +#ifdef SKIP_PROLOGUE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SKIP_PROLOGUE(ip)", + XSTRING (SKIP_PROLOGUE (ip))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_MAKE_DADDR = 0x%08lx\n", - (long) current_gdbarch->d10v_make_daddr - /*D10V_MAKE_DADDR ()*/); + "gdbarch_dump: SKIP_PROLOGUE = 0x%08lx\n", + (long) current_gdbarch->skip_prologue + /*SKIP_PROLOGUE ()*/); #endif -#ifdef D10V_MAKE_IADDR +#ifdef SKIP_TRAMPOLINE_CODE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SKIP_TRAMPOLINE_CODE(pc)", + XSTRING (SKIP_TRAMPOLINE_CODE (pc))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_MAKE_IADDR = 0x%08lx\n", - (long) current_gdbarch->d10v_make_iaddr - /*D10V_MAKE_IADDR ()*/); + "gdbarch_dump: SKIP_TRAMPOLINE_CODE = 0x%08lx\n", + (long) current_gdbarch->skip_trampoline_code + /*SKIP_TRAMPOLINE_CODE ()*/); #endif -#ifdef D10V_DADDR_P +#ifdef SMASH_TEXT_ADDRESS + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SMASH_TEXT_ADDRESS(addr)", + XSTRING (SMASH_TEXT_ADDRESS (addr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_DADDR_P = 0x%08lx\n", - (long) current_gdbarch->d10v_daddr_p - /*D10V_DADDR_P ()*/); + "gdbarch_dump: SMASH_TEXT_ADDRESS = 0x%08lx\n", + (long) current_gdbarch->smash_text_address + /*SMASH_TEXT_ADDRESS ()*/); +#endif +#ifdef SOFTWARE_SINGLE_STEP +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "SOFTWARE_SINGLE_STEP(sig, insert_breakpoints_p)", + XSTRING (SOFTWARE_SINGLE_STEP (sig, insert_breakpoints_p))); #endif -#ifdef D10V_IADDR_P if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_IADDR_P = 0x%08lx\n", - (long) current_gdbarch->d10v_iaddr_p - /*D10V_IADDR_P ()*/); + "gdbarch_dump: SOFTWARE_SINGLE_STEP = 0x%08lx\n", + (long) current_gdbarch->software_single_step + /*SOFTWARE_SINGLE_STEP ()*/); +#endif +#ifdef SP_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: SP_REGNUM # %s\n", + XSTRING (SP_REGNUM)); + fprintf_unfiltered (file, + "gdbarch_dump: SP_REGNUM = %d\n", + SP_REGNUM); #endif -#ifdef D10V_CONVERT_DADDR_TO_RAW +#ifdef STAB_REG_TO_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "STAB_REG_TO_REGNUM(stab_regnr)", + XSTRING (STAB_REG_TO_REGNUM (stab_regnr))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_CONVERT_DADDR_TO_RAW = 0x%08lx\n", - (long) current_gdbarch->d10v_convert_daddr_to_raw - /*D10V_CONVERT_DADDR_TO_RAW ()*/); + "gdbarch_dump: STAB_REG_TO_REGNUM = 0x%08lx\n", + (long) current_gdbarch->stab_reg_to_regnum + /*STAB_REG_TO_REGNUM ()*/); #endif -#ifdef D10V_CONVERT_IADDR_TO_RAW +#ifdef STACK_ALIGN + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "STACK_ALIGN(sp)", + XSTRING (STACK_ALIGN (sp))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: D10V_CONVERT_IADDR_TO_RAW = 0x%08lx\n", - (long) current_gdbarch->d10v_convert_iaddr_to_raw - /*D10V_CONVERT_IADDR_TO_RAW ()*/); + "gdbarch_dump: STACK_ALIGN = 0x%08lx\n", + (long) current_gdbarch->stack_align + /*STACK_ALIGN ()*/); +#endif +#ifdef STORE_PSEUDO_REGISTER +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "STORE_PSEUDO_REGISTER(regnum)", + XSTRING (STORE_PSEUDO_REGISTER (regnum))); #endif -#ifdef STORE_STRUCT_RETURN if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: STORE_STRUCT_RETURN = 0x%08lx\n", - (long) current_gdbarch->store_struct_return - /*STORE_STRUCT_RETURN ()*/); + "gdbarch_dump: STORE_PSEUDO_REGISTER = 0x%08lx\n", + (long) current_gdbarch->store_pseudo_register + /*STORE_PSEUDO_REGISTER ()*/); #endif #ifdef STORE_RETURN_VALUE +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "STORE_RETURN_VALUE(type, valbuf)", + XSTRING (STORE_RETURN_VALUE (type, valbuf))); +#endif if (GDB_MULTI_ARCH) fprintf_unfiltered (file, "gdbarch_dump: STORE_RETURN_VALUE = 0x%08lx\n", (long) current_gdbarch->store_return_value /*STORE_RETURN_VALUE ()*/); #endif -#ifdef EXTRACT_STRUCT_VALUE_ADDRESS - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: EXTRACT_STRUCT_VALUE_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->extract_struct_value_address - /*EXTRACT_STRUCT_VALUE_ADDRESS ()*/); +#ifdef STORE_STRUCT_RETURN +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "STORE_STRUCT_RETURN(addr, sp)", + XSTRING (STORE_STRUCT_RETURN (addr, sp))); #endif -#ifdef USE_STRUCT_CONVENTION if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: USE_STRUCT_CONVENTION = 0x%08lx\n", - (long) current_gdbarch->use_struct_convention - /*USE_STRUCT_CONVENTION ()*/); + "gdbarch_dump: STORE_STRUCT_RETURN = 0x%08lx\n", + (long) current_gdbarch->store_struct_return + /*STORE_STRUCT_RETURN ()*/); #endif -#ifdef FRAME_INIT_SAVED_REGS - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_INIT_SAVED_REGS = 0x%08lx\n", - (long) current_gdbarch->frame_init_saved_regs - /*FRAME_INIT_SAVED_REGS ()*/); +#ifdef TARGET_ADDR_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_ADDR_BIT # %s\n", + XSTRING (TARGET_ADDR_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_ADDR_BIT = %d\n", + TARGET_ADDR_BIT); #endif -#ifdef INIT_EXTRA_FRAME_INFO - if (GDB_MULTI_ARCH) +#ifdef TARGET_ARCHITECTURE + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_ARCHITECTURE # %s\n", + XSTRING (TARGET_ARCHITECTURE)); + if (TARGET_ARCHITECTURE != NULL) fprintf_unfiltered (file, - "gdbarch_dump: INIT_EXTRA_FRAME_INFO = 0x%08lx\n", - (long) current_gdbarch->init_extra_frame_info - /*INIT_EXTRA_FRAME_INFO ()*/); + "gdbarch_dump: TARGET_ARCHITECTURE = %s\n", + TARGET_ARCHITECTURE->printable_name); #endif -#ifdef SKIP_PROLOGUE - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SKIP_PROLOGUE = 0x%08lx\n", - (long) current_gdbarch->skip_prologue - /*SKIP_PROLOGUE ()*/); +#ifdef TARGET_BFD_VMA_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_BFD_VMA_BIT # %s\n", + XSTRING (TARGET_BFD_VMA_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_BFD_VMA_BIT = %d\n", + TARGET_BFD_VMA_BIT); #endif -#ifdef PROLOGUE_FRAMELESS_P - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: PROLOGUE_FRAMELESS_P = 0x%08lx\n", - (long) current_gdbarch->prologue_frameless_p - /*PROLOGUE_FRAMELESS_P ()*/); +#ifdef TARGET_BYTE_ORDER + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_BYTE_ORDER # %s\n", + XSTRING (TARGET_BYTE_ORDER)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_BYTE_ORDER = %ld\n", + (long) TARGET_BYTE_ORDER); #endif -#ifdef INNER_THAN - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: INNER_THAN = 0x%08lx\n", - (long) current_gdbarch->inner_than - /*INNER_THAN ()*/); +#ifdef TARGET_CHAR_SIGNED + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_CHAR_SIGNED # %s\n", + XSTRING (TARGET_CHAR_SIGNED)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_CHAR_SIGNED = %d\n", + TARGET_CHAR_SIGNED); +#endif +#ifdef TARGET_DOUBLE_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_DOUBLE_BIT # %s\n", + XSTRING (TARGET_DOUBLE_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_DOUBLE_BIT = %d\n", + TARGET_DOUBLE_BIT); #endif -#ifdef BREAKPOINT_FROM_PC - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: BREAKPOINT_FROM_PC = 0x%08lx\n", - (long) current_gdbarch->breakpoint_from_pc - /*BREAKPOINT_FROM_PC ()*/); +#ifdef TARGET_DOUBLE_FORMAT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_DOUBLE_FORMAT # %s\n", + XSTRING (TARGET_DOUBLE_FORMAT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_DOUBLE_FORMAT = %ld\n", + (long) TARGET_DOUBLE_FORMAT); #endif -#ifdef MEMORY_INSERT_BREAKPOINT - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: MEMORY_INSERT_BREAKPOINT = 0x%08lx\n", - (long) current_gdbarch->memory_insert_breakpoint - /*MEMORY_INSERT_BREAKPOINT ()*/); +#ifdef TARGET_FLOAT_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_FLOAT_BIT # %s\n", + XSTRING (TARGET_FLOAT_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_FLOAT_BIT = %d\n", + TARGET_FLOAT_BIT); #endif -#ifdef MEMORY_REMOVE_BREAKPOINT - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: MEMORY_REMOVE_BREAKPOINT = 0x%08lx\n", - (long) current_gdbarch->memory_remove_breakpoint - /*MEMORY_REMOVE_BREAKPOINT ()*/); +#ifdef TARGET_FLOAT_FORMAT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_FLOAT_FORMAT # %s\n", + XSTRING (TARGET_FLOAT_FORMAT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_FLOAT_FORMAT = %ld\n", + (long) TARGET_FLOAT_FORMAT); #endif -#ifdef DECR_PC_AFTER_BREAK +#ifdef TARGET_INT_BIT fprintf_unfiltered (file, - "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n", - (long) DECR_PC_AFTER_BREAK); + "gdbarch_dump: TARGET_INT_BIT # %s\n", + XSTRING (TARGET_INT_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_INT_BIT = %d\n", + TARGET_INT_BIT); #endif -#ifdef FUNCTION_START_OFFSET +#ifdef TARGET_LONG_BIT fprintf_unfiltered (file, - "gdbarch_dump: FUNCTION_START_OFFSET = %ld\n", - (long) FUNCTION_START_OFFSET); + "gdbarch_dump: TARGET_LONG_BIT # %s\n", + XSTRING (TARGET_LONG_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_BIT = %d\n", + TARGET_LONG_BIT); #endif -#ifdef REMOTE_TRANSLATE_XFER_ADDRESS - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: REMOTE_TRANSLATE_XFER_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->remote_translate_xfer_address - /*REMOTE_TRANSLATE_XFER_ADDRESS ()*/); +#ifdef TARGET_LONG_DOUBLE_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_DOUBLE_BIT # %s\n", + XSTRING (TARGET_LONG_DOUBLE_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_DOUBLE_BIT = %d\n", + TARGET_LONG_DOUBLE_BIT); #endif -#ifdef FRAME_ARGS_SKIP +#ifdef TARGET_LONG_DOUBLE_FORMAT fprintf_unfiltered (file, - "gdbarch_dump: FRAME_ARGS_SKIP = %ld\n", - (long) FRAME_ARGS_SKIP); + "gdbarch_dump: TARGET_LONG_DOUBLE_FORMAT # %s\n", + XSTRING (TARGET_LONG_DOUBLE_FORMAT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_DOUBLE_FORMAT = %ld\n", + (long) TARGET_LONG_DOUBLE_FORMAT); #endif -#ifdef FRAMELESS_FUNCTION_INVOCATION - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAMELESS_FUNCTION_INVOCATION = 0x%08lx\n", - (long) current_gdbarch->frameless_function_invocation - /*FRAMELESS_FUNCTION_INVOCATION ()*/); +#ifdef TARGET_LONG_LONG_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_LONG_BIT # %s\n", + XSTRING (TARGET_LONG_LONG_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_LONG_LONG_BIT = %d\n", + TARGET_LONG_LONG_BIT); #endif -#ifdef FRAME_CHAIN +#ifdef TARGET_PRINT_INSN + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_PRINT_INSN(vma, info)", + XSTRING (TARGET_PRINT_INSN (vma, info))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FRAME_CHAIN = 0x%08lx\n", - (long) current_gdbarch->frame_chain - /*FRAME_CHAIN ()*/); + "gdbarch_dump: TARGET_PRINT_INSN = 0x%08lx\n", + (long) current_gdbarch->print_insn + /*TARGET_PRINT_INSN ()*/); #endif -#ifdef FRAME_CHAIN_VALID - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_CHAIN_VALID = 0x%08lx\n", - (long) current_gdbarch->frame_chain_valid - /*FRAME_CHAIN_VALID ()*/); +#ifdef TARGET_PTR_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_PTR_BIT # %s\n", + XSTRING (TARGET_PTR_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_PTR_BIT = %d\n", + TARGET_PTR_BIT); #endif -#ifdef FRAME_SAVED_PC +#ifdef TARGET_READ_FP + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_READ_FP()", + XSTRING (TARGET_READ_FP ())); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FRAME_SAVED_PC = 0x%08lx\n", - (long) current_gdbarch->frame_saved_pc - /*FRAME_SAVED_PC ()*/); + "gdbarch_dump: TARGET_READ_FP = 0x%08lx\n", + (long) current_gdbarch->read_fp + /*TARGET_READ_FP ()*/); #endif -#ifdef FRAME_ARGS_ADDRESS +#ifdef TARGET_READ_PC + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_READ_PC(ptid)", + XSTRING (TARGET_READ_PC (ptid))); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FRAME_ARGS_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->frame_args_address - /*FRAME_ARGS_ADDRESS ()*/); + "gdbarch_dump: TARGET_READ_PC = 0x%08lx\n", + (long) current_gdbarch->read_pc + /*TARGET_READ_PC ()*/); #endif -#ifdef FRAME_LOCALS_ADDRESS +#ifdef TARGET_READ_SP + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_READ_SP()", + XSTRING (TARGET_READ_SP ())); if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: FRAME_LOCALS_ADDRESS = 0x%08lx\n", - (long) current_gdbarch->frame_locals_address - /*FRAME_LOCALS_ADDRESS ()*/); + "gdbarch_dump: TARGET_READ_SP = 0x%08lx\n", + (long) current_gdbarch->read_sp + /*TARGET_READ_SP ()*/); #endif -#ifdef SAVED_PC_AFTER_CALL - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SAVED_PC_AFTER_CALL = 0x%08lx\n", - (long) current_gdbarch->saved_pc_after_call - /*SAVED_PC_AFTER_CALL ()*/); +#ifdef TARGET_SHORT_BIT + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_SHORT_BIT # %s\n", + XSTRING (TARGET_SHORT_BIT)); + fprintf_unfiltered (file, + "gdbarch_dump: TARGET_SHORT_BIT = %d\n", + TARGET_SHORT_BIT); #endif -#ifdef FRAME_NUM_ARGS - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: FRAME_NUM_ARGS = 0x%08lx\n", - (long) current_gdbarch->frame_num_args - /*FRAME_NUM_ARGS ()*/); +#ifdef TARGET_VIRTUAL_FRAME_POINTER +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_VIRTUAL_FRAME_POINTER(pc, frame_regnum, frame_offset)", + XSTRING (TARGET_VIRTUAL_FRAME_POINTER (pc, frame_regnum, frame_offset))); #endif -#ifdef STACK_ALIGN if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: STACK_ALIGN = 0x%08lx\n", - (long) current_gdbarch->stack_align - /*STACK_ALIGN ()*/); + "gdbarch_dump: TARGET_VIRTUAL_FRAME_POINTER = 0x%08lx\n", + (long) current_gdbarch->virtual_frame_pointer + /*TARGET_VIRTUAL_FRAME_POINTER ()*/); #endif -#ifdef EXTRA_STACK_ALIGNMENT_NEEDED +#ifdef TARGET_WRITE_PC +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: EXTRA_STACK_ALIGNMENT_NEEDED = %ld\n", - (long) EXTRA_STACK_ALIGNMENT_NEEDED); + "gdbarch_dump: %s # %s\n", + "TARGET_WRITE_PC(val, ptid)", + XSTRING (TARGET_WRITE_PC (val, ptid))); #endif -#ifdef REG_STRUCT_HAS_ADDR if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: REG_STRUCT_HAS_ADDR = 0x%08lx\n", - (long) current_gdbarch->reg_struct_has_addr - /*REG_STRUCT_HAS_ADDR ()*/); + "gdbarch_dump: TARGET_WRITE_PC = 0x%08lx\n", + (long) current_gdbarch->write_pc + /*TARGET_WRITE_PC ()*/); +#endif +#ifdef TARGET_WRITE_SP +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "TARGET_WRITE_SP(val)", + XSTRING (TARGET_WRITE_SP (val))); #endif -#ifdef SAVE_DUMMY_FRAME_TOS if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: SAVE_DUMMY_FRAME_TOS = 0x%08lx\n", - (long) current_gdbarch->save_dummy_frame_tos - /*SAVE_DUMMY_FRAME_TOS ()*/); + "gdbarch_dump: TARGET_WRITE_SP = 0x%08lx\n", + (long) current_gdbarch->write_sp + /*TARGET_WRITE_SP ()*/); #endif -#ifdef TARGET_FLOAT_FORMAT +#ifdef USE_GENERIC_DUMMY_FRAMES fprintf_unfiltered (file, - "gdbarch_dump: TARGET_FLOAT_FORMAT = %ld\n", - (long) TARGET_FLOAT_FORMAT); + "gdbarch_dump: USE_GENERIC_DUMMY_FRAMES # %s\n", + XSTRING (USE_GENERIC_DUMMY_FRAMES)); + fprintf_unfiltered (file, + "gdbarch_dump: USE_GENERIC_DUMMY_FRAMES = %d\n", + USE_GENERIC_DUMMY_FRAMES); #endif -#ifdef TARGET_DOUBLE_FORMAT +#ifdef USE_STRUCT_CONVENTION fprintf_unfiltered (file, - "gdbarch_dump: TARGET_DOUBLE_FORMAT = %ld\n", - (long) TARGET_DOUBLE_FORMAT); + "gdbarch_dump: %s # %s\n", + "USE_STRUCT_CONVENTION(gcc_p, value_type)", + XSTRING (USE_STRUCT_CONVENTION (gcc_p, value_type))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: USE_STRUCT_CONVENTION = 0x%08lx\n", + (long) current_gdbarch->use_struct_convention + /*USE_STRUCT_CONVENTION ()*/); #endif -#ifdef TARGET_LONG_DOUBLE_FORMAT +#ifdef VALUE_TO_REGISTER +#if GDB_MULTI_ARCH + /* Macro might contain `[{}]' when not multi-arch */ fprintf_unfiltered (file, - "gdbarch_dump: TARGET_LONG_DOUBLE_FORMAT = %ld\n", - (long) TARGET_LONG_DOUBLE_FORMAT); + "gdbarch_dump: %s # %s\n", + "VALUE_TO_REGISTER(type, regnum, from, to)", + XSTRING (VALUE_TO_REGISTER (type, regnum, from, to))); #endif -#ifdef CONVERT_FROM_FUNC_PTR_ADDR if (GDB_MULTI_ARCH) fprintf_unfiltered (file, - "gdbarch_dump: CONVERT_FROM_FUNC_PTR_ADDR = 0x%08lx\n", - (long) current_gdbarch->convert_from_func_ptr_addr - /*CONVERT_FROM_FUNC_PTR_ADDR ()*/); + "gdbarch_dump: VALUE_TO_REGISTER = 0x%08lx\n", + (long) current_gdbarch->value_to_register + /*VALUE_TO_REGISTER ()*/); #endif if (current_gdbarch->dump_tdep != NULL) current_gdbarch->dump_tdep (current_gdbarch, file); @@ -1982,6 +2211,7 @@ gdbarch_tdep (struct gdbarch *gdbarch) const struct bfd_arch_info * gdbarch_bfd_arch_info (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_bfd_arch_info called\n"); return gdbarch->bfd_arch_info; @@ -1990,6 +2220,7 @@ gdbarch_bfd_arch_info (struct gdbarch *gdbarch) int gdbarch_byte_order (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_byte_order called\n"); return gdbarch->byte_order; @@ -1998,6 +2229,7 @@ gdbarch_byte_order (struct gdbarch *gdbarch) int gdbarch_short_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of short_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_short_bit called\n"); @@ -2014,6 +2246,7 @@ set_gdbarch_short_bit (struct gdbarch *gdbarch, int gdbarch_int_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of int_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_int_bit called\n"); @@ -2030,6 +2263,7 @@ set_gdbarch_int_bit (struct gdbarch *gdbarch, int gdbarch_long_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of long_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_long_bit called\n"); @@ -2046,6 +2280,7 @@ set_gdbarch_long_bit (struct gdbarch *gdbarch, int gdbarch_long_long_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of long_long_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_long_long_bit called\n"); @@ -2062,6 +2297,7 @@ set_gdbarch_long_long_bit (struct gdbarch *gdbarch, int gdbarch_float_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of float_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_float_bit called\n"); @@ -2078,6 +2314,7 @@ set_gdbarch_float_bit (struct gdbarch *gdbarch, int gdbarch_double_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of double_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_double_bit called\n"); @@ -2094,6 +2331,7 @@ set_gdbarch_double_bit (struct gdbarch *gdbarch, int gdbarch_long_double_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of long_double_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_long_double_bit called\n"); @@ -2110,6 +2348,7 @@ set_gdbarch_long_double_bit (struct gdbarch *gdbarch, int gdbarch_ptr_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of ptr_bit, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_ptr_bit called\n"); @@ -2126,8 +2365,10 @@ set_gdbarch_ptr_bit (struct gdbarch *gdbarch, int gdbarch_addr_bit (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->addr_bit == 0) - internal_error ("gdbarch: gdbarch_addr_bit invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_addr_bit invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_addr_bit called\n"); return gdbarch->addr_bit; @@ -2143,6 +2384,7 @@ set_gdbarch_addr_bit (struct gdbarch *gdbarch, 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"); @@ -2157,29 +2399,34 @@ set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, } int -gdbarch_ieee_float (struct gdbarch *gdbarch) +gdbarch_char_signed (struct gdbarch *gdbarch) { - /* Skip verify of ieee_float, invalid_p == 0 */ + gdb_assert (gdbarch != NULL); + if (gdbarch->char_signed == -1) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_char_signed invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_ieee_float called\n"); - return gdbarch->ieee_float; + fprintf_unfiltered (gdb_stdlog, "gdbarch_char_signed called\n"); + return gdbarch->char_signed; } void -set_gdbarch_ieee_float (struct gdbarch *gdbarch, - int ieee_float) +set_gdbarch_char_signed (struct gdbarch *gdbarch, + int char_signed) { - gdbarch->ieee_float = ieee_float; + gdbarch->char_signed = char_signed; } CORE_ADDR -gdbarch_read_pc (struct gdbarch *gdbarch, int pid) +gdbarch_read_pc (struct gdbarch *gdbarch, ptid_t ptid) { + gdb_assert (gdbarch != NULL); if (gdbarch->read_pc == 0) - internal_error ("gdbarch: gdbarch_read_pc invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_read_pc invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_read_pc called\n"); - return gdbarch->read_pc (pid); + return gdbarch->read_pc (ptid); } void @@ -2190,13 +2437,15 @@ set_gdbarch_read_pc (struct gdbarch *gdbarch, } void -gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR val, int pid) +gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR val, ptid_t ptid) { + gdb_assert (gdbarch != NULL); if (gdbarch->write_pc == 0) - internal_error ("gdbarch: gdbarch_write_pc invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_write_pc invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_write_pc called\n"); - gdbarch->write_pc (val, pid); + gdbarch->write_pc (val, ptid); } void @@ -2209,8 +2458,10 @@ set_gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR gdbarch_read_fp (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->read_fp == 0) - internal_error ("gdbarch: gdbarch_read_fp invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_read_fp invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_read_fp called\n"); return gdbarch->read_fp (); @@ -2223,62 +2474,122 @@ set_gdbarch_read_fp (struct gdbarch *gdbarch, gdbarch->read_fp = read_fp; } +CORE_ADDR +gdbarch_read_sp (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->read_sp == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_read_sp invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_read_sp called\n"); + return gdbarch->read_sp (); +} + +void +set_gdbarch_read_sp (struct gdbarch *gdbarch, + gdbarch_read_sp_ftype read_sp) +{ + gdbarch->read_sp = read_sp; +} + +void +gdbarch_write_sp (struct gdbarch *gdbarch, CORE_ADDR val) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->write_sp == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_write_sp invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_write_sp called\n"); + gdbarch->write_sp (val); +} + +void +set_gdbarch_write_sp (struct gdbarch *gdbarch, + gdbarch_write_sp_ftype write_sp) +{ + gdbarch->write_sp = write_sp; +} + void -gdbarch_write_fp (struct gdbarch *gdbarch, CORE_ADDR val) +gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset) { - if (gdbarch->write_fp == 0) - internal_error ("gdbarch: gdbarch_write_fp invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->virtual_frame_pointer == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_virtual_frame_pointer invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_write_fp called\n"); - gdbarch->write_fp (val); + fprintf_unfiltered (gdb_stdlog, "gdbarch_virtual_frame_pointer called\n"); + gdbarch->virtual_frame_pointer (pc, frame_regnum, frame_offset); +} + +void +set_gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, + gdbarch_virtual_frame_pointer_ftype virtual_frame_pointer) +{ + gdbarch->virtual_frame_pointer = virtual_frame_pointer; +} + +int +gdbarch_register_read_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->register_read != 0; } void -set_gdbarch_write_fp (struct gdbarch *gdbarch, - gdbarch_write_fp_ftype write_fp) +gdbarch_register_read (struct gdbarch *gdbarch, int regnum, char *buf) { - gdbarch->write_fp = write_fp; + gdb_assert (gdbarch != NULL); + if (gdbarch->register_read == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_read invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_register_read called\n"); + gdbarch->register_read (gdbarch, regnum, buf); } -CORE_ADDR -gdbarch_read_sp (struct gdbarch *gdbarch) +void +set_gdbarch_register_read (struct gdbarch *gdbarch, + gdbarch_register_read_ftype register_read) { - if (gdbarch->read_sp == 0) - internal_error ("gdbarch: gdbarch_read_sp invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_read_sp called\n"); - return gdbarch->read_sp (); + gdbarch->register_read = register_read; } -void -set_gdbarch_read_sp (struct gdbarch *gdbarch, - gdbarch_read_sp_ftype read_sp) +int +gdbarch_register_write_p (struct gdbarch *gdbarch) { - gdbarch->read_sp = read_sp; + gdb_assert (gdbarch != NULL); + return gdbarch->register_write != 0; } void -gdbarch_write_sp (struct gdbarch *gdbarch, CORE_ADDR val) +gdbarch_register_write (struct gdbarch *gdbarch, int regnum, char *buf) { - if (gdbarch->write_sp == 0) - internal_error ("gdbarch: gdbarch_write_sp invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->register_write == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_write invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_write_sp called\n"); - gdbarch->write_sp (val); + fprintf_unfiltered (gdb_stdlog, "gdbarch_register_write called\n"); + gdbarch->register_write (gdbarch, regnum, buf); } void -set_gdbarch_write_sp (struct gdbarch *gdbarch, - gdbarch_write_sp_ftype write_sp) +set_gdbarch_register_write (struct gdbarch *gdbarch, + gdbarch_register_write_ftype register_write) { - gdbarch->write_sp = write_sp; + gdbarch->register_write = register_write; } int gdbarch_num_regs (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->num_regs == -1) - internal_error ("gdbarch: gdbarch_num_regs invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_num_regs invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_num_regs called\n"); return gdbarch->num_regs; @@ -2294,6 +2605,7 @@ set_gdbarch_num_regs (struct gdbarch *gdbarch, int gdbarch_num_pseudo_regs (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of num_pseudo_regs, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_num_pseudo_regs called\n"); @@ -2310,8 +2622,8 @@ set_gdbarch_num_pseudo_regs (struct gdbarch *gdbarch, int gdbarch_sp_regnum (struct gdbarch *gdbarch) { - if (gdbarch->sp_regnum == -1) - internal_error ("gdbarch: gdbarch_sp_regnum invalid"); + gdb_assert (gdbarch != NULL); + /* Skip verify of sp_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_sp_regnum called\n"); return gdbarch->sp_regnum; @@ -2327,8 +2639,8 @@ set_gdbarch_sp_regnum (struct gdbarch *gdbarch, int gdbarch_fp_regnum (struct gdbarch *gdbarch) { - if (gdbarch->fp_regnum == -1) - internal_error ("gdbarch: gdbarch_fp_regnum invalid"); + gdb_assert (gdbarch != NULL); + /* Skip verify of fp_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_fp_regnum called\n"); return gdbarch->fp_regnum; @@ -2344,8 +2656,8 @@ set_gdbarch_fp_regnum (struct gdbarch *gdbarch, int gdbarch_pc_regnum (struct gdbarch *gdbarch) { - if (gdbarch->pc_regnum == -1) - internal_error ("gdbarch: gdbarch_pc_regnum invalid"); + gdb_assert (gdbarch != NULL); + /* Skip verify of pc_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_pc_regnum called\n"); return gdbarch->pc_regnum; @@ -2358,9 +2670,27 @@ set_gdbarch_pc_regnum (struct gdbarch *gdbarch, gdbarch->pc_regnum = pc_regnum; } +int +gdbarch_ps_regnum (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of ps_regnum, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_ps_regnum called\n"); + return gdbarch->ps_regnum; +} + +void +set_gdbarch_ps_regnum (struct gdbarch *gdbarch, + int ps_regnum) +{ + gdbarch->ps_regnum = ps_regnum; +} + int gdbarch_fp0_regnum (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of fp0_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_fp0_regnum called\n"); @@ -2377,6 +2707,7 @@ set_gdbarch_fp0_regnum (struct gdbarch *gdbarch, int gdbarch_npc_regnum (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of npc_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_npc_regnum called\n"); @@ -2391,26 +2722,107 @@ set_gdbarch_npc_regnum (struct gdbarch *gdbarch, } int -gdbarch_nnpc_regnum (struct gdbarch *gdbarch) +gdbarch_stab_reg_to_regnum (struct gdbarch *gdbarch, int stab_regnr) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->stab_reg_to_regnum == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_stab_reg_to_regnum invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_stab_reg_to_regnum called\n"); + return gdbarch->stab_reg_to_regnum (stab_regnr); +} + +void +set_gdbarch_stab_reg_to_regnum (struct gdbarch *gdbarch, + gdbarch_stab_reg_to_regnum_ftype stab_reg_to_regnum) +{ + gdbarch->stab_reg_to_regnum = stab_reg_to_regnum; +} + +int +gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, int ecoff_regnr) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->ecoff_reg_to_regnum == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_ecoff_reg_to_regnum invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_ecoff_reg_to_regnum called\n"); + return gdbarch->ecoff_reg_to_regnum (ecoff_regnr); +} + +void +set_gdbarch_ecoff_reg_to_regnum (struct gdbarch *gdbarch, + gdbarch_ecoff_reg_to_regnum_ftype ecoff_reg_to_regnum) +{ + 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); + if (gdbarch->dwarf_reg_to_regnum == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_dwarf_reg_to_regnum invalid"); + 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) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->sdb_reg_to_regnum == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_sdb_reg_to_regnum invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_sdb_reg_to_regnum called\n"); + return gdbarch->sdb_reg_to_regnum (sdb_regnr); +} + +void +set_gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, + gdbarch_sdb_reg_to_regnum_ftype sdb_reg_to_regnum) +{ + gdbarch->sdb_reg_to_regnum = sdb_reg_to_regnum; +} + +int +gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2_regnr) { - /* Skip verify of nnpc_regnum, invalid_p == 0 */ + gdb_assert (gdbarch != NULL); + if (gdbarch->dwarf2_reg_to_regnum == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_dwarf2_reg_to_regnum invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_nnpc_regnum called\n"); - return gdbarch->nnpc_regnum; + fprintf_unfiltered (gdb_stdlog, "gdbarch_dwarf2_reg_to_regnum called\n"); + return gdbarch->dwarf2_reg_to_regnum (dwarf2_regnr); } void -set_gdbarch_nnpc_regnum (struct gdbarch *gdbarch, - int nnpc_regnum) +set_gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, + gdbarch_dwarf2_reg_to_regnum_ftype dwarf2_reg_to_regnum) { - gdbarch->nnpc_regnum = nnpc_regnum; + gdbarch->dwarf2_reg_to_regnum = dwarf2_reg_to_regnum; } char * gdbarch_register_name (struct gdbarch *gdbarch, int regnr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_name == 0) - internal_error ("gdbarch: gdbarch_register_name invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_name invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_name called\n"); return gdbarch->register_name (regnr); @@ -2426,8 +2838,10 @@ set_gdbarch_register_name (struct gdbarch *gdbarch, int gdbarch_register_size (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_size == -1) - internal_error ("gdbarch: gdbarch_register_size invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_size invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_size called\n"); return gdbarch->register_size; @@ -2443,8 +2857,10 @@ set_gdbarch_register_size (struct gdbarch *gdbarch, int gdbarch_register_bytes (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_bytes == -1) - internal_error ("gdbarch: gdbarch_register_bytes invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_bytes invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_bytes called\n"); return gdbarch->register_bytes; @@ -2460,8 +2876,10 @@ set_gdbarch_register_bytes (struct gdbarch *gdbarch, int gdbarch_register_byte (struct gdbarch *gdbarch, int reg_nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_byte == 0) - internal_error ("gdbarch: gdbarch_register_byte invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_byte invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_byte called\n"); return gdbarch->register_byte (reg_nr); @@ -2477,8 +2895,10 @@ set_gdbarch_register_byte (struct gdbarch *gdbarch, int gdbarch_register_raw_size (struct gdbarch *gdbarch, int reg_nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_raw_size == 0) - internal_error ("gdbarch: gdbarch_register_raw_size invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_raw_size invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_raw_size called\n"); return gdbarch->register_raw_size (reg_nr); @@ -2494,8 +2914,10 @@ set_gdbarch_register_raw_size (struct gdbarch *gdbarch, int gdbarch_max_register_raw_size (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->max_register_raw_size == -1) - internal_error ("gdbarch: gdbarch_max_register_raw_size invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_max_register_raw_size invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_max_register_raw_size called\n"); return gdbarch->max_register_raw_size; @@ -2511,8 +2933,10 @@ set_gdbarch_max_register_raw_size (struct gdbarch *gdbarch, int gdbarch_register_virtual_size (struct gdbarch *gdbarch, int reg_nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_virtual_size == 0) - internal_error ("gdbarch: gdbarch_register_virtual_size invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_virtual_size invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_virtual_size called\n"); return gdbarch->register_virtual_size (reg_nr); @@ -2528,8 +2952,10 @@ set_gdbarch_register_virtual_size (struct gdbarch *gdbarch, int gdbarch_max_register_virtual_size (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->max_register_virtual_size == -1) - internal_error ("gdbarch: gdbarch_max_register_virtual_size invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_max_register_virtual_size invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_max_register_virtual_size called\n"); return gdbarch->max_register_virtual_size; @@ -2545,8 +2971,10 @@ set_gdbarch_max_register_virtual_size (struct gdbarch *gdbarch, struct type * gdbarch_register_virtual_type (struct gdbarch *gdbarch, int reg_nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_virtual_type == 0) - internal_error ("gdbarch: gdbarch_register_virtual_type invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_virtual_type invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_virtual_type called\n"); return gdbarch->register_virtual_type (reg_nr); @@ -2562,8 +2990,10 @@ set_gdbarch_register_virtual_type (struct gdbarch *gdbarch, void gdbarch_do_registers_info (struct gdbarch *gdbarch, int reg_nr, int fpregs) { + gdb_assert (gdbarch != NULL); if (gdbarch->do_registers_info == 0) - internal_error ("gdbarch: gdbarch_do_registers_info invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_do_registers_info invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_do_registers_info called\n"); gdbarch->do_registers_info (reg_nr, fpregs); @@ -2576,11 +3006,32 @@ set_gdbarch_do_registers_info (struct gdbarch *gdbarch, gdbarch->do_registers_info = do_registers_info; } +void +gdbarch_print_float_info (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->print_float_info == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_print_float_info invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_print_float_info called\n"); + gdbarch->print_float_info (); +} + +void +set_gdbarch_print_float_info (struct gdbarch *gdbarch, + gdbarch_print_float_info_ftype print_float_info) +{ + gdbarch->print_float_info = print_float_info; +} + int gdbarch_register_sim_regno (struct gdbarch *gdbarch, int reg_nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_sim_regno == 0) - internal_error ("gdbarch: gdbarch_register_sim_regno invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_sim_regno invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_sim_regno called\n"); return gdbarch->register_sim_regno (reg_nr); @@ -2593,11 +3044,103 @@ set_gdbarch_register_sim_regno (struct gdbarch *gdbarch, gdbarch->register_sim_regno = register_sim_regno; } +int +gdbarch_register_bytes_ok_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->register_bytes_ok != 0; +} + +int +gdbarch_register_bytes_ok (struct gdbarch *gdbarch, long nr_bytes) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->register_bytes_ok == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_bytes_ok invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_register_bytes_ok called\n"); + return gdbarch->register_bytes_ok (nr_bytes); +} + +void +set_gdbarch_register_bytes_ok (struct gdbarch *gdbarch, + gdbarch_register_bytes_ok_ftype register_bytes_ok) +{ + gdbarch->register_bytes_ok = register_bytes_ok; +} + +int +gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, int regnum) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->cannot_fetch_register == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_cannot_fetch_register invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_cannot_fetch_register called\n"); + return gdbarch->cannot_fetch_register (regnum); +} + +void +set_gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, + gdbarch_cannot_fetch_register_ftype cannot_fetch_register) +{ + gdbarch->cannot_fetch_register = cannot_fetch_register; +} + +int +gdbarch_cannot_store_register (struct gdbarch *gdbarch, int regnum) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->cannot_store_register == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_cannot_store_register invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_cannot_store_register called\n"); + return gdbarch->cannot_store_register (regnum); +} + +void +set_gdbarch_cannot_store_register (struct gdbarch *gdbarch, + gdbarch_cannot_store_register_ftype cannot_store_register) +{ + gdbarch->cannot_store_register = cannot_store_register; +} + +int +gdbarch_get_longjmp_target_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->get_longjmp_target != 0; +} + +int +gdbarch_get_longjmp_target (struct gdbarch *gdbarch, CORE_ADDR *pc) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->get_longjmp_target == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_get_longjmp_target invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_get_longjmp_target called\n"); + return gdbarch->get_longjmp_target (pc); +} + +void +set_gdbarch_get_longjmp_target (struct gdbarch *gdbarch, + gdbarch_get_longjmp_target_ftype get_longjmp_target) +{ + gdbarch->get_longjmp_target = get_longjmp_target; +} + int gdbarch_use_generic_dummy_frames (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->use_generic_dummy_frames == -1) - internal_error ("gdbarch: gdbarch_use_generic_dummy_frames invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_use_generic_dummy_frames invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_use_generic_dummy_frames called\n"); return gdbarch->use_generic_dummy_frames; @@ -2613,8 +3156,10 @@ set_gdbarch_use_generic_dummy_frames (struct gdbarch *gdbarch, int gdbarch_call_dummy_location (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_location == 0) - internal_error ("gdbarch: gdbarch_call_dummy_location invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_location invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_location called\n"); return gdbarch->call_dummy_location; @@ -2630,8 +3175,10 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, CORE_ADDR gdbarch_call_dummy_address (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_address == 0) - internal_error ("gdbarch: gdbarch_call_dummy_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_address called\n"); return gdbarch->call_dummy_address (); @@ -2647,8 +3194,10 @@ set_gdbarch_call_dummy_address (struct gdbarch *gdbarch, CORE_ADDR gdbarch_call_dummy_start_offset (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_start_offset == -1) - internal_error ("gdbarch: gdbarch_call_dummy_start_offset invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_start_offset invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_start_offset called\n"); return gdbarch->call_dummy_start_offset; @@ -2664,8 +3213,10 @@ set_gdbarch_call_dummy_start_offset (struct gdbarch *gdbarch, CORE_ADDR gdbarch_call_dummy_breakpoint_offset (struct gdbarch *gdbarch) { - if (gdbarch->call_dummy_breakpoint_offset == -1) - internal_error ("gdbarch: gdbarch_call_dummy_breakpoint_offset invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_breakpoint_offset invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_breakpoint_offset called\n"); return gdbarch->call_dummy_breakpoint_offset; @@ -2681,8 +3232,10 @@ set_gdbarch_call_dummy_breakpoint_offset (struct gdbarch *gdbarch, int gdbarch_call_dummy_breakpoint_offset_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_breakpoint_offset_p == -1) - internal_error ("gdbarch: gdbarch_call_dummy_breakpoint_offset_p invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_breakpoint_offset_p invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_breakpoint_offset_p called\n"); return gdbarch->call_dummy_breakpoint_offset_p; @@ -2698,8 +3251,10 @@ set_gdbarch_call_dummy_breakpoint_offset_p (struct gdbarch *gdbarch, int gdbarch_call_dummy_length (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_length == -1) - internal_error ("gdbarch: gdbarch_call_dummy_length invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_length invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_length called\n"); return gdbarch->call_dummy_length; @@ -2715,8 +3270,10 @@ set_gdbarch_call_dummy_length (struct gdbarch *gdbarch, int gdbarch_pc_in_call_dummy (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address) { + gdb_assert (gdbarch != NULL); if (gdbarch->pc_in_call_dummy == 0) - internal_error ("gdbarch: gdbarch_pc_in_call_dummy invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_pc_in_call_dummy invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_pc_in_call_dummy called\n"); return gdbarch->pc_in_call_dummy (pc, sp, frame_address); @@ -2732,8 +3289,10 @@ set_gdbarch_pc_in_call_dummy (struct gdbarch *gdbarch, int gdbarch_call_dummy_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_p == -1) - internal_error ("gdbarch: gdbarch_call_dummy_p invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_p invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_p called\n"); return gdbarch->call_dummy_p; @@ -2749,6 +3308,7 @@ set_gdbarch_call_dummy_p (struct gdbarch *gdbarch, LONGEST * gdbarch_call_dummy_words (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of call_dummy_words, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_words called\n"); @@ -2765,6 +3325,7 @@ set_gdbarch_call_dummy_words (struct gdbarch *gdbarch, int gdbarch_sizeof_call_dummy_words (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of sizeof_call_dummy_words, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_sizeof_call_dummy_words called\n"); @@ -2781,8 +3342,10 @@ set_gdbarch_sizeof_call_dummy_words (struct gdbarch *gdbarch, int gdbarch_call_dummy_stack_adjust_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_stack_adjust_p == -1) - internal_error ("gdbarch: gdbarch_call_dummy_stack_adjust_p invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_stack_adjust_p invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_stack_adjust_p called\n"); return gdbarch->call_dummy_stack_adjust_p; @@ -2798,8 +3361,10 @@ set_gdbarch_call_dummy_stack_adjust_p (struct gdbarch *gdbarch, int gdbarch_call_dummy_stack_adjust (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->call_dummy_stack_adjust_p && gdbarch->call_dummy_stack_adjust == 0) - internal_error ("gdbarch: gdbarch_call_dummy_stack_adjust invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_call_dummy_stack_adjust invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_stack_adjust called\n"); return gdbarch->call_dummy_stack_adjust; @@ -2815,8 +3380,10 @@ set_gdbarch_call_dummy_stack_adjust (struct gdbarch *gdbarch, void gdbarch_fix_call_dummy (struct gdbarch *gdbarch, char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p) { + gdb_assert (gdbarch != NULL); if (gdbarch->fix_call_dummy == 0) - internal_error ("gdbarch: gdbarch_fix_call_dummy invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_fix_call_dummy invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_fix_call_dummy called\n"); gdbarch->fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p); @@ -2829,9 +3396,48 @@ set_gdbarch_fix_call_dummy (struct gdbarch *gdbarch, gdbarch->fix_call_dummy = fix_call_dummy; } +void +gdbarch_init_frame_pc_first (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->init_frame_pc_first == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_init_frame_pc_first invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_init_frame_pc_first called\n"); + gdbarch->init_frame_pc_first (fromleaf, prev); +} + +void +set_gdbarch_init_frame_pc_first (struct gdbarch *gdbarch, + gdbarch_init_frame_pc_first_ftype init_frame_pc_first) +{ + gdbarch->init_frame_pc_first = init_frame_pc_first; +} + +void +gdbarch_init_frame_pc (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->init_frame_pc == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_init_frame_pc invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_init_frame_pc called\n"); + gdbarch->init_frame_pc (fromleaf, prev); +} + +void +set_gdbarch_init_frame_pc (struct gdbarch *gdbarch, + gdbarch_init_frame_pc_ftype init_frame_pc) +{ + gdbarch->init_frame_pc = init_frame_pc; +} + int gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_believe_pcc_promotion called\n"); return gdbarch->believe_pcc_promotion; @@ -2847,6 +3453,7 @@ set_gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch, int gdbarch_believe_pcc_promotion_type (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_believe_pcc_promotion_type called\n"); return gdbarch->believe_pcc_promotion_type; @@ -2862,8 +3469,10 @@ set_gdbarch_believe_pcc_promotion_type (struct gdbarch *gdbarch, int gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, struct type *formal, struct type *actual) { + gdb_assert (gdbarch != NULL); if (gdbarch->coerce_float_to_double == 0) - internal_error ("gdbarch: gdbarch_coerce_float_to_double invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_coerce_float_to_double invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_coerce_float_to_double called\n"); return gdbarch->coerce_float_to_double (formal, actual); @@ -2879,8 +3488,10 @@ set_gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, void gdbarch_get_saved_register (struct gdbarch *gdbarch, char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval) { + gdb_assert (gdbarch != NULL); if (gdbarch->get_saved_register == 0) - internal_error ("gdbarch: gdbarch_get_saved_register invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_get_saved_register invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_get_saved_register called\n"); gdbarch->get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval); @@ -2896,8 +3507,10 @@ set_gdbarch_get_saved_register (struct gdbarch *gdbarch, int gdbarch_register_convertible (struct gdbarch *gdbarch, int nr) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_convertible == 0) - internal_error ("gdbarch: gdbarch_register_convertible invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_convertible invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convertible called\n"); return gdbarch->register_convertible (nr); @@ -2913,8 +3526,10 @@ set_gdbarch_register_convertible (struct gdbarch *gdbarch, void gdbarch_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, struct type *type, char *from, char *to) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_convert_to_virtual == 0) - internal_error ("gdbarch: gdbarch_register_convert_to_virtual invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_convert_to_virtual invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convert_to_virtual called\n"); gdbarch->register_convert_to_virtual (regnum, type, from, to); @@ -2930,8 +3545,10 @@ set_gdbarch_register_convert_to_virtual (struct gdbarch *gdbarch, void gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type, int regnum, char *from, char *to) { + gdb_assert (gdbarch != NULL); if (gdbarch->register_convert_to_raw == 0) - internal_error ("gdbarch: gdbarch_register_convert_to_raw invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_convert_to_raw invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convert_to_raw called\n"); gdbarch->register_convert_to_raw (type, regnum, from, to); @@ -2944,11 +3561,77 @@ set_gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, gdbarch->register_convert_to_raw = register_convert_to_raw; } +int +gdbarch_convert_register_p (struct gdbarch *gdbarch, int regnum) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->convert_register_p == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_convert_register_p invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_convert_register_p called\n"); + return gdbarch->convert_register_p (regnum); +} + +void +set_gdbarch_convert_register_p (struct gdbarch *gdbarch, + gdbarch_convert_register_p_ftype convert_register_p) +{ + gdbarch->convert_register_p = convert_register_p; +} + +void +gdbarch_register_to_value (struct gdbarch *gdbarch, int regnum, struct type *type, char *from, char *to) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->register_to_value == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_register_to_value invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_register_to_value called\n"); + gdbarch->register_to_value (regnum, type, from, to); +} + +void +set_gdbarch_register_to_value (struct gdbarch *gdbarch, + gdbarch_register_to_value_ftype register_to_value) +{ + gdbarch->register_to_value = register_to_value; +} + +void +gdbarch_value_to_register (struct gdbarch *gdbarch, struct type *type, int regnum, char *from, char *to) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->value_to_register == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_value_to_register invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_value_to_register called\n"); + gdbarch->value_to_register (type, regnum, from, to); +} + +void +set_gdbarch_value_to_register (struct gdbarch *gdbarch, + gdbarch_value_to_register_ftype value_to_register) +{ + gdbarch->value_to_register = value_to_register; +} + +int +gdbarch_fetch_pseudo_register_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->fetch_pseudo_register != 0; +} + void gdbarch_fetch_pseudo_register (struct gdbarch *gdbarch, int regnum) { + gdb_assert (gdbarch != NULL); if (gdbarch->fetch_pseudo_register == 0) - internal_error ("gdbarch: gdbarch_fetch_pseudo_register invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_fetch_pseudo_register invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_fetch_pseudo_register called\n"); gdbarch->fetch_pseudo_register (regnum); @@ -2961,11 +3644,20 @@ set_gdbarch_fetch_pseudo_register (struct gdbarch *gdbarch, gdbarch->fetch_pseudo_register = fetch_pseudo_register; } +int +gdbarch_store_pseudo_register_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->store_pseudo_register != 0; +} + void gdbarch_store_pseudo_register (struct gdbarch *gdbarch, int regnum) { + gdb_assert (gdbarch != NULL); if (gdbarch->store_pseudo_register == 0) - internal_error ("gdbarch: gdbarch_store_pseudo_register invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_store_pseudo_register invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_store_pseudo_register called\n"); gdbarch->store_pseudo_register (regnum); @@ -2981,8 +3673,10 @@ set_gdbarch_store_pseudo_register (struct gdbarch *gdbarch, CORE_ADDR gdbarch_pointer_to_address (struct gdbarch *gdbarch, struct type *type, void *buf) { + gdb_assert (gdbarch != NULL); if (gdbarch->pointer_to_address == 0) - internal_error ("gdbarch: gdbarch_pointer_to_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_pointer_to_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_pointer_to_address called\n"); return gdbarch->pointer_to_address (type, buf); @@ -2998,8 +3692,10 @@ set_gdbarch_pointer_to_address (struct gdbarch *gdbarch, void gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, void *buf, CORE_ADDR addr) { + gdb_assert (gdbarch != NULL); if (gdbarch->address_to_pointer == 0) - internal_error ("gdbarch: gdbarch_address_to_pointer invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_address_to_pointer invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_address_to_pointer called\n"); gdbarch->address_to_pointer (type, buf, addr); @@ -3013,214 +3709,159 @@ set_gdbarch_address_to_pointer (struct gdbarch *gdbarch, } int -gdbarch_return_value_on_stack (struct gdbarch *gdbarch, struct type *type) -{ - if (gdbarch->return_value_on_stack == 0) - internal_error ("gdbarch: gdbarch_return_value_on_stack invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_return_value_on_stack called\n"); - return gdbarch->return_value_on_stack (type); -} - -void -set_gdbarch_return_value_on_stack (struct gdbarch *gdbarch, - gdbarch_return_value_on_stack_ftype return_value_on_stack) -{ - gdbarch->return_value_on_stack = return_value_on_stack; -} - -void -gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf) -{ - if (gdbarch->extract_return_value == 0) - internal_error ("gdbarch: gdbarch_extract_return_value invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_return_value called\n"); - gdbarch->extract_return_value (type, regbuf, valbuf); -} - -void -set_gdbarch_extract_return_value (struct gdbarch *gdbarch, - gdbarch_extract_return_value_ftype extract_return_value) +gdbarch_integer_to_address_p (struct gdbarch *gdbarch) { - gdbarch->extract_return_value = extract_return_value; + gdb_assert (gdbarch != NULL); + return gdbarch->integer_to_address != 0; } CORE_ADDR -gdbarch_push_arguments (struct gdbarch *gdbarch, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) -{ - if (gdbarch->push_arguments == 0) - internal_error ("gdbarch: gdbarch_push_arguments invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_push_arguments called\n"); - return gdbarch->push_arguments (nargs, args, sp, struct_return, struct_addr); -} - -void -set_gdbarch_push_arguments (struct gdbarch *gdbarch, - gdbarch_push_arguments_ftype push_arguments) -{ - gdbarch->push_arguments = push_arguments; -} - -void -gdbarch_push_dummy_frame (struct gdbarch *gdbarch) +gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, void *buf) { - if (gdbarch->push_dummy_frame == 0) - internal_error ("gdbarch: gdbarch_push_dummy_frame invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->integer_to_address == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_integer_to_address invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_frame called\n"); - gdbarch->push_dummy_frame (); + fprintf_unfiltered (gdb_stdlog, "gdbarch_integer_to_address called\n"); + return gdbarch->integer_to_address (type, buf); } void -set_gdbarch_push_dummy_frame (struct gdbarch *gdbarch, - gdbarch_push_dummy_frame_ftype push_dummy_frame) +set_gdbarch_integer_to_address (struct gdbarch *gdbarch, + gdbarch_integer_to_address_ftype integer_to_address) { - gdbarch->push_dummy_frame = push_dummy_frame; + gdbarch->integer_to_address = integer_to_address; } -CORE_ADDR -gdbarch_push_return_address (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp) +int +gdbarch_return_value_on_stack (struct gdbarch *gdbarch, struct type *type) { - if (gdbarch->push_return_address == 0) - internal_error ("gdbarch: gdbarch_push_return_address invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->return_value_on_stack == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_return_value_on_stack invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_push_return_address called\n"); - return gdbarch->push_return_address (pc, sp); -} - -void -set_gdbarch_push_return_address (struct gdbarch *gdbarch, - gdbarch_push_return_address_ftype push_return_address) -{ - gdbarch->push_return_address = push_return_address; + fprintf_unfiltered (gdb_stdlog, "gdbarch_return_value_on_stack called\n"); + return gdbarch->return_value_on_stack (type); } void -gdbarch_pop_frame (struct gdbarch *gdbarch) +set_gdbarch_return_value_on_stack (struct gdbarch *gdbarch, + gdbarch_return_value_on_stack_ftype return_value_on_stack) { - if (gdbarch->pop_frame == 0) - internal_error ("gdbarch: gdbarch_pop_frame invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_pop_frame called\n"); - gdbarch->pop_frame (); + gdbarch->return_value_on_stack = return_value_on_stack; } void -set_gdbarch_pop_frame (struct gdbarch *gdbarch, - gdbarch_pop_frame_ftype pop_frame) -{ - gdbarch->pop_frame = pop_frame; -} - -CORE_ADDR -gdbarch_d10v_make_daddr (struct gdbarch *gdbarch, CORE_ADDR x) +gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf) { - if (gdbarch->d10v_make_daddr == 0) - internal_error ("gdbarch: gdbarch_d10v_make_daddr invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->extract_return_value == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_extract_return_value invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_make_daddr called\n"); - return gdbarch->d10v_make_daddr (x); + fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_return_value called\n"); + gdbarch->extract_return_value (type, regbuf, valbuf); } void -set_gdbarch_d10v_make_daddr (struct gdbarch *gdbarch, - gdbarch_d10v_make_daddr_ftype d10v_make_daddr) +set_gdbarch_extract_return_value (struct gdbarch *gdbarch, + gdbarch_extract_return_value_ftype extract_return_value) { - gdbarch->d10v_make_daddr = d10v_make_daddr; + gdbarch->extract_return_value = extract_return_value; } CORE_ADDR -gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, CORE_ADDR x) +gdbarch_push_arguments (struct gdbarch *gdbarch, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) { - if (gdbarch->d10v_make_iaddr == 0) - internal_error ("gdbarch: gdbarch_d10v_make_iaddr invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->push_arguments == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_push_arguments invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_make_iaddr called\n"); - return gdbarch->d10v_make_iaddr (x); + fprintf_unfiltered (gdb_stdlog, "gdbarch_push_arguments called\n"); + return gdbarch->push_arguments (nargs, args, sp, struct_return, struct_addr); } void -set_gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, - gdbarch_d10v_make_iaddr_ftype d10v_make_iaddr) +set_gdbarch_push_arguments (struct gdbarch *gdbarch, + gdbarch_push_arguments_ftype push_arguments) { - gdbarch->d10v_make_iaddr = d10v_make_iaddr; + gdbarch->push_arguments = push_arguments; } -int -gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, CORE_ADDR x) +void +gdbarch_push_dummy_frame (struct gdbarch *gdbarch) { - if (gdbarch->d10v_daddr_p == 0) - internal_error ("gdbarch: gdbarch_d10v_daddr_p invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->push_dummy_frame == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_push_dummy_frame invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_daddr_p called\n"); - return gdbarch->d10v_daddr_p (x); + fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_frame called\n"); + gdbarch->push_dummy_frame (); } void -set_gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, - gdbarch_d10v_daddr_p_ftype d10v_daddr_p) +set_gdbarch_push_dummy_frame (struct gdbarch *gdbarch, + gdbarch_push_dummy_frame_ftype push_dummy_frame) { - gdbarch->d10v_daddr_p = d10v_daddr_p; + gdbarch->push_dummy_frame = push_dummy_frame; } int -gdbarch_d10v_iaddr_p (struct gdbarch *gdbarch, CORE_ADDR x) -{ - if (gdbarch->d10v_iaddr_p == 0) - internal_error ("gdbarch: gdbarch_d10v_iaddr_p invalid"); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_iaddr_p called\n"); - return gdbarch->d10v_iaddr_p (x); -} - -void -set_gdbarch_d10v_iaddr_p (struct gdbarch *gdbarch, - gdbarch_d10v_iaddr_p_ftype d10v_iaddr_p) +gdbarch_push_return_address_p (struct gdbarch *gdbarch) { - gdbarch->d10v_iaddr_p = d10v_iaddr_p; + gdb_assert (gdbarch != NULL); + return gdbarch->push_return_address != 0; } CORE_ADDR -gdbarch_d10v_convert_daddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x) +gdbarch_push_return_address (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp) { - if (gdbarch->d10v_convert_daddr_to_raw == 0) - internal_error ("gdbarch: gdbarch_d10v_convert_daddr_to_raw invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->push_return_address == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_push_return_address invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_convert_daddr_to_raw called\n"); - return gdbarch->d10v_convert_daddr_to_raw (x); + fprintf_unfiltered (gdb_stdlog, "gdbarch_push_return_address called\n"); + return gdbarch->push_return_address (pc, sp); } void -set_gdbarch_d10v_convert_daddr_to_raw (struct gdbarch *gdbarch, - gdbarch_d10v_convert_daddr_to_raw_ftype d10v_convert_daddr_to_raw) +set_gdbarch_push_return_address (struct gdbarch *gdbarch, + gdbarch_push_return_address_ftype push_return_address) { - gdbarch->d10v_convert_daddr_to_raw = d10v_convert_daddr_to_raw; + gdbarch->push_return_address = push_return_address; } -CORE_ADDR -gdbarch_d10v_convert_iaddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x) +void +gdbarch_pop_frame (struct gdbarch *gdbarch) { - if (gdbarch->d10v_convert_iaddr_to_raw == 0) - internal_error ("gdbarch: gdbarch_d10v_convert_iaddr_to_raw invalid"); + gdb_assert (gdbarch != NULL); + if (gdbarch->pop_frame == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_pop_frame invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_convert_iaddr_to_raw called\n"); - return gdbarch->d10v_convert_iaddr_to_raw (x); + fprintf_unfiltered (gdb_stdlog, "gdbarch_pop_frame called\n"); + gdbarch->pop_frame (); } void -set_gdbarch_d10v_convert_iaddr_to_raw (struct gdbarch *gdbarch, - gdbarch_d10v_convert_iaddr_to_raw_ftype d10v_convert_iaddr_to_raw) +set_gdbarch_pop_frame (struct gdbarch *gdbarch, + gdbarch_pop_frame_ftype pop_frame) { - gdbarch->d10v_convert_iaddr_to_raw = d10v_convert_iaddr_to_raw; + gdbarch->pop_frame = pop_frame; } void gdbarch_store_struct_return (struct gdbarch *gdbarch, CORE_ADDR addr, CORE_ADDR sp) { + gdb_assert (gdbarch != NULL); if (gdbarch->store_struct_return == 0) - internal_error ("gdbarch: gdbarch_store_struct_return invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_store_struct_return invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_store_struct_return called\n"); gdbarch->store_struct_return (addr, sp); @@ -3236,8 +3877,10 @@ set_gdbarch_store_struct_return (struct gdbarch *gdbarch, void gdbarch_store_return_value (struct gdbarch *gdbarch, struct type *type, char *valbuf) { + gdb_assert (gdbarch != NULL); if (gdbarch->store_return_value == 0) - internal_error ("gdbarch: gdbarch_store_return_value invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_store_return_value invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_store_return_value called\n"); gdbarch->store_return_value (type, valbuf); @@ -3250,11 +3893,20 @@ set_gdbarch_store_return_value (struct gdbarch *gdbarch, gdbarch->store_return_value = store_return_value; } +int +gdbarch_extract_struct_value_address_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->extract_struct_value_address != 0; +} + CORE_ADDR gdbarch_extract_struct_value_address (struct gdbarch *gdbarch, char *regbuf) { + gdb_assert (gdbarch != NULL); if (gdbarch->extract_struct_value_address == 0) - internal_error ("gdbarch: gdbarch_extract_struct_value_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_extract_struct_value_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_struct_value_address called\n"); return gdbarch->extract_struct_value_address (regbuf); @@ -3270,8 +3922,10 @@ set_gdbarch_extract_struct_value_address (struct gdbarch *gdbarch, int gdbarch_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *value_type) { + gdb_assert (gdbarch != NULL); if (gdbarch->use_struct_convention == 0) - internal_error ("gdbarch: gdbarch_use_struct_convention invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_use_struct_convention invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_use_struct_convention called\n"); return gdbarch->use_struct_convention (gcc_p, value_type); @@ -3287,8 +3941,10 @@ set_gdbarch_use_struct_convention (struct gdbarch *gdbarch, void gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_init_saved_regs == 0) - internal_error ("gdbarch: gdbarch_frame_init_saved_regs invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_init_saved_regs invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_init_saved_regs called\n"); gdbarch->frame_init_saved_regs (frame); @@ -3301,11 +3957,20 @@ set_gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, gdbarch->frame_init_saved_regs = frame_init_saved_regs; } +int +gdbarch_init_extra_frame_info_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->init_extra_frame_info != 0; +} + void gdbarch_init_extra_frame_info (struct gdbarch *gdbarch, int fromleaf, struct frame_info *frame) { + gdb_assert (gdbarch != NULL); if (gdbarch->init_extra_frame_info == 0) - internal_error ("gdbarch: gdbarch_init_extra_frame_info invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_init_extra_frame_info invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_init_extra_frame_info called\n"); gdbarch->init_extra_frame_info (fromleaf, frame); @@ -3321,8 +3986,10 @@ set_gdbarch_init_extra_frame_info (struct gdbarch *gdbarch, CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip) { + gdb_assert (gdbarch != NULL); if (gdbarch->skip_prologue == 0) - internal_error ("gdbarch: gdbarch_skip_prologue invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_skip_prologue invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_prologue called\n"); return gdbarch->skip_prologue (ip); @@ -3338,8 +4005,10 @@ set_gdbarch_skip_prologue (struct gdbarch *gdbarch, int gdbarch_prologue_frameless_p (struct gdbarch *gdbarch, CORE_ADDR ip) { + gdb_assert (gdbarch != NULL); if (gdbarch->prologue_frameless_p == 0) - internal_error ("gdbarch: gdbarch_prologue_frameless_p invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_prologue_frameless_p invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_prologue_frameless_p called\n"); return gdbarch->prologue_frameless_p (ip); @@ -3355,8 +4024,10 @@ set_gdbarch_prologue_frameless_p (struct gdbarch *gdbarch, int gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs) { + gdb_assert (gdbarch != NULL); if (gdbarch->inner_than == 0) - internal_error ("gdbarch: gdbarch_inner_than invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_inner_than invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_inner_than called\n"); return gdbarch->inner_than (lhs, rhs); @@ -3369,11 +4040,13 @@ set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch->inner_than = inner_than; } -unsigned char * +const unsigned char * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { + gdb_assert (gdbarch != NULL); if (gdbarch->breakpoint_from_pc == 0) - internal_error ("gdbarch: gdbarch_breakpoint_from_pc invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_breakpoint_from_pc invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_breakpoint_from_pc called\n"); return gdbarch->breakpoint_from_pc (pcptr, lenptr); @@ -3389,8 +4062,10 @@ set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) { + gdb_assert (gdbarch != NULL); if (gdbarch->memory_insert_breakpoint == 0) - internal_error ("gdbarch: gdbarch_memory_insert_breakpoint invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_memory_insert_breakpoint invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_insert_breakpoint called\n"); return gdbarch->memory_insert_breakpoint (addr, contents_cache); @@ -3406,8 +4081,10 @@ set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) { + gdb_assert (gdbarch != NULL); if (gdbarch->memory_remove_breakpoint == 0) - internal_error ("gdbarch: gdbarch_memory_remove_breakpoint invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_memory_remove_breakpoint invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_remove_breakpoint called\n"); return gdbarch->memory_remove_breakpoint (addr, contents_cache); @@ -3423,8 +4100,10 @@ set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR gdbarch_decr_pc_after_break (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->decr_pc_after_break == -1) - internal_error ("gdbarch: gdbarch_decr_pc_after_break invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_decr_pc_after_break invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_decr_pc_after_break called\n"); return gdbarch->decr_pc_after_break; @@ -3437,11 +4116,32 @@ set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch, gdbarch->decr_pc_after_break = decr_pc_after_break; } +int +gdbarch_prepare_to_proceed (struct gdbarch *gdbarch, int select_it) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->prepare_to_proceed == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_prepare_to_proceed invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_prepare_to_proceed called\n"); + return gdbarch->prepare_to_proceed (select_it); +} + +void +set_gdbarch_prepare_to_proceed (struct gdbarch *gdbarch, + gdbarch_prepare_to_proceed_ftype prepare_to_proceed) +{ + gdbarch->prepare_to_proceed = prepare_to_proceed; +} + CORE_ADDR gdbarch_function_start_offset (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->function_start_offset == -1) - internal_error ("gdbarch: gdbarch_function_start_offset invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_function_start_offset invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_function_start_offset called\n"); return gdbarch->function_start_offset; @@ -3457,8 +4157,10 @@ set_gdbarch_function_start_offset (struct gdbarch *gdbarch, void gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len) { + gdb_assert (gdbarch != NULL); if (gdbarch->remote_translate_xfer_address == 0) - internal_error ("gdbarch: gdbarch_remote_translate_xfer_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_remote_translate_xfer_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_remote_translate_xfer_address called\n"); gdbarch->remote_translate_xfer_address (gdb_addr, gdb_len, rem_addr, rem_len); @@ -3474,8 +4176,10 @@ set_gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, CORE_ADDR gdbarch_frame_args_skip (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_args_skip == -1) - internal_error ("gdbarch: gdbarch_frame_args_skip invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_args_skip invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_args_skip called\n"); return gdbarch->frame_args_skip; @@ -3491,8 +4195,10 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, int gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi) { + gdb_assert (gdbarch != NULL); if (gdbarch->frameless_function_invocation == 0) - internal_error ("gdbarch: gdbarch_frameless_function_invocation invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frameless_function_invocation invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frameless_function_invocation called\n"); return gdbarch->frameless_function_invocation (fi); @@ -3508,8 +4214,10 @@ set_gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, CORE_ADDR gdbarch_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_chain == 0) - internal_error ("gdbarch: gdbarch_frame_chain invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_chain invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_chain called\n"); return gdbarch->frame_chain (frame); @@ -3525,8 +4233,10 @@ set_gdbarch_frame_chain (struct gdbarch *gdbarch, int gdbarch_frame_chain_valid (struct gdbarch *gdbarch, CORE_ADDR chain, struct frame_info *thisframe) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_chain_valid == 0) - internal_error ("gdbarch: gdbarch_frame_chain_valid invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_chain_valid invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_chain_valid called\n"); return gdbarch->frame_chain_valid (chain, thisframe); @@ -3542,8 +4252,10 @@ set_gdbarch_frame_chain_valid (struct gdbarch *gdbarch, CORE_ADDR gdbarch_frame_saved_pc (struct gdbarch *gdbarch, struct frame_info *fi) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_saved_pc == 0) - internal_error ("gdbarch: gdbarch_frame_saved_pc invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_saved_pc invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_saved_pc called\n"); return gdbarch->frame_saved_pc (fi); @@ -3559,8 +4271,10 @@ set_gdbarch_frame_saved_pc (struct gdbarch *gdbarch, CORE_ADDR gdbarch_frame_args_address (struct gdbarch *gdbarch, struct frame_info *fi) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_args_address == 0) - internal_error ("gdbarch: gdbarch_frame_args_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_args_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_args_address called\n"); return gdbarch->frame_args_address (fi); @@ -3576,8 +4290,10 @@ set_gdbarch_frame_args_address (struct gdbarch *gdbarch, CORE_ADDR gdbarch_frame_locals_address (struct gdbarch *gdbarch, struct frame_info *fi) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_locals_address == 0) - internal_error ("gdbarch: gdbarch_frame_locals_address invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_locals_address invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_locals_address called\n"); return gdbarch->frame_locals_address (fi); @@ -3593,8 +4309,10 @@ set_gdbarch_frame_locals_address (struct gdbarch *gdbarch, CORE_ADDR gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame) { + gdb_assert (gdbarch != NULL); if (gdbarch->saved_pc_after_call == 0) - internal_error ("gdbarch: gdbarch_saved_pc_after_call invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_saved_pc_after_call invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_saved_pc_after_call called\n"); return gdbarch->saved_pc_after_call (frame); @@ -3610,8 +4328,10 @@ set_gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, int gdbarch_frame_num_args (struct gdbarch *gdbarch, struct frame_info *frame) { + gdb_assert (gdbarch != NULL); if (gdbarch->frame_num_args == 0) - internal_error ("gdbarch: gdbarch_frame_num_args invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_frame_num_args invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_num_args called\n"); return gdbarch->frame_num_args (frame); @@ -3627,14 +4347,17 @@ set_gdbarch_frame_num_args (struct gdbarch *gdbarch, int gdbarch_stack_align_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); return gdbarch->stack_align != 0; } CORE_ADDR gdbarch_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp) { + gdb_assert (gdbarch != NULL); if (gdbarch->stack_align == 0) - internal_error ("gdbarch: gdbarch_stack_align invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_stack_align invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_stack_align called\n"); return gdbarch->stack_align (sp); @@ -3650,6 +4373,7 @@ set_gdbarch_stack_align (struct gdbarch *gdbarch, int gdbarch_extra_stack_alignment_needed (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); /* Skip verify of extra_stack_alignment_needed, invalid_p == 0 */ if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_extra_stack_alignment_needed called\n"); @@ -3666,14 +4390,17 @@ set_gdbarch_extra_stack_alignment_needed (struct gdbarch *gdbarch, int gdbarch_reg_struct_has_addr_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); return gdbarch->reg_struct_has_addr != 0; } int gdbarch_reg_struct_has_addr (struct gdbarch *gdbarch, int gcc_p, struct type *type) { + gdb_assert (gdbarch != NULL); if (gdbarch->reg_struct_has_addr == 0) - internal_error ("gdbarch: gdbarch_reg_struct_has_addr invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_reg_struct_has_addr invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_reg_struct_has_addr called\n"); return gdbarch->reg_struct_has_addr (gcc_p, type); @@ -3689,14 +4416,17 @@ set_gdbarch_reg_struct_has_addr (struct gdbarch *gdbarch, int gdbarch_save_dummy_frame_tos_p (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); return gdbarch->save_dummy_frame_tos != 0; } void gdbarch_save_dummy_frame_tos (struct gdbarch *gdbarch, CORE_ADDR sp) { + gdb_assert (gdbarch != NULL); if (gdbarch->save_dummy_frame_tos == 0) - internal_error ("gdbarch: gdbarch_save_dummy_frame_tos invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_save_dummy_frame_tos invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_save_dummy_frame_tos called\n"); gdbarch->save_dummy_frame_tos (sp); @@ -3709,9 +4439,26 @@ set_gdbarch_save_dummy_frame_tos (struct gdbarch *gdbarch, gdbarch->save_dummy_frame_tos = save_dummy_frame_tos; } +int +gdbarch_parm_boundary (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_parm_boundary called\n"); + return gdbarch->parm_boundary; +} + +void +set_gdbarch_parm_boundary (struct gdbarch *gdbarch, + int parm_boundary) +{ + gdbarch->parm_boundary = parm_boundary; +} + const struct floatformat * gdbarch_float_format (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_float_format called\n"); return gdbarch->float_format; @@ -3727,6 +4474,7 @@ set_gdbarch_float_format (struct gdbarch *gdbarch, const struct floatformat * gdbarch_double_format (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_double_format called\n"); return gdbarch->double_format; @@ -3742,6 +4490,7 @@ set_gdbarch_double_format (struct gdbarch *gdbarch, const struct floatformat * gdbarch_long_double_format (struct gdbarch *gdbarch) { + gdb_assert (gdbarch != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_long_double_format called\n"); return gdbarch->long_double_format; @@ -3757,8 +4506,10 @@ set_gdbarch_long_double_format (struct gdbarch *gdbarch, CORE_ADDR gdbarch_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr) { + gdb_assert (gdbarch != NULL); if (gdbarch->convert_from_func_ptr_addr == 0) - internal_error ("gdbarch: gdbarch_convert_from_func_ptr_addr invalid"); + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_convert_from_func_ptr_addr invalid"); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_convert_from_func_ptr_addr called\n"); return gdbarch->convert_from_func_ptr_addr (addr); @@ -3771,45 +4522,290 @@ set_gdbarch_convert_from_func_ptr_addr (struct gdbarch *gdbarch, gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr; } +CORE_ADDR +gdbarch_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->addr_bits_remove == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_addr_bits_remove invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_addr_bits_remove called\n"); + return gdbarch->addr_bits_remove (addr); +} + +void +set_gdbarch_addr_bits_remove (struct gdbarch *gdbarch, + gdbarch_addr_bits_remove_ftype addr_bits_remove) +{ + gdbarch->addr_bits_remove = addr_bits_remove; +} + +CORE_ADDR +gdbarch_smash_text_address (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->smash_text_address == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_smash_text_address invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_smash_text_address called\n"); + return gdbarch->smash_text_address (addr); +} + +void +set_gdbarch_smash_text_address (struct gdbarch *gdbarch, + gdbarch_smash_text_address_ftype smash_text_address) +{ + gdbarch->smash_text_address = smash_text_address; +} + +int +gdbarch_software_single_step_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->software_single_step != 0; +} + +void +gdbarch_software_single_step (struct gdbarch *gdbarch, enum target_signal sig, int insert_breakpoints_p) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->software_single_step == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_software_single_step invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_software_single_step called\n"); + gdbarch->software_single_step (sig, insert_breakpoints_p); +} + +void +set_gdbarch_software_single_step (struct gdbarch *gdbarch, + gdbarch_software_single_step_ftype software_single_step) +{ + gdbarch->software_single_step = software_single_step; +} + +int +gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, disassemble_info *info) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->print_insn == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_print_insn invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_print_insn called\n"); + return gdbarch->print_insn (vma, info); +} + +void +set_gdbarch_print_insn (struct gdbarch *gdbarch, + gdbarch_print_insn_ftype print_insn) +{ + gdbarch->print_insn = print_insn; +} + +CORE_ADDR +gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, CORE_ADDR pc) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->skip_trampoline_code == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_skip_trampoline_code invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_trampoline_code called\n"); + return gdbarch->skip_trampoline_code (pc); +} + +void +set_gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, + gdbarch_skip_trampoline_code_ftype skip_trampoline_code) +{ + gdbarch->skip_trampoline_code = skip_trampoline_code; +} + +int +gdbarch_in_solib_call_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, char *name) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->in_solib_call_trampoline == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_in_solib_call_trampoline invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_in_solib_call_trampoline called\n"); + return gdbarch->in_solib_call_trampoline (pc, name); +} + +void +set_gdbarch_in_solib_call_trampoline (struct gdbarch *gdbarch, + gdbarch_in_solib_call_trampoline_ftype in_solib_call_trampoline) +{ + gdbarch->in_solib_call_trampoline = in_solib_call_trampoline; +} + +int +gdbarch_pc_in_sigtramp (struct gdbarch *gdbarch, CORE_ADDR pc, char *name) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->pc_in_sigtramp == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_pc_in_sigtramp invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_pc_in_sigtramp called\n"); + return gdbarch->pc_in_sigtramp (pc, name); +} + +void +set_gdbarch_pc_in_sigtramp (struct gdbarch *gdbarch, + gdbarch_pc_in_sigtramp_ftype pc_in_sigtramp) +{ + gdbarch->pc_in_sigtramp = pc_in_sigtramp; +} + +int +gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->in_function_epilogue_p == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_in_function_epilogue_p invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_in_function_epilogue_p called\n"); + return gdbarch->in_function_epilogue_p (gdbarch, addr); +} + +void +set_gdbarch_in_function_epilogue_p (struct gdbarch *gdbarch, + gdbarch_in_function_epilogue_p_ftype in_function_epilogue_p) +{ + 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); + if (gdbarch->construct_inferior_arguments == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_construct_inferior_arguments invalid"); + 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; +} + +int +gdbarch_dwarf2_build_frame_info_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->dwarf2_build_frame_info != 0; +} + +void +gdbarch_dwarf2_build_frame_info (struct gdbarch *gdbarch, struct objfile *objfile) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->dwarf2_build_frame_info == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_dwarf2_build_frame_info invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_dwarf2_build_frame_info called\n"); + gdbarch->dwarf2_build_frame_info (objfile); +} + +void +set_gdbarch_dwarf2_build_frame_info (struct gdbarch *gdbarch, + gdbarch_dwarf2_build_frame_info_ftype dwarf2_build_frame_info) +{ + gdbarch->dwarf2_build_frame_info = dwarf2_build_frame_info; +} + +void +gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, asymbol *sym, struct minimal_symbol *msym) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->elf_make_msymbol_special == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_elf_make_msymbol_special invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_elf_make_msymbol_special called\n"); + gdbarch->elf_make_msymbol_special (sym, msym); +} + +void +set_gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, + gdbarch_elf_make_msymbol_special_ftype elf_make_msymbol_special) +{ + gdbarch->elf_make_msymbol_special = elf_make_msymbol_special; +} + +void +gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, int val, struct minimal_symbol *msym) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->coff_make_msymbol_special == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_coff_make_msymbol_special invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_coff_make_msymbol_special called\n"); + gdbarch->coff_make_msymbol_special (val, msym); +} + +void +set_gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, + gdbarch_coff_make_msymbol_special_ftype coff_make_msymbol_special) +{ + gdbarch->coff_make_msymbol_special = coff_make_msymbol_special; +} + -/* Keep a registrary of per-architecture data-pointers required by GDB +/* Keep a registry of per-architecture data-pointers required by GDB modules. */ struct gdbarch_data { - int index; + unsigned index; + gdbarch_data_init_ftype *init; + gdbarch_data_free_ftype *free; }; struct gdbarch_data_registration { - gdbarch_data_ftype *init; struct gdbarch_data *data; struct gdbarch_data_registration *next; }; -struct gdbarch_data_registrary +struct gdbarch_data_registry { - int nr; + unsigned nr; struct gdbarch_data_registration *registrations; }; -struct gdbarch_data_registrary gdbarch_data_registrary = +struct gdbarch_data_registry gdbarch_data_registry = { 0, NULL, }; struct gdbarch_data * -register_gdbarch_data (gdbarch_data_ftype *init) +register_gdbarch_data (gdbarch_data_init_ftype *init, + gdbarch_data_free_ftype *free) { struct gdbarch_data_registration **curr; - for (curr = &gdbarch_data_registrary.registrations; + for (curr = &gdbarch_data_registry.registrations; (*curr) != NULL; curr = &(*curr)->next); (*curr) = XMALLOC (struct gdbarch_data_registration); (*curr)->next = NULL; - (*curr)->init = init; (*curr)->data = XMALLOC (struct gdbarch_data); - (*curr)->data->index = gdbarch_data_registrary.nr++; + (*curr)->data->index = gdbarch_data_registry.nr++; + (*curr)->data->init = init; + (*curr)->data->free = free; return (*curr)->data; } @@ -3820,32 +4816,79 @@ static void init_gdbarch_data (struct gdbarch *gdbarch) { struct gdbarch_data_registration *rego; - gdbarch->nr_data = gdbarch_data_registrary.nr + 1; - gdbarch->data = xmalloc (sizeof (void*) * gdbarch->nr_data); - for (rego = gdbarch_data_registrary.registrations; + for (rego = gdbarch_data_registry.registrations; + rego != NULL; + rego = rego->next) + { + struct gdbarch_data *data = rego->data; + gdb_assert (data->index < gdbarch->nr_data); + if (data->init != NULL) + { + void *pointer = data->init (gdbarch); + set_gdbarch_data (gdbarch, data, pointer); + } + } +} + +/* Create/delete the gdbarch data vector. */ + +static void +alloc_gdbarch_data (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch->data == NULL); + gdbarch->nr_data = gdbarch_data_registry.nr; + gdbarch->data = xcalloc (gdbarch->nr_data, sizeof (void*)); +} + +static void +free_gdbarch_data (struct gdbarch *gdbarch) +{ + struct gdbarch_data_registration *rego; + gdb_assert (gdbarch->data != NULL); + for (rego = gdbarch_data_registry.registrations; rego != NULL; rego = rego->next) { - if (rego->data->index < gdbarch->nr_data) - gdbarch->data[rego->data->index] = rego->init (); + struct gdbarch_data *data = rego->data; + gdb_assert (data->index < gdbarch->nr_data); + if (data->free != NULL && gdbarch->data[data->index] != NULL) + { + data->free (gdbarch, gdbarch->data[data->index]); + gdbarch->data[data->index] = NULL; + } } + xfree (gdbarch->data); + gdbarch->data = NULL; } +/* Initialize the current value of thee specified per-architecture + data-pointer. */ + +void +set_gdbarch_data (struct gdbarch *gdbarch, + struct gdbarch_data *data, + void *pointer) +{ + gdb_assert (data->index < gdbarch->nr_data); + if (data->free != NULL && gdbarch->data[data->index] != NULL) + data->free (gdbarch, gdbarch->data[data->index]); + gdbarch->data[data->index] = pointer; +} + /* Return the current value of the specified per-architecture data-pointer. */ void * -gdbarch_data (struct gdbarch_data *data) +gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *data) { - if (data->index >= current_gdbarch->nr_data) - internal_error ("gdbarch_data: request for non-existant data."); - return current_gdbarch->data[data->index]; + gdb_assert (data->index < gdbarch->nr_data); + return gdbarch->data[data->index]; } -/* Keep a registrary of swapped data required by GDB modules. */ +/* Keep a registry of swapped data required by GDB modules. */ struct gdbarch_swap { @@ -3862,13 +4905,13 @@ struct gdbarch_swap_registration struct gdbarch_swap_registration *next; }; -struct gdbarch_swap_registrary +struct gdbarch_swap_registry { int nr; struct gdbarch_swap_registration *registrations; }; -struct gdbarch_swap_registrary gdbarch_swap_registrary = +struct gdbarch_swap_registry gdbarch_swap_registry = { 0, NULL, }; @@ -3879,7 +4922,7 @@ register_gdbarch_swap (void *data, gdbarch_swap_ftype *init) { struct gdbarch_swap_registration **rego; - for (rego = &gdbarch_swap_registrary.registrations; + for (rego = &gdbarch_swap_registry.registrations; (*rego) != NULL; rego = &(*rego)->next); (*rego) = XMALLOC (struct gdbarch_swap_registration); @@ -3889,13 +4932,24 @@ register_gdbarch_swap (void *data, (*rego)->sizeof_data = sizeof_data; } +static void +clear_gdbarch_swap (struct gdbarch *gdbarch) +{ + struct gdbarch_swap *curr; + for (curr = gdbarch->swap; + curr != NULL; + curr = curr->next) + { + memset (curr->source->data, 0, curr->source->sizeof_data); + } +} static void init_gdbarch_swap (struct gdbarch *gdbarch) { struct gdbarch_swap_registration *rego; struct gdbarch_swap **curr = &gdbarch->swap; - for (rego = gdbarch_swap_registrary.registrations; + for (rego = gdbarch_swap_registry.registrations; rego != NULL; rego = rego->next) { @@ -3905,7 +4959,6 @@ init_gdbarch_swap (struct gdbarch *gdbarch) (*curr)->source = rego; (*curr)->swap = xmalloc (rego->sizeof_data); (*curr)->next = NULL; - memset (rego->data, 0, rego->sizeof_data); curr = &(*curr)->next; } if (rego->init != NULL) @@ -3934,7 +4987,7 @@ swapin_gdbarch_swap (struct gdbarch *gdbarch) } -/* Keep a registrary of the architectures known by GDB. */ +/* Keep a registry of the architectures known by GDB. */ struct gdbarch_registration { @@ -3945,7 +4998,7 @@ struct gdbarch_registration struct gdbarch_registration *next; }; -static struct gdbarch_registration *gdbarch_registrary = NULL; +static struct gdbarch_registration *gdbarch_registry = NULL; static void append_name (const char ***buf, int *nr, const char *name) @@ -3966,14 +5019,15 @@ gdbarch_printable_names (void) int nr_arches = 0; const char **arches = NULL; struct gdbarch_registration *rego; - for (rego = gdbarch_registrary; + for (rego = gdbarch_registry; rego != NULL; rego = rego->next) { const struct bfd_arch_info *ap; ap = bfd_lookup_arch (rego->bfd_architecture, 0); if (ap == NULL) - internal_error ("gdbarch_architecture_names: multi-arch unknown"); + internal_error (__FILE__, __LINE__, + "gdbarch_architecture_names: multi-arch unknown"); do { append_name (&arches, &nr_arches, ap->printable_name); @@ -3998,20 +5052,23 @@ gdbarch_register (enum bfd_architecture bfd_architecture, { struct gdbarch_registration **curr; const struct bfd_arch_info *bfd_arch_info; - /* Check that BFD reconizes this architecture */ + /* Check that BFD recognizes this architecture */ bfd_arch_info = bfd_lookup_arch (bfd_architecture, 0); if (bfd_arch_info == NULL) { - internal_error ("gdbarch: Attempt to register unknown architecture (%d)", bfd_architecture); + internal_error (__FILE__, __LINE__, + "gdbarch: Attempt to register unknown architecture (%d)", + bfd_architecture); } /* Check that we haven't seen this architecture before */ - for (curr = &gdbarch_registrary; + for (curr = &gdbarch_registry; (*curr) != NULL; curr = &(*curr)->next) { if (bfd_architecture == (*curr)->bfd_architecture) - internal_error ("gdbarch: Duplicate registraration of architecture (%s)", - bfd_arch_info->printable_name); + internal_error (__FILE__, __LINE__, + "gdbarch: Duplicate registraration of architecture (%s)", + bfd_arch_info->printable_name); } /* log it */ if (gdbarch_debug) @@ -4025,8 +5082,8 @@ gdbarch_register (enum bfd_architecture bfd_architecture, (*curr)->dump_tdep = dump_tdep; (*curr)->arches = NULL; (*curr)->next = NULL; - /* When non- multi-arch, install what ever target dump routine we've - been provided - hopefully that routine has been writen correct + /* When non- multi-arch, install whatever target dump routine we've + been provided - hopefully that routine has been written correctly and works regardless of multi-arch. */ if (!GDB_MULTI_ARCH && dump_tdep != NULL && startup_gdbarch.dump_tdep == NULL) @@ -4067,59 +5124,43 @@ int gdbarch_update_p (struct gdbarch_info info) { struct gdbarch *new_gdbarch; - struct gdbarch_list **list; + struct gdbarch *old_gdbarch; struct gdbarch_registration *rego; - /* Fill in any missing bits. Most important is the bfd_architecture - which is used to select the target architecture. */ - if (info.bfd_architecture == bfd_arch_unknown) - { - if (info.bfd_arch_info != NULL) - info.bfd_architecture = info.bfd_arch_info->arch; - else if (info.abfd != NULL) - info.bfd_architecture = bfd_get_arch (info.abfd); - /* FIXME - should query BFD for its default architecture. */ - else - info.bfd_architecture = current_gdbarch->bfd_arch_info->arch; - } + /* Fill in missing parts of the INFO struct using a number of + sources: ``set ...''; INFOabfd supplied; existing target. */ + + /* ``(gdb) set architecture ...'' */ + if (info.bfd_arch_info == NULL + && !TARGET_ARCHITECTURE_AUTO) + info.bfd_arch_info = TARGET_ARCHITECTURE; + if (info.bfd_arch_info == NULL + && info.abfd != NULL + && bfd_get_arch (info.abfd) != bfd_arch_unknown + && bfd_get_arch (info.abfd) != bfd_arch_obscure) + info.bfd_arch_info = bfd_get_arch_info (info.abfd); if (info.bfd_arch_info == NULL) - { - if (target_architecture_auto && info.abfd != NULL) - info.bfd_arch_info = bfd_get_arch_info (info.abfd); - else - info.bfd_arch_info = current_gdbarch->bfd_arch_info; - } - if (info.byte_order == 0) - { - if (target_byte_order_auto && info.abfd != NULL) - info.byte_order = (bfd_big_endian (info.abfd) ? BIG_ENDIAN - : bfd_little_endian (info.abfd) ? LITTLE_ENDIAN - : 0); - else - info.byte_order = current_gdbarch->byte_order; - /* FIXME - should query BFD for its default byte-order. */ - } - /* A default for abfd? */ - - /* Find the target that knows about this architecture. */ - for (rego = gdbarch_registrary; - rego != NULL; - rego = rego->next) - if (rego->bfd_architecture == info.bfd_architecture) - break; - if (rego == NULL) - { - if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "gdbarch_update: No matching architecture\n"); - return 0; - } + info.bfd_arch_info = TARGET_ARCHITECTURE; + + /* ``(gdb) set byte-order ...'' */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN + && !TARGET_BYTE_ORDER_AUTO) + info.byte_order = TARGET_BYTE_ORDER; + /* From the INFO struct. */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN + && info.abfd != NULL) + info.byte_order = (bfd_big_endian (info.abfd) ? BFD_ENDIAN_BIG + : bfd_little_endian (info.abfd) ? BFD_ENDIAN_LITTLE + : BFD_ENDIAN_UNKNOWN); + /* From the current target. */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN) + info.byte_order = TARGET_BYTE_ORDER; + + /* Must have found some sort of architecture. */ + gdb_assert (info.bfd_arch_info != NULL); if (gdbarch_debug) { - fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.bfd_architecture %d (%s)\n", - info.bfd_architecture, - bfd_lookup_arch (info.bfd_architecture, 0)->printable_name); fprintf_unfiltered (gdb_stdlog, "gdbarch_update: info.bfd_arch_info %s\n", (info.bfd_arch_info != NULL @@ -4128,8 +5169,8 @@ gdbarch_update_p (struct gdbarch_info info) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: info.byte_order %d (%s)\n", info.byte_order, - (info.byte_order == BIG_ENDIAN ? "big" - : info.byte_order == LITTLE_ENDIAN ? "little" + (info.byte_order == BFD_ENDIAN_BIG ? "big" + : info.byte_order == BFD_ENDIAN_LITTLE ? "little" : "default")); fprintf_unfiltered (gdb_stdlog, "gdbarch_update: info.abfd 0x%lx\n", @@ -4139,52 +5180,101 @@ gdbarch_update_p (struct gdbarch_info info) (long) info.tdep_info); } + /* Find the target that knows about this architecture. */ + for (rego = gdbarch_registry; + rego != NULL; + rego = rego->next) + if (rego->bfd_architecture == info.bfd_arch_info->arch) + break; + if (rego == NULL) + { + if (gdbarch_debug) + fprintf_unfiltered (gdb_stdlog, "gdbarch_update: No matching architecture\n"); + return 0; + } + + /* Swap the data belonging to the old target out setting the + installed data to zero. This stops the ->init() function trying + to refer to the previous architecture's global data structures. */ + swapout_gdbarch_swap (current_gdbarch); + clear_gdbarch_swap (current_gdbarch); + + /* Save the previously selected architecture, setting the global to + NULL. This stops ->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. */ + old_gdbarch = current_gdbarch; + current_gdbarch = NULL; + /* Ask the target for a replacement architecture. */ new_gdbarch = rego->init (info, rego->arches); - /* Did the target like it? No. Reject the change. */ + /* Did the target like it? No. Reject the change and revert to the + old architecture. */ if (new_gdbarch == NULL) { if (gdbarch_debug) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Target rejected architecture\n"); + swapin_gdbarch_swap (old_gdbarch); + current_gdbarch = old_gdbarch; return 0; } - /* Did the architecture change? No. Do nothing. */ - if (current_gdbarch == new_gdbarch) + /* Did the architecture change? No. Oops, put the old architecture + back. */ + if (old_gdbarch == new_gdbarch) { if (gdbarch_debug) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Architecture 0x%08lx (%s) unchanged\n", (long) new_gdbarch, new_gdbarch->bfd_arch_info->printable_name); + swapin_gdbarch_swap (old_gdbarch); + current_gdbarch = old_gdbarch; return 1; } - /* Swap all data belonging to the old target out */ - swapout_gdbarch_swap (current_gdbarch); - - /* Is this a pre-existing architecture? Yes. Swap it in. */ - for (list = ®o->arches; - (*list) != NULL; - list = &(*list)->next) - { - if ((*list)->gdbarch == new_gdbarch) - { - if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: Previous architecture 0x%08lx (%s) selected\n", - (long) new_gdbarch, - new_gdbarch->bfd_arch_info->printable_name); - current_gdbarch = new_gdbarch; - swapin_gdbarch_swap (new_gdbarch); - return 1; - } - } - - /* Append this new architecture to this targets list. */ - (*list) = XMALLOC (struct gdbarch_list); - (*list)->next = NULL; - (*list)->gdbarch = new_gdbarch; + /* Is this a pre-existing architecture? Yes. Move it to the front + of the list of architectures (keeping the list sorted Most + Recently Used) and then copy it in. */ + { + struct gdbarch_list **list; + for (list = ®o->arches; + (*list) != NULL; + list = &(*list)->next) + { + if ((*list)->gdbarch == new_gdbarch) + { + struct gdbarch_list *this; + if (gdbarch_debug) + fprintf_unfiltered (gdb_stdlog, + "gdbarch_update: Previous architecture 0x%08lx (%s) selected\n", + (long) new_gdbarch, + new_gdbarch->bfd_arch_info->printable_name); + /* Unlink this. */ + this = (*list); + (*list) = this->next; + /* Insert in the front. */ + this->next = rego->arches; + rego->arches = this; + /* Copy the new architecture in. */ + current_gdbarch = new_gdbarch; + swapin_gdbarch_swap (new_gdbarch); + architecture_changed_event (); + return 1; + } + } + } + + /* Prepend this new architecture to the architecture list (keep the + list sorted Most Recently Used). */ + { + struct gdbarch_list *this = XMALLOC (struct gdbarch_list); + this->next = rego->arches; + this->gdbarch = new_gdbarch; + rego->arches = this; + } /* Switch to this new architecture. Dump it out. */ current_gdbarch = new_gdbarch; @@ -4210,7 +5300,8 @@ gdbarch_update_p (struct gdbarch_info info) registered an interest in this architecture. CURRENT_GDBARCH must be updated before these modules are called. */ init_gdbarch_data (new_gdbarch); - + architecture_changed_event (); + if (gdbarch_debug) gdbarch_dump (current_gdbarch, gdb_stdlog);