X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbarch.c;h=89223583ac446ad1e20e307f9f15027dc5436435;hb=9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763;hp=c920682074477654a2455dd29c81958929c9bdc3;hpb=08af7a403c41a1622d08134141dd9d7a2405da3e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index c920682074..89223583ac 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -3,8 +3,7 @@ /* Dynamic architecture support for GDB, the GNU debugger. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1998-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -44,7 +43,7 @@ #include "floatformat.h" #include "gdb_assert.h" -#include "gdb_string.h" +#include #include "reggroups.h" #include "osabi.h" #include "gdb_obstack.h" @@ -87,6 +86,35 @@ pstring (const char *string) return string; } +/* Helper function to print a list of strings, represented as "const + char *const *". The list is printed comma-separated. */ + +static char * +pstring_list (const char *const *list) +{ + static char ret[100]; + const char *const *p; + size_t offset = 0; + + if (list == NULL) + return "(null)"; + + ret[0] = '\0'; + for (p = list; *p != NULL && offset < sizeof (ret); ++p) + { + size_t s = xsnprintf (ret + offset, sizeof (ret) - offset, "%s, ", *p); + offset += 2 + s; + } + + if (offset > 0) + { + gdb_assert (offset - 2 < sizeof (ret)); + ret[offset - 2] = '\0'; + } + + return ret; +} + /* Maintain the struct gdbarch object. */ @@ -100,8 +128,8 @@ struct gdbarch /* basic architectural information. */ const struct bfd_arch_info * bfd_arch_info; - int byte_order; - int byte_order_for_code; + enum bfd_endian byte_order; + enum bfd_endian byte_order_for_code; enum gdb_osabi osabi; const struct target_desc * target_desc; @@ -113,9 +141,6 @@ struct gdbarch unsigned nr_data; void **data; - /* per-architecture swap-regions. */ - struct gdbarch_swap *swap; - /* Multi-arch values. When extending this structure you must: @@ -204,6 +229,7 @@ struct gdbarch gdbarch_return_in_first_hidden_param_p_ftype *return_in_first_hidden_param_p; gdbarch_skip_prologue_ftype *skip_prologue; gdbarch_skip_main_prologue_ftype *skip_main_prologue; + gdbarch_skip_entrypoint_ftype *skip_entrypoint; gdbarch_inner_than_ftype *inner_than; gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; gdbarch_remote_breakpoint_from_pc_ftype *remote_breakpoint_from_pc; @@ -223,7 +249,6 @@ struct gdbarch int frame_red_zone_size; 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_single_step_through_delay_ftype *single_step_through_delay; gdbarch_print_insn_ftype *print_insn; @@ -243,8 +268,10 @@ struct gdbarch gdbarch_regset_from_core_section_ftype *regset_from_core_section; struct core_regset_section * core_regset_sections; gdbarch_make_corefile_notes_ftype *make_corefile_notes; + gdbarch_elfcore_write_linux_prpsinfo_ftype *elfcore_write_linux_prpsinfo; gdbarch_find_memory_regions_ftype *find_memory_regions; gdbarch_core_xfer_shared_libraries_ftype *core_xfer_shared_libraries; + gdbarch_core_xfer_shared_libraries_aix_ftype *core_xfer_shared_libraries_aix; gdbarch_core_pid_to_str_ftype *core_pid_to_str; const char * gcore_bfd_target; int vtable_function_descriptors; @@ -264,15 +291,16 @@ struct gdbarch gdbarch_process_record_ftype *process_record; gdbarch_process_record_signal_ftype *process_record_signal; gdbarch_gdb_signal_from_target_ftype *gdb_signal_from_target; + gdbarch_gdb_signal_to_target_ftype *gdb_signal_to_target; gdbarch_get_siginfo_type_ftype *get_siginfo_type; gdbarch_record_special_symbol_ftype *record_special_symbol; gdbarch_get_syscall_number_ftype *get_syscall_number; - const char * stap_integer_prefix; - const char * stap_integer_suffix; - const char * stap_register_prefix; - const char * stap_register_suffix; - const char * stap_register_indirection_prefix; - const char * stap_register_indirection_suffix; + const char *const * stap_integer_prefixes; + const char *const * stap_integer_suffixes; + const char *const * stap_register_prefixes; + const char *const * stap_register_suffixes; + const char *const * stap_register_indirection_prefixes; + const char *const * stap_register_indirection_suffixes; const char * stap_gdb_register_prefix; const char * stap_gdb_register_suffix; gdbarch_stap_is_single_operand_ftype *stap_is_single_operand; @@ -287,7 +315,12 @@ struct gdbarch int has_dos_based_file_system; gdbarch_gen_return_address_ftype *gen_return_address; gdbarch_info_proc_ftype *info_proc; + gdbarch_core_info_proc_ftype *core_info_proc; gdbarch_iterate_over_objfiles_in_search_order_ftype *iterate_over_objfiles_in_search_order; + struct ravenscar_arch_ops * ravenscar_ops; + gdbarch_insn_is_call_ftype *insn_is_call; + gdbarch_insn_is_ret_ftype *insn_is_ret; + gdbarch_insn_is_jump_ftype *insn_is_jump; }; @@ -308,8 +341,8 @@ struct gdbarch startup_gdbarch = 0, /* target_desc */ /* target specific vector and its dump routine. */ NULL, NULL, - /*per-architecture data-pointers and swap regions. */ - 0, NULL, NULL, + /*per-architecture data-pointers. */ + 0, NULL, /* Multi-arch values */ 1, /* bits_big_endian */ 8 * sizeof (short), /* short_bit */ @@ -373,6 +406,7 @@ struct gdbarch startup_gdbarch = default_return_in_first_hidden_param_p, /* return_in_first_hidden_param_p */ 0, /* skip_prologue */ 0, /* skip_main_prologue */ + 0, /* skip_entrypoint */ 0, /* inner_than */ 0, /* breakpoint_from_pc */ default_remote_breakpoint_from_pc, /* remote_breakpoint_from_pc */ @@ -392,7 +426,6 @@ struct gdbarch startup_gdbarch = 0, /* frame_red_zone_size */ convert_from_func_ptr_addr_identity, /* convert_from_func_ptr_addr */ core_addr_identity, /* addr_bits_remove */ - core_addr_identity, /* smash_text_address */ 0, /* software_single_step */ 0, /* single_step_through_delay */ 0, /* print_insn */ @@ -412,8 +445,10 @@ struct gdbarch startup_gdbarch = 0, /* regset_from_core_section */ 0, /* core_regset_sections */ 0, /* make_corefile_notes */ + 0, /* elfcore_write_linux_prpsinfo */ 0, /* find_memory_regions */ 0, /* core_xfer_shared_libraries */ + 0, /* core_xfer_shared_libraries_aix */ 0, /* core_pid_to_str */ 0, /* gcore_bfd_target */ 0, /* vtable_function_descriptors */ @@ -433,15 +468,16 @@ struct gdbarch startup_gdbarch = 0, /* process_record */ 0, /* process_record_signal */ 0, /* gdb_signal_from_target */ + 0, /* gdb_signal_to_target */ 0, /* get_siginfo_type */ 0, /* record_special_symbol */ 0, /* get_syscall_number */ - 0, /* stap_integer_prefix */ - 0, /* stap_integer_suffix */ - 0, /* stap_register_prefix */ - 0, /* stap_register_suffix */ - 0, /* stap_register_indirection_prefix */ - 0, /* stap_register_indirection_suffix */ + 0, /* stap_integer_prefixes */ + 0, /* stap_integer_suffixes */ + 0, /* stap_register_prefixes */ + 0, /* stap_register_suffixes */ + 0, /* stap_register_indirection_prefixes */ + 0, /* stap_register_indirection_suffixes */ 0, /* stap_gdb_register_prefix */ 0, /* stap_gdb_register_suffix */ 0, /* stap_is_single_operand */ @@ -456,11 +492,15 @@ struct gdbarch startup_gdbarch = 0, /* has_dos_based_file_system */ default_gen_return_address, /* gen_return_address */ 0, /* info_proc */ + 0, /* core_info_proc */ default_iterate_over_objfiles_in_search_order, /* iterate_over_objfiles_in_search_order */ + NULL, /* ravenscar_ops */ + default_insn_is_call, /* insn_is_call */ + default_insn_is_ret, /* insn_is_ret */ + default_insn_is_jump, /* insn_is_jump */ /* startup_gdbarch() */ }; -struct gdbarch *target_gdbarch = &startup_gdbarch; /* Create a new ``struct gdbarch'' based on information provided by ``struct gdbarch_info''. */ @@ -473,7 +513,7 @@ gdbarch_alloc (const struct gdbarch_info *info, /* Create an obstack for allocating all the per-architecture memory, then use that to allocate the architecture vector. */ - struct obstack *obstack = XMALLOC (struct obstack); + struct obstack *obstack = XNEW (struct obstack); obstack_init (obstack); gdbarch = obstack_alloc (obstack, sizeof (*gdbarch)); memset (gdbarch, 0, sizeof (*gdbarch)); @@ -530,7 +570,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr; gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity; gdbarch->addr_bits_remove = core_addr_identity; - gdbarch->smash_text_address = core_addr_identity; gdbarch->skip_trampoline_code = generic_skip_trampoline_code; gdbarch->skip_solib_resolver = generic_skip_solib_resolver; gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline; @@ -549,6 +588,10 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->auto_wide_charset = default_auto_wide_charset; gdbarch->gen_return_address = default_gen_return_address; gdbarch->iterate_over_objfiles_in_search_order = default_iterate_over_objfiles_in_search_order; + gdbarch->ravenscar_ops = NULL; + gdbarch->insn_is_call = default_insn_is_call; + gdbarch->insn_is_ret = default_insn_is_ret; + gdbarch->insn_is_jump = default_insn_is_jump; /* gdbarch_alloc() */ return gdbarch; @@ -673,6 +716,7 @@ verify_gdbarch (struct gdbarch *gdbarch) if (gdbarch->skip_prologue == 0) fprintf_unfiltered (log, "\n\tskip_prologue"); /* Skip verify of skip_main_prologue, has predicate. */ + /* Skip verify of skip_entrypoint, has predicate. */ if (gdbarch->inner_than == 0) fprintf_unfiltered (log, "\n\tinner_than"); if (gdbarch->breakpoint_from_pc == 0) @@ -693,7 +737,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of stabs_argument_has_addr, invalid_p == 0 */ /* Skip verify of convert_from_func_ptr_addr, invalid_p == 0 */ /* Skip verify of addr_bits_remove, invalid_p == 0 */ - /* Skip verify of smash_text_address, invalid_p == 0 */ /* Skip verify of software_single_step, has predicate. */ /* Skip verify of single_step_through_delay, has predicate. */ if (gdbarch->print_insn == 0) @@ -713,8 +756,10 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of fetch_pointer_argument, has predicate. */ /* Skip verify of regset_from_core_section, has predicate. */ /* Skip verify of make_corefile_notes, has predicate. */ + /* Skip verify of elfcore_write_linux_prpsinfo, has predicate. */ /* Skip verify of find_memory_regions, has predicate. */ /* Skip verify of core_xfer_shared_libraries, has predicate. */ + /* Skip verify of core_xfer_shared_libraries_aix, has predicate. */ /* Skip verify of core_pid_to_str, has predicate. */ /* Skip verify of gcore_bfd_target, has predicate. */ /* Skip verify of vtable_function_descriptors, invalid_p == 0 */ @@ -736,15 +781,16 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of process_record, has predicate. */ /* Skip verify of process_record_signal, has predicate. */ /* Skip verify of gdb_signal_from_target, has predicate. */ + /* Skip verify of gdb_signal_to_target, has predicate. */ /* Skip verify of get_siginfo_type, has predicate. */ /* Skip verify of record_special_symbol, has predicate. */ /* Skip verify of get_syscall_number, has predicate. */ - /* Skip verify of stap_integer_prefix, invalid_p == 0 */ - /* Skip verify of stap_integer_suffix, invalid_p == 0 */ - /* Skip verify of stap_register_prefix, invalid_p == 0 */ - /* Skip verify of stap_register_suffix, invalid_p == 0 */ - /* Skip verify of stap_register_indirection_prefix, invalid_p == 0 */ - /* Skip verify of stap_register_indirection_suffix, invalid_p == 0 */ + /* Skip verify of stap_integer_prefixes, invalid_p == 0 */ + /* Skip verify of stap_integer_suffixes, invalid_p == 0 */ + /* Skip verify of stap_register_prefixes, invalid_p == 0 */ + /* Skip verify of stap_register_suffixes, invalid_p == 0 */ + /* Skip verify of stap_register_indirection_prefixes, invalid_p == 0 */ + /* Skip verify of stap_register_indirection_suffixes, invalid_p == 0 */ /* Skip verify of stap_gdb_register_prefix, invalid_p == 0 */ /* Skip verify of stap_gdb_register_suffix, invalid_p == 0 */ /* Skip verify of stap_is_single_operand, has predicate. */ @@ -758,7 +804,12 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of has_dos_based_file_system, invalid_p == 0 */ /* Skip verify of gen_return_address, invalid_p == 0 */ /* Skip verify of info_proc, has predicate. */ + /* Skip verify of core_info_proc, has predicate. */ /* Skip verify of iterate_over_objfiles_in_search_order, invalid_p == 0 */ + /* Skip verify of ravenscar_ops, invalid_p == 0 */ + /* Skip verify of insn_is_call, invalid_p == 0 */ + /* Skip verify of insn_is_ret, invalid_p == 0 */ + /* Skip verify of insn_is_jump, invalid_p == 0 */ buf = ui_file_xstrdup (log, &length); make_cleanup (xfree, buf); if (length > 0) @@ -875,6 +926,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: convert_register_p = <%s>\n", host_address_to_string (gdbarch->convert_register_p)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_core_info_proc_p() = %d\n", + gdbarch_core_info_proc_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: core_info_proc = <%s>\n", + host_address_to_string (gdbarch->core_info_proc)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_core_pid_to_str_p() = %d\n", gdbarch_core_pid_to_str_p (gdbarch)); @@ -896,6 +953,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: core_xfer_shared_libraries = <%s>\n", host_address_to_string (gdbarch->core_xfer_shared_libraries)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_core_xfer_shared_libraries_aix_p() = %d\n", + gdbarch_core_xfer_shared_libraries_aix_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: core_xfer_shared_libraries_aix = <%s>\n", + host_address_to_string (gdbarch->core_xfer_shared_libraries_aix)); fprintf_unfiltered (file, "gdbarch_dump: decr_pc_after_break = %s\n", core_addr_to_string_nz (gdbarch->decr_pc_after_break)); @@ -950,6 +1013,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: elf_make_msymbol_special = <%s>\n", host_address_to_string (gdbarch->elf_make_msymbol_special)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_elfcore_write_linux_prpsinfo_p() = %d\n", + gdbarch_elfcore_write_linux_prpsinfo_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: elfcore_write_linux_prpsinfo = <%s>\n", + host_address_to_string (gdbarch->elfcore_write_linux_prpsinfo)); fprintf_unfiltered (file, "gdbarch_dump: fast_tracepoint_valid_at = <%s>\n", host_address_to_string (gdbarch->fast_tracepoint_valid_at)); @@ -1010,6 +1079,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: gdb_signal_from_target = <%s>\n", host_address_to_string (gdbarch->gdb_signal_from_target)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_gdb_signal_to_target_p() = %d\n", + gdbarch_gdb_signal_to_target_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: gdb_signal_to_target = <%s>\n", + host_address_to_string (gdbarch->gdb_signal_to_target)); fprintf_unfiltered (file, "gdbarch_dump: gen_return_address = <%s>\n", host_address_to_string (gdbarch->gen_return_address)); @@ -1067,6 +1142,15 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: inner_than = <%s>\n", host_address_to_string (gdbarch->inner_than)); + fprintf_unfiltered (file, + "gdbarch_dump: insn_is_call = <%s>\n", + host_address_to_string (gdbarch->insn_is_call)); + fprintf_unfiltered (file, + "gdbarch_dump: insn_is_jump = <%s>\n", + host_address_to_string (gdbarch->insn_is_jump)); + fprintf_unfiltered (file, + "gdbarch_dump: insn_is_ret = <%s>\n", + host_address_to_string (gdbarch->insn_is_ret)); fprintf_unfiltered (file, "gdbarch_dump: int_bit = %s\n", plongest (gdbarch->int_bit)); @@ -1199,6 +1283,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: push_dummy_code = <%s>\n", host_address_to_string (gdbarch->push_dummy_code)); + fprintf_unfiltered (file, + "gdbarch_dump: ravenscar_ops = %s\n", + host_address_to_string (gdbarch->ravenscar_ops)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_read_pc_p() = %d\n", gdbarch_read_pc_p (gdbarch)); @@ -1268,6 +1355,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: single_step_through_delay = <%s>\n", host_address_to_string (gdbarch->single_step_through_delay)); + fprintf_unfiltered (file, + "gdbarch_dump: gdbarch_skip_entrypoint_p() = %d\n", + gdbarch_skip_entrypoint_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: skip_entrypoint = <%s>\n", + host_address_to_string (gdbarch->skip_entrypoint)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_skip_main_prologue_p() = %d\n", gdbarch_skip_main_prologue_p (gdbarch)); @@ -1289,9 +1382,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: skip_trampoline_code = <%s>\n", host_address_to_string (gdbarch->skip_trampoline_code)); - fprintf_unfiltered (file, - "gdbarch_dump: smash_text_address = <%s>\n", - host_address_to_string (gdbarch->smash_text_address)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_software_single_step_p() = %d\n", gdbarch_software_single_step_p (gdbarch)); @@ -1320,11 +1410,11 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: stap_gdb_register_suffix = %s\n", pstring (gdbarch->stap_gdb_register_suffix)); fprintf_unfiltered (file, - "gdbarch_dump: stap_integer_prefix = %s\n", - pstring (gdbarch->stap_integer_prefix)); + "gdbarch_dump: stap_integer_prefixes = %s\n", + pstring_list (gdbarch->stap_integer_prefixes)); fprintf_unfiltered (file, - "gdbarch_dump: stap_integer_suffix = %s\n", - pstring (gdbarch->stap_integer_suffix)); + "gdbarch_dump: stap_integer_suffixes = %s\n", + pstring_list (gdbarch->stap_integer_suffixes)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_stap_is_single_operand_p() = %d\n", gdbarch_stap_is_single_operand_p (gdbarch)); @@ -1338,17 +1428,17 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: stap_parse_special_token = <%s>\n", host_address_to_string (gdbarch->stap_parse_special_token)); fprintf_unfiltered (file, - "gdbarch_dump: stap_register_indirection_prefix = %s\n", - pstring (gdbarch->stap_register_indirection_prefix)); + "gdbarch_dump: stap_register_indirection_prefixes = %s\n", + pstring_list (gdbarch->stap_register_indirection_prefixes)); fprintf_unfiltered (file, - "gdbarch_dump: stap_register_indirection_suffix = %s\n", - pstring (gdbarch->stap_register_indirection_suffix)); + "gdbarch_dump: stap_register_indirection_suffixes = %s\n", + pstring_list (gdbarch->stap_register_indirection_suffixes)); fprintf_unfiltered (file, - "gdbarch_dump: stap_register_prefix = %s\n", - pstring (gdbarch->stap_register_prefix)); + "gdbarch_dump: stap_register_prefixes = %s\n", + pstring_list (gdbarch->stap_register_prefixes)); fprintf_unfiltered (file, - "gdbarch_dump: stap_register_suffix = %s\n", - pstring (gdbarch->stap_register_suffix)); + "gdbarch_dump: stap_register_suffixes = %s\n", + pstring_list (gdbarch->stap_register_suffixes)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_static_transform_name_p() = %d\n", gdbarch_static_transform_name_p (gdbarch)); @@ -1413,7 +1503,7 @@ gdbarch_bfd_arch_info (struct gdbarch *gdbarch) return gdbarch->bfd_arch_info; } -int +enum bfd_endian gdbarch_byte_order (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -1422,7 +1512,7 @@ gdbarch_byte_order (struct gdbarch *gdbarch) return gdbarch->byte_order; } -int +enum bfd_endian gdbarch_byte_order_for_code (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -2621,6 +2711,30 @@ set_gdbarch_skip_main_prologue (struct gdbarch *gdbarch, gdbarch->skip_main_prologue = skip_main_prologue; } +int +gdbarch_skip_entrypoint_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->skip_entrypoint != NULL; +} + +CORE_ADDR +gdbarch_skip_entrypoint (struct gdbarch *gdbarch, CORE_ADDR ip) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->skip_entrypoint != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_entrypoint called\n"); + return gdbarch->skip_entrypoint (gdbarch, ip); +} + +void +set_gdbarch_skip_entrypoint (struct gdbarch *gdbarch, + gdbarch_skip_entrypoint_ftype skip_entrypoint) +{ + gdbarch->skip_entrypoint = skip_entrypoint; +} + int gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs) { @@ -2985,23 +3099,6 @@ set_gdbarch_addr_bits_remove (struct gdbarch *gdbarch, gdbarch->addr_bits_remove = addr_bits_remove; } -CORE_ADDR -gdbarch_smash_text_address (struct gdbarch *gdbarch, CORE_ADDR addr) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->smash_text_address != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_smash_text_address called\n"); - return gdbarch->smash_text_address (gdbarch, 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) { @@ -3380,6 +3477,30 @@ set_gdbarch_make_corefile_notes (struct gdbarch *gdbarch, gdbarch->make_corefile_notes = make_corefile_notes; } +int +gdbarch_elfcore_write_linux_prpsinfo_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->elfcore_write_linux_prpsinfo != NULL; +} + +char * +gdbarch_elfcore_write_linux_prpsinfo (struct gdbarch *gdbarch, bfd *obfd, char *note_data, int *note_size, const struct elf_internal_linux_prpsinfo *info) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->elfcore_write_linux_prpsinfo != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_elfcore_write_linux_prpsinfo called\n"); + return gdbarch->elfcore_write_linux_prpsinfo (obfd, note_data, note_size, info); +} + +void +set_gdbarch_elfcore_write_linux_prpsinfo (struct gdbarch *gdbarch, + gdbarch_elfcore_write_linux_prpsinfo_ftype elfcore_write_linux_prpsinfo) +{ + gdbarch->elfcore_write_linux_prpsinfo = elfcore_write_linux_prpsinfo; +} + int gdbarch_find_memory_regions_p (struct gdbarch *gdbarch) { @@ -3411,8 +3532,8 @@ gdbarch_core_xfer_shared_libraries_p (struct gdbarch *gdbarch) return gdbarch->core_xfer_shared_libraries != NULL; } -LONGEST -gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, LONGEST len) +ULONGEST +gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->core_xfer_shared_libraries != NULL); @@ -3428,6 +3549,30 @@ set_gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdbarch->core_xfer_shared_libraries = core_xfer_shared_libraries; } +int +gdbarch_core_xfer_shared_libraries_aix_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->core_xfer_shared_libraries_aix != NULL; +} + +ULONGEST +gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->core_xfer_shared_libraries_aix != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_xfer_shared_libraries_aix called\n"); + return gdbarch->core_xfer_shared_libraries_aix (gdbarch, readbuf, offset, len); +} + +void +set_gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, + gdbarch_core_xfer_shared_libraries_aix_ftype core_xfer_shared_libraries_aix) +{ + gdbarch->core_xfer_shared_libraries_aix = core_xfer_shared_libraries_aix; +} + int gdbarch_core_pid_to_str_p (struct gdbarch *gdbarch) { @@ -3846,6 +3991,30 @@ set_gdbarch_gdb_signal_from_target (struct gdbarch *gdbarch, gdbarch->gdb_signal_from_target = gdb_signal_from_target; } +int +gdbarch_gdb_signal_to_target_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->gdb_signal_to_target != NULL; +} + +int +gdbarch_gdb_signal_to_target (struct gdbarch *gdbarch, enum gdb_signal signal) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->gdb_signal_to_target != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_gdb_signal_to_target called\n"); + return gdbarch->gdb_signal_to_target (gdbarch, signal); +} + +void +set_gdbarch_gdb_signal_to_target (struct gdbarch *gdbarch, + gdbarch_gdb_signal_to_target_ftype gdb_signal_to_target) +{ + gdbarch->gdb_signal_to_target = gdb_signal_to_target; +} + int gdbarch_get_siginfo_type_p (struct gdbarch *gdbarch) { @@ -3918,106 +4087,106 @@ set_gdbarch_get_syscall_number (struct gdbarch *gdbarch, gdbarch->get_syscall_number = get_syscall_number; } -const char * -gdbarch_stap_integer_prefix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_integer_prefix, invalid_p == 0 */ + /* Skip verify of stap_integer_prefixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_integer_prefix called\n"); - return gdbarch->stap_integer_prefix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_integer_prefixes called\n"); + return gdbarch->stap_integer_prefixes; } void -set_gdbarch_stap_integer_prefix (struct gdbarch *gdbarch, - const char * stap_integer_prefix) +set_gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch, + const char *const * stap_integer_prefixes) { - gdbarch->stap_integer_prefix = stap_integer_prefix; + gdbarch->stap_integer_prefixes = stap_integer_prefixes; } -const char * -gdbarch_stap_integer_suffix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_integer_suffix, invalid_p == 0 */ + /* Skip verify of stap_integer_suffixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_integer_suffix called\n"); - return gdbarch->stap_integer_suffix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_integer_suffixes called\n"); + return gdbarch->stap_integer_suffixes; } void -set_gdbarch_stap_integer_suffix (struct gdbarch *gdbarch, - const char * stap_integer_suffix) +set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch, + const char *const * stap_integer_suffixes) { - gdbarch->stap_integer_suffix = stap_integer_suffix; + gdbarch->stap_integer_suffixes = stap_integer_suffixes; } -const char * -gdbarch_stap_register_prefix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_register_prefixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_register_prefix, invalid_p == 0 */ + /* Skip verify of stap_register_prefixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_prefix called\n"); - return gdbarch->stap_register_prefix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_prefixes called\n"); + return gdbarch->stap_register_prefixes; } void -set_gdbarch_stap_register_prefix (struct gdbarch *gdbarch, - const char * stap_register_prefix) +set_gdbarch_stap_register_prefixes (struct gdbarch *gdbarch, + const char *const * stap_register_prefixes) { - gdbarch->stap_register_prefix = stap_register_prefix; + gdbarch->stap_register_prefixes = stap_register_prefixes; } -const char * -gdbarch_stap_register_suffix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_register_suffixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_register_suffix, invalid_p == 0 */ + /* Skip verify of stap_register_suffixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_suffix called\n"); - return gdbarch->stap_register_suffix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_suffixes called\n"); + return gdbarch->stap_register_suffixes; } void -set_gdbarch_stap_register_suffix (struct gdbarch *gdbarch, - const char * stap_register_suffix) +set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch, + const char *const * stap_register_suffixes) { - gdbarch->stap_register_suffix = stap_register_suffix; + gdbarch->stap_register_suffixes = stap_register_suffixes; } -const char * -gdbarch_stap_register_indirection_prefix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_register_indirection_prefix, invalid_p == 0 */ + /* Skip verify of stap_register_indirection_prefixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_indirection_prefix called\n"); - return gdbarch->stap_register_indirection_prefix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_indirection_prefixes called\n"); + return gdbarch->stap_register_indirection_prefixes; } void -set_gdbarch_stap_register_indirection_prefix (struct gdbarch *gdbarch, - const char * stap_register_indirection_prefix) +set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch, + const char *const * stap_register_indirection_prefixes) { - gdbarch->stap_register_indirection_prefix = stap_register_indirection_prefix; + gdbarch->stap_register_indirection_prefixes = stap_register_indirection_prefixes; } -const char * -gdbarch_stap_register_indirection_suffix (struct gdbarch *gdbarch) +const char *const * +gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of stap_register_indirection_suffix, invalid_p == 0 */ + /* Skip verify of stap_register_indirection_suffixes, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_indirection_suffix called\n"); - return gdbarch->stap_register_indirection_suffix; + fprintf_unfiltered (gdb_stdlog, "gdbarch_stap_register_indirection_suffixes called\n"); + return gdbarch->stap_register_indirection_suffixes; } void -set_gdbarch_stap_register_indirection_suffix (struct gdbarch *gdbarch, - const char * stap_register_indirection_suffix) +set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch, + const char *const * stap_register_indirection_suffixes) { - gdbarch->stap_register_indirection_suffix = stap_register_indirection_suffix; + gdbarch->stap_register_indirection_suffixes = stap_register_indirection_suffixes; } const char * @@ -4278,6 +4447,30 @@ set_gdbarch_info_proc (struct gdbarch *gdbarch, gdbarch->info_proc = info_proc; } +int +gdbarch_core_info_proc_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->core_info_proc != NULL; +} + +void +gdbarch_core_info_proc (struct gdbarch *gdbarch, char *args, enum info_proc_what what) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->core_info_proc != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_info_proc called\n"); + gdbarch->core_info_proc (gdbarch, args, what); +} + +void +set_gdbarch_core_info_proc (struct gdbarch *gdbarch, + gdbarch_core_info_proc_ftype core_info_proc) +{ + gdbarch->core_info_proc = core_info_proc; +} + void gdbarch_iterate_over_objfiles_in_search_order (struct gdbarch *gdbarch, iterate_over_objfiles_in_search_order_cb_ftype *cb, void *cb_data, struct objfile *current_objfile) { @@ -4295,6 +4488,74 @@ set_gdbarch_iterate_over_objfiles_in_search_order (struct gdbarch *gdbarch, gdbarch->iterate_over_objfiles_in_search_order = iterate_over_objfiles_in_search_order; } +struct ravenscar_arch_ops * +gdbarch_ravenscar_ops (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of ravenscar_ops, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_ravenscar_ops called\n"); + return gdbarch->ravenscar_ops; +} + +void +set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch, + struct ravenscar_arch_ops * ravenscar_ops) +{ + gdbarch->ravenscar_ops = ravenscar_ops; +} + +int +gdbarch_insn_is_call (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->insn_is_call != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_is_call called\n"); + return gdbarch->insn_is_call (gdbarch, addr); +} + +void +set_gdbarch_insn_is_call (struct gdbarch *gdbarch, + gdbarch_insn_is_call_ftype insn_is_call) +{ + gdbarch->insn_is_call = insn_is_call; +} + +int +gdbarch_insn_is_ret (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->insn_is_ret != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_is_ret called\n"); + return gdbarch->insn_is_ret (gdbarch, addr); +} + +void +set_gdbarch_insn_is_ret (struct gdbarch *gdbarch, + gdbarch_insn_is_ret_ftype insn_is_ret) +{ + gdbarch->insn_is_ret = insn_is_ret; +} + +int +gdbarch_insn_is_jump (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->insn_is_jump != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_is_jump called\n"); + return gdbarch->insn_is_jump (gdbarch, addr); +} + +void +set_gdbarch_insn_is_jump (struct gdbarch *gdbarch, + gdbarch_insn_is_jump_ftype insn_is_jump) +{ + gdbarch->insn_is_jump = insn_is_jump; +} + /* Keep a registry of per-architecture data-pointers required by GDB modules. */ @@ -4334,9 +4595,9 @@ gdbarch_data_register (gdbarch_data_pre_init_ftype *pre_init, for (curr = &gdbarch_data_registry.registrations; (*curr) != NULL; curr = &(*curr)->next); - (*curr) = XMALLOC (struct gdbarch_data_registration); + (*curr) = XNEW (struct gdbarch_data_registration); (*curr)->next = NULL; - (*curr)->data = XMALLOC (struct gdbarch_data); + (*curr)->data = XNEW (struct gdbarch_data); (*curr)->data->index = gdbarch_data_registry.nr++; (*curr)->data->pre_init = pre_init; (*curr)->data->post_init = post_init; @@ -4505,7 +4766,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture, bfd_arch_info->printable_name, host_address_to_string (init)); /* Append it */ - (*curr) = XMALLOC (struct gdbarch_registration); + (*curr) = XNEW (struct gdbarch_registration); (*curr)->bfd_architecture = bfd_architecture; (*curr)->init = init; (*curr)->dump_tdep = dump_tdep; @@ -4649,7 +4910,7 @@ gdbarch_find_by_info (struct gdbarch_info info) /* Insert the new architecture into the front of the architecture list (keep the list sorted Most Recently Used). */ { - struct gdbarch_list *this = XMALLOC (struct gdbarch_list); + struct gdbarch_list *this = XNEW (struct gdbarch_list); this->next = rego->arches; this->gdbarch = new_gdbarch; rego->arches = this; @@ -4670,15 +4931,23 @@ gdbarch_find_by_info (struct gdbarch_info info) /* Make the specified architecture current. */ void -deprecated_target_gdbarch_select_hack (struct gdbarch *new_gdbarch) +set_target_gdbarch (struct gdbarch *new_gdbarch) { gdb_assert (new_gdbarch != NULL); gdb_assert (new_gdbarch->initialized_p); - target_gdbarch = new_gdbarch; + current_inferior ()->gdbarch = new_gdbarch; observer_notify_architecture_changed (new_gdbarch); registers_changed (); } +/* Return the current inferior's arch. */ + +struct gdbarch * +target_gdbarch (void) +{ + return current_inferior ()->gdbarch; +} + extern void _initialize_gdbarch (void); void