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 *);
struct gdbarch
{
+ /* Has this architecture been fully initialized? */
+ int initialized_p;
/* basic architectural information */
const struct bfd_arch_info * bfd_arch_info;
int byte_order;
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_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_deprecated_extract_return_value_ftype *deprecated_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_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;
+ gdbarch_deprecated_extract_struct_value_address_ftype *deprecated_extract_struct_value_address;
gdbarch_use_struct_convention_ftype *use_struct_convention;
gdbarch_frame_init_saved_regs_ftype *frame_init_saved_regs;
gdbarch_init_extra_frame_info_ftype *init_extra_frame_info;
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;
struct gdbarch startup_gdbarch =
{
+ 1, /* Always initialized. */
/* basic architecture information */
&bfd_default_arch_struct,
BFD_ENDIAN_BIG,
0,
0,
0,
+ -1,
+ -1,
+ -1,
+ -1,
0,
0,
0,
- -1,
0,
0,
0,
0,
0,
0,
+ generic_register_size,
0,
+ generic_register_size,
0,
0,
0,
- generic_register_raw_size,
+ default_print_float_info,
0,
- generic_register_virtual_size,
0,
0,
0,
0,
0,
0,
- generic_get_saved_register,
0,
0,
0,
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);
}
current_gdbarch->ps_regnum = -1;
current_gdbarch->fp0_regnum = -1;
current_gdbarch->npc_regnum = -1;
- current_gdbarch->nnpc_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->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->register_sim_regno = legacy_register_sim_regno;
current_gdbarch->cannot_fetch_register = cannot_register_not;
current_gdbarch->cannot_store_register = cannot_register_not;
current_gdbarch->use_generic_dummy_frames = -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->get_saved_register = generic_unwind_get_saved_register;
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->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->frame_chain_valid = generic_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->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;
&& (gdbarch->num_regs == -1))
fprintf_unfiltered (log, "\n\tnum_regs");
/* Skip verify of num_pseudo_regs, invalid_p == 0 */
- if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->sp_regnum == -1))
- fprintf_unfiltered (log, "\n\tsp_regnum");
- if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->fp_regnum == -1))
- fprintf_unfiltered (log, "\n\tfp_regnum");
- if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->pc_regnum == -1))
- fprintf_unfiltered (log, "\n\tpc_regnum");
+ /* 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 */
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
&& (gdbarch->register_byte == 0))
fprintf_unfiltered (log, "\n\tregister_byte");
- if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->register_raw_size == 0))
- fprintf_unfiltered (log, "\n\tregister_raw_size");
+ /* Skip verify of register_raw_size, invalid_p == 0 */
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
&& (gdbarch->max_register_raw_size == -1))
fprintf_unfiltered (log, "\n\tmax_register_raw_size");
- if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->register_virtual_size == 0))
- fprintf_unfiltered (log, "\n\tregister_virtual_size");
+ /* Skip verify of register_virtual_size, invalid_p == 0 */
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
&& (gdbarch->max_register_virtual_size == -1))
fprintf_unfiltered (log, "\n\tmax_register_virtual_size");
/* 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 >= GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->get_saved_register == 0))
- fprintf_unfiltered (log, "\n\tget_saved_register");
+ /* Skip verify of get_saved_register, invalid_p == 0 */
/* 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 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 integer_to_address, has predicate */
/* Skip verify of return_value_on_stack, invalid_p == 0 */
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
- && (gdbarch->extract_return_value == 0))
- fprintf_unfiltered (log, "\n\textract_return_value");
+ && (gdbarch->deprecated_extract_return_value == 0))
+ fprintf_unfiltered (log, "\n\tdeprecated_extract_return_value");
/* Skip verify of push_arguments, invalid_p == 0 */
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
&& (gdbarch->push_dummy_frame == 0))
if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
&& (gdbarch->store_return_value == 0))
fprintf_unfiltered (log, "\n\tstore_return_value");
- /* Skip verify of extract_struct_value_address, has predicate */
+ /* Skip verify of deprecated_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))
/* 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 */
(long) current_gdbarch->convert_from_func_ptr_addr
/*CONVERT_FROM_FUNC_PTR_ADDR ()*/);
#endif
+#ifdef CONVERT_REGISTER_P
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "CONVERT_REGISTER_P(regnum)",
+ 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 DECR_PC_AFTER_BREAK
fprintf_unfiltered (file,
"gdbarch_dump: DECR_PC_AFTER_BREAK # %s\n",
"gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n",
(long) DECR_PC_AFTER_BREAK);
#endif
+#ifdef DEPRECATED_EXTRACT_RETURN_VALUE
+#if GDB_MULTI_ARCH
+ /* Macro might contain `[{}]' when not multi-arch */
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "DEPRECATED_EXTRACT_RETURN_VALUE(type, regbuf, valbuf)",
+ XSTRING (DEPRECATED_EXTRACT_RETURN_VALUE (type, regbuf, valbuf)));
+#endif
+ if (GDB_MULTI_ARCH)
+ fprintf_unfiltered (file,
+ "gdbarch_dump: DEPRECATED_EXTRACT_RETURN_VALUE = 0x%08lx\n",
+ (long) current_gdbarch->deprecated_extract_return_value
+ /*DEPRECATED_EXTRACT_RETURN_VALUE ()*/);
+#endif
+#ifdef DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(regbuf)",
+ XSTRING (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (regbuf)));
+ if (GDB_MULTI_ARCH)
+ fprintf_unfiltered (file,
+ "gdbarch_dump: DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS = 0x%08lx\n",
+ (long) current_gdbarch->deprecated_extract_struct_value_address
+ /*DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS ()*/);
+#endif
#ifdef DO_REGISTERS_INFO
#if GDB_MULTI_ARCH
/* Macro might contain `[{}]' when not multi-arch */
(long) current_gdbarch->elf_make_msymbol_special
/*ELF_MAKE_MSYMBOL_SPECIAL ()*/);
#endif
-#ifdef EXTRACT_RETURN_VALUE
-#if GDB_MULTI_ARCH
- /* Macro might contain `[{}]' when not multi-arch */
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "EXTRACT_RETURN_VALUE(type, regbuf, valbuf)",
- XSTRING (EXTRACT_RETURN_VALUE (type, regbuf, valbuf)));
-#endif
- if (GDB_MULTI_ARCH)
- fprintf_unfiltered (file,
- "gdbarch_dump: EXTRACT_RETURN_VALUE = 0x%08lx\n",
- (long) current_gdbarch->extract_return_value
- /*EXTRACT_RETURN_VALUE ()*/);
-#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 EXTRA_STACK_ALIGNMENT_NEEDED
fprintf_unfiltered (file,
"gdbarch_dump: EXTRA_STACK_ALIGNMENT_NEEDED # %s\n",
(long) current_gdbarch->memory_remove_breakpoint
/*MEMORY_REMOVE_BREAKPOINT ()*/);
#endif
-#ifdef NNPC_REGNUM
- fprintf_unfiltered (file,
- "gdbarch_dump: NNPC_REGNUM # %s\n",
- XSTRING (NNPC_REGNUM));
- fprintf_unfiltered (file,
- "gdbarch_dump: NNPC_REGNUM = %d\n",
- NNPC_REGNUM);
-#endif
#ifdef NPC_REGNUM
fprintf_unfiltered (file,
"gdbarch_dump: NPC_REGNUM # %s\n",
(long) current_gdbarch->pc_in_call_dummy
/*PC_IN_CALL_DUMMY ()*/);
#endif
+#ifdef PC_IN_SIGTRAMP
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "PC_IN_SIGTRAMP(pc, name)",
+ XSTRING (PC_IN_SIGTRAMP (pc, name)));
+ if (GDB_MULTI_ARCH)
+ fprintf_unfiltered (file,
+ "gdbarch_dump: PC_IN_SIGTRAMP = 0x%08lx\n",
+ (long) current_gdbarch->pc_in_sigtramp
+ /*PC_IN_SIGTRAMP ()*/);
+#endif
#ifdef PC_REGNUM
fprintf_unfiltered (file,
"gdbarch_dump: PC_REGNUM # %s\n",
"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
if (GDB_MULTI_ARCH)
fprintf_unfiltered (file,
- "gdbarch_dump: PRINT_FLOAT_INFO = 0x%08lx\n",
- (long) current_gdbarch->print_float_info
- /*PRINT_FLOAT_INFO ()*/);
-#endif
+ "gdbarch_dump: print_float_info = 0x%08lx\n",
+ (long) current_gdbarch->print_float_info);
#ifdef PROLOGUE_FRAMELESS_P
fprintf_unfiltered (file,
"gdbarch_dump: %s # %s\n",
"gdbarch_dump: REGISTER_SIZE = %d\n",
REGISTER_SIZE);
#endif
+#ifdef REGISTER_TO_VALUE
+#if GDB_MULTI_ARCH
+ /* Macro might contain `[{}]' when not multi-arch */
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "REGISTER_TO_VALUE(regnum, type, from, to)",
+ XSTRING (REGISTER_TO_VALUE (regnum, type, from, to)));
+#endif
+ if (GDB_MULTI_ARCH)
+ fprintf_unfiltered (file,
+ "gdbarch_dump: REGISTER_TO_VALUE = 0x%08lx\n",
+ (long) current_gdbarch->register_to_value
+ /*REGISTER_TO_VALUE ()*/);
+#endif
#ifdef REGISTER_VIRTUAL_SIZE
fprintf_unfiltered (file,
"gdbarch_dump: %s # %s\n",
"gdbarch_dump: USE_STRUCT_CONVENTION = 0x%08lx\n",
(long) current_gdbarch->use_struct_convention
/*USE_STRUCT_CONVENTION ()*/);
+#endif
+#ifdef VALUE_TO_REGISTER
+#if GDB_MULTI_ARCH
+ /* Macro might contain `[{}]' when not multi-arch */
+ fprintf_unfiltered (file,
+ "gdbarch_dump: %s # %s\n",
+ "VALUE_TO_REGISTER(type, regnum, from, to)",
+ XSTRING (VALUE_TO_REGISTER (type, regnum, from, to)));
+#endif
+ if (GDB_MULTI_ARCH)
+ fprintf_unfiltered (file,
+ "gdbarch_dump: VALUE_TO_REGISTER = 0x%08lx\n",
+ (long) current_gdbarch->value_to_register
+ /*VALUE_TO_REGISTER ()*/);
#endif
if (current_gdbarch->dump_tdep != NULL)
current_gdbarch->dump_tdep (current_gdbarch, file);
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;
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;
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");
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");
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");
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");
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");
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");
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");
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");
int
gdbarch_addr_bit (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->addr_bit == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_addr_bit invalid");
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");
int
gdbarch_char_signed (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->char_signed == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_char_signed invalid");
CORE_ADDR
gdbarch_read_pc (struct gdbarch *gdbarch, ptid_t ptid)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->read_pc == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_read_pc invalid");
void
gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR val, ptid_t ptid)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->write_pc == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_write_pc invalid");
CORE_ADDR
gdbarch_read_fp (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->read_fp == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_read_fp invalid");
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");
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");
void
gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->virtual_frame_pointer == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_virtual_frame_pointer invalid");
int
gdbarch_register_read_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
return gdbarch->register_read != 0;
}
void
gdbarch_register_read (struct gdbarch *gdbarch, int regnum, char *buf)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_read == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_read invalid");
int
gdbarch_register_write_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
return gdbarch->register_write != 0;
}
void
gdbarch_register_write (struct gdbarch *gdbarch, int regnum, char *buf)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_write == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_write invalid");
int
gdbarch_num_regs (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->num_regs == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_num_regs invalid");
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");
int
gdbarch_sp_regnum (struct gdbarch *gdbarch)
{
- if (gdbarch->sp_regnum == -1)
- internal_error (__FILE__, __LINE__,
- "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;
int
gdbarch_fp_regnum (struct gdbarch *gdbarch)
{
- if (gdbarch->fp_regnum == -1)
- internal_error (__FILE__, __LINE__,
- "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;
int
gdbarch_pc_regnum (struct gdbarch *gdbarch)
{
- if (gdbarch->pc_regnum == -1)
- internal_error (__FILE__, __LINE__,
- "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;
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");
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");
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");
gdbarch->npc_regnum = npc_regnum;
}
-int
-gdbarch_nnpc_regnum (struct gdbarch *gdbarch)
-{
- /* Skip verify of nnpc_regnum, invalid_p == 0 */
- if (gdbarch_debug >= 2)
- fprintf_unfiltered (gdb_stdlog, "gdbarch_nnpc_regnum called\n");
- return gdbarch->nnpc_regnum;
-}
-
-void
-set_gdbarch_nnpc_regnum (struct gdbarch *gdbarch,
- int nnpc_regnum)
-{
- gdbarch->nnpc_regnum = nnpc_regnum;
-}
-
int
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");
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");
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");
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");
int
gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2_regnr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->dwarf2_reg_to_regnum == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_dwarf2_reg_to_regnum invalid");
gdbarch->dwarf2_reg_to_regnum = dwarf2_reg_to_regnum;
}
-char *
+const char *
gdbarch_register_name (struct gdbarch *gdbarch, int regnr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_name == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_name invalid");
int
gdbarch_register_size (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_size == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_size invalid");
int
gdbarch_register_bytes (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_bytes == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_bytes invalid");
int
gdbarch_register_byte (struct gdbarch *gdbarch, int reg_nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_byte == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_byte invalid");
int
gdbarch_register_raw_size (struct gdbarch *gdbarch, int reg_nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_raw_size == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_raw_size invalid");
int
gdbarch_max_register_raw_size (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->max_register_raw_size == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_max_register_raw_size invalid");
int
gdbarch_register_virtual_size (struct gdbarch *gdbarch, int reg_nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_virtual_size == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_virtual_size invalid");
int
gdbarch_max_register_virtual_size (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->max_register_virtual_size == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_max_register_virtual_size invalid");
struct type *
gdbarch_register_virtual_type (struct gdbarch *gdbarch, int reg_nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_virtual_type == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_virtual_type invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_do_registers_info invalid");
}
void
-gdbarch_print_float_info (struct gdbarch *gdbarch)
+gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame)
{
+ 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 ();
+ gdbarch->print_float_info (gdbarch, file, frame);
}
void
int
gdbarch_register_sim_regno (struct gdbarch *gdbarch, int reg_nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_sim_regno == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_sim_regno invalid");
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");
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");
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");
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");
int
gdbarch_use_generic_dummy_frames (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->use_generic_dummy_frames == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_use_generic_dummy_frames invalid");
int
gdbarch_call_dummy_location (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_location == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_location invalid");
CORE_ADDR
gdbarch_call_dummy_address (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_address == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_address invalid");
CORE_ADDR
gdbarch_call_dummy_start_offset (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_start_offset == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_start_offset invalid");
CORE_ADDR
gdbarch_call_dummy_breakpoint_offset (struct gdbarch *gdbarch)
{
+ 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");
int
gdbarch_call_dummy_breakpoint_offset_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_breakpoint_offset_p == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_breakpoint_offset_p invalid");
int
gdbarch_call_dummy_length (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_length == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_length invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_pc_in_call_dummy invalid");
int
gdbarch_call_dummy_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_p == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_p invalid");
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");
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");
int
gdbarch_call_dummy_stack_adjust_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->call_dummy_stack_adjust_p == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_stack_adjust_p invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_call_dummy_stack_adjust invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_fix_call_dummy invalid");
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");
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");
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;
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;
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_coerce_float_to_double invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_get_saved_register invalid");
int
gdbarch_register_convertible (struct gdbarch *gdbarch, int nr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->register_convertible == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_register_convertible invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_register_convert_to_virtual invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_register_convert_to_raw invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_fetch_pseudo_register invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_store_pseudo_register invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_pointer_to_address invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_address_to_pointer invalid");
int
gdbarch_integer_to_address_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
return gdbarch->integer_to_address != 0;
}
CORE_ADDR
gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, void *buf)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->integer_to_address == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_integer_to_address invalid");
int
gdbarch_return_value_on_stack (struct gdbarch *gdbarch, struct type *type)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->return_value_on_stack == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_return_value_on_stack invalid");
}
void
-gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf)
+gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf)
{
- if (gdbarch->extract_return_value == 0)
+ gdb_assert (gdbarch != NULL);
+ if (gdbarch->deprecated_extract_return_value == 0)
internal_error (__FILE__, __LINE__,
- "gdbarch: gdbarch_extract_return_value invalid");
+ "gdbarch: gdbarch_deprecated_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);
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_extract_return_value called\n");
+ gdbarch->deprecated_extract_return_value (type, regbuf, valbuf);
}
void
-set_gdbarch_extract_return_value (struct gdbarch *gdbarch,
- gdbarch_extract_return_value_ftype extract_return_value)
+set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch,
+ gdbarch_deprecated_extract_return_value_ftype deprecated_extract_return_value)
{
- gdbarch->extract_return_value = extract_return_value;
+ gdbarch->deprecated_extract_return_value = deprecated_extract_return_value;
}
CORE_ADDR
gdbarch_push_arguments (struct gdbarch *gdbarch, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->push_arguments == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_push_arguments invalid");
void
gdbarch_push_dummy_frame (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->push_dummy_frame == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_push_dummy_frame invalid");
int
gdbarch_push_return_address_p (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
return gdbarch->push_return_address != 0;
}
CORE_ADDR
gdbarch_push_return_address (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->push_return_address == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_push_return_address invalid");
void
gdbarch_pop_frame (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->pop_frame == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_pop_frame invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_store_struct_return invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_store_return_value invalid");
}
int
-gdbarch_extract_struct_value_address_p (struct gdbarch *gdbarch)
+gdbarch_deprecated_extract_struct_value_address_p (struct gdbarch *gdbarch)
{
- return gdbarch->extract_struct_value_address != 0;
+ gdb_assert (gdbarch != NULL);
+ return gdbarch->deprecated_extract_struct_value_address != 0;
}
CORE_ADDR
-gdbarch_extract_struct_value_address (struct gdbarch *gdbarch, char *regbuf)
+gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch, char *regbuf)
{
- if (gdbarch->extract_struct_value_address == 0)
+ gdb_assert (gdbarch != NULL);
+ if (gdbarch->deprecated_extract_struct_value_address == 0)
internal_error (__FILE__, __LINE__,
- "gdbarch: gdbarch_extract_struct_value_address invalid");
+ "gdbarch: gdbarch_deprecated_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);
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_extract_struct_value_address called\n");
+ return gdbarch->deprecated_extract_struct_value_address (regbuf);
}
void
-set_gdbarch_extract_struct_value_address (struct gdbarch *gdbarch,
- gdbarch_extract_struct_value_address_ftype extract_struct_value_address)
+set_gdbarch_deprecated_extract_struct_value_address (struct gdbarch *gdbarch,
+ gdbarch_deprecated_extract_struct_value_address_ftype deprecated_extract_struct_value_address)
{
- gdbarch->extract_struct_value_address = extract_struct_value_address;
+ gdbarch->deprecated_extract_struct_value_address = deprecated_extract_struct_value_address;
}
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_use_struct_convention invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_init_saved_regs invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_init_extra_frame_info invalid");
CORE_ADDR
gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->skip_prologue == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_skip_prologue invalid");
int
gdbarch_prologue_frameless_p (struct gdbarch *gdbarch, CORE_ADDR ip)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->prologue_frameless_p == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_prologue_frameless_p invalid");
int
gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->inner_than == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_inner_than invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_breakpoint_from_pc invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_memory_insert_breakpoint invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_memory_remove_breakpoint invalid");
CORE_ADDR
gdbarch_decr_pc_after_break (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->decr_pc_after_break == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_decr_pc_after_break invalid");
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");
CORE_ADDR
gdbarch_function_start_offset (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->function_start_offset == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_function_start_offset invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_remote_translate_xfer_address invalid");
CORE_ADDR
gdbarch_frame_args_skip (struct gdbarch *gdbarch)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->frame_args_skip == -1)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_args_skip invalid");
int
gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->frameless_function_invocation == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_frameless_function_invocation invalid");
CORE_ADDR
gdbarch_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->frame_chain == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_chain invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_chain_valid invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_saved_pc invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_args_address invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_locals_address invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_saved_pc_after_call invalid");
int
gdbarch_frame_num_args (struct gdbarch *gdbarch, struct frame_info *frame)
{
+ gdb_assert (gdbarch != NULL);
if (gdbarch->frame_num_args == 0)
internal_error (__FILE__, __LINE__,
"gdbarch: gdbarch_frame_num_args invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_stack_align invalid");
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");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_reg_struct_has_addr invalid");
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_save_dummy_frame_tos invalid");
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;
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;
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;
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;
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 (__FILE__, __LINE__,
"gdbarch: gdbarch_convert_from_func_ptr_addr invalid");
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");
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");
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");
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");
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");
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");
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");
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");
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");
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");
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");
struct gdbarch_data
{
unsigned index;
+ int init_p;
gdbarch_data_init_ftype *init;
gdbarch_data_free_ftype *free;
};
gdbarch_data_free_ftype *free)
{
struct gdbarch_data_registration **curr;
+ /* Append the new registraration. */
for (curr = &gdbarch_data_registry.registrations;
(*curr) != NULL;
curr = &(*curr)->next);
(*curr)->data = XMALLOC (struct gdbarch_data);
(*curr)->data->index = gdbarch_data_registry.nr++;
(*curr)->data->init = init;
+ (*curr)->data->init_p = 1;
(*curr)->data->free = free;
return (*curr)->data;
}
-/* Walk through all the registered users initializing each in turn. */
-
-static void
-init_gdbarch_data (struct gdbarch *gdbarch)
-{
- struct gdbarch_data_registration *rego;
- 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
}
-/* Initialize the current value of thee specified per-architecture
+/* Initialize the current value of the specified per-architecture
data-pointer. */
void
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]);
+ if (gdbarch->data[data->index] != NULL)
+ {
+ gdb_assert (data->free != NULL);
+ data->free (gdbarch, gdbarch->data[data->index]);
+ }
gdbarch->data[data->index] = pointer;
}
data-pointer. */
void *
-gdbarch_data (struct gdbarch_data *data)
+gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *data)
{
- gdb_assert (data->index < current_gdbarch->nr_data);
- return current_gdbarch->data[data->index];
+ gdb_assert (data->index < gdbarch->nr_data);
+ /* The data-pointer isn't initialized, call init() to get a value but
+ only if the architecture initializaiton has completed. Otherwise
+ punt - hope that the caller knows what they are doing. */
+ if (gdbarch->data[data->index] == NULL
+ && gdbarch->initialized_p)
+ {
+ /* Be careful to detect an initialization cycle. */
+ gdb_assert (data->init_p);
+ data->init_p = 0;
+ gdb_assert (data->init != NULL);
+ gdbarch->data[data->index] = data->init (gdbarch);
+ data->init_p = 1;
+ gdb_assert (gdbarch->data[data->index] != NULL);
+ }
+ return gdbarch->data[data->index];
}
(*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)
(*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)
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 missing parts of the INFO struct using a number of
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);
- architecture_changed_event ();
- return 1;
- }
- }
-
- /* Append this new architecture to this targets list. */
- (*list) = XMALLOC (struct gdbarch_list);
- (*list)->next = NULL;
- (*list)->gdbarch = new_gdbarch;
-
- /* Switch to this new architecture. Dump it out. */
+ /* 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 marking it initialized. */
current_gdbarch = new_gdbarch;
+ current_gdbarch->initialized_p = 1;
if (gdbarch_debug)
{
fprintf_unfiltered (gdb_stdlog,
called. */
init_gdbarch_swap (new_gdbarch);
- /* Initialize the per-architecture data-pointer of all parties that
- registered an interest in this architecture. CURRENT_GDBARCH
+ /* Initialize the per-architecture data. CURRENT_GDBARCH
must be updated before these modules are called. */
- init_gdbarch_data (new_gdbarch);
architecture_changed_event ();
if (gdbarch_debug)
projects / deliverable / binutils-gdb.git / blobdiff