X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbarch.c;h=e2abf263b3a97910dab25dafaa374f9d2d756c16;hb=e418a61a67a3476826259163383e5deb661042cc;hp=41c086685d7494c8f9477e882af5d879115ab5f6;hpb=b41c5a85a734b9ca813d4a314b66ef4b4b4d1b11;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 41c086685d..e2abf263b3 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -3,7 +3,7 @@ /* Dynamic architecture support for GDB, the GNU debugger. - Copyright (C) 1998-2017 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -44,7 +44,7 @@ #include "reggroups.h" #include "osabi.h" #include "gdb_obstack.h" -#include "observer.h" +#include "observable.h" #include "regcache.h" #include "objfiles.h" #include "auxv.h" @@ -175,7 +175,6 @@ struct gdbarch int int_bit; int long_bit; int long_long_bit; - int long_long_align_bit; int half_bit; const struct floatformat ** half_format; int float_bit; @@ -259,12 +258,14 @@ 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; + int significant_addr_bit; gdbarch_software_single_step_ftype *software_single_step; gdbarch_single_step_through_delay_ftype *single_step_through_delay; gdbarch_print_insn_ftype *print_insn; gdbarch_skip_trampoline_code_ftype *skip_trampoline_code; gdbarch_skip_solib_resolver_ftype *skip_solib_resolver; gdbarch_in_solib_return_trampoline_ftype *in_solib_return_trampoline; + gdbarch_in_indirect_branch_thunk_ftype *in_indirect_branch_thunk; gdbarch_stack_frame_destroyed_p_ftype *stack_frame_destroyed_p; gdbarch_elf_make_msymbol_special_ftype *elf_make_msymbol_special; gdbarch_coff_make_msymbol_special_ftype *coff_make_msymbol_special; @@ -281,12 +282,12 @@ struct gdbarch gdbarch_fetch_pointer_argument_ftype *fetch_pointer_argument; gdbarch_iterate_over_regset_sections_ftype *iterate_over_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; gdbarch_core_thread_name_ftype *core_thread_name; + gdbarch_core_xfer_siginfo_ftype *core_xfer_siginfo; const char * gcore_bfd_target; int vtable_function_descriptors; int vbit_in_delta; @@ -295,7 +296,6 @@ struct gdbarch gdbarch_displaced_step_copy_insn_ftype *displaced_step_copy_insn; gdbarch_displaced_step_hw_singlestep_ftype *displaced_step_hw_singlestep; gdbarch_displaced_step_fixup_ftype *displaced_step_fixup; - gdbarch_displaced_step_free_closure_ftype *displaced_step_free_closure; gdbarch_displaced_step_location_ftype *displaced_step_location; gdbarch_relocate_instruction_ftype *relocate_instruction; gdbarch_overlay_update_ftype *overlay_update; @@ -350,8 +350,10 @@ struct gdbarch gdbarch_gcc_target_options_ftype *gcc_target_options; gdbarch_gnu_triplet_regexp_ftype *gnu_triplet_regexp; gdbarch_addressable_memory_unit_size_ftype *addressable_memory_unit_size; + const char * disassembler_options_implicit; char ** disassembler_options; - const disasm_options_t * valid_disassembler_options; + const disasm_options_and_args_t * valid_disassembler_options; + gdbarch_type_align_ftype *type_align; }; /* Create a new ``struct gdbarch'' based on information provided by @@ -387,7 +389,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->int_bit = 4*TARGET_CHAR_BIT; gdbarch->long_bit = 4*TARGET_CHAR_BIT; gdbarch->long_long_bit = 2*gdbarch->long_bit; - gdbarch->long_long_align_bit = 2*gdbarch->long_bit; gdbarch->half_bit = 2*TARGET_CHAR_BIT; gdbarch->float_bit = 4*TARGET_CHAR_BIT; gdbarch->double_bit = 8*TARGET_CHAR_BIT; @@ -429,9 +430,11 @@ 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->print_insn = default_print_insn; gdbarch->skip_trampoline_code = generic_skip_trampoline_code; gdbarch->skip_solib_resolver = generic_skip_solib_resolver; gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline; + gdbarch->in_indirect_branch_thunk = default_in_indirect_branch_thunk; gdbarch->stack_frame_destroyed_p = generic_stack_frame_destroyed_p; gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special; gdbarch->make_symbol_special = default_make_symbol_special; @@ -442,7 +445,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->skip_permanent_breakpoint = default_skip_permanent_breakpoint; gdbarch->displaced_step_hw_singlestep = default_displaced_step_hw_singlestep; gdbarch->displaced_step_fixup = NULL; - gdbarch->displaced_step_free_closure = NULL; gdbarch->displaced_step_location = NULL; gdbarch->relocate_instruction = NULL; gdbarch->has_shared_address_space = default_has_shared_address_space; @@ -463,21 +465,17 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->gcc_target_options = default_gcc_target_options; gdbarch->gnu_triplet_regexp = default_gnu_triplet_regexp; gdbarch->addressable_memory_unit_size = default_addressable_memory_unit_size; + gdbarch->type_align = default_type_align; /* gdbarch_alloc() */ return gdbarch; } -/* Allocate extra space using the per-architecture obstack. */ -void * -gdbarch_obstack_zalloc (struct gdbarch *arch, long size) +obstack *gdbarch_obstack (gdbarch *arch) { - void *data = obstack_alloc (arch->obstack, size); - - memset (data, 0, size); - return data; + return arch->obstack; } /* See gdbarch.h. */ @@ -526,7 +524,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of int_bit, invalid_p == 0 */ /* Skip verify of long_bit, invalid_p == 0 */ /* Skip verify of long_long_bit, invalid_p == 0 */ - /* Skip verify of long_long_align_bit, invalid_p == 0 */ /* Skip verify of half_bit, invalid_p == 0 */ if (gdbarch->half_format == 0) gdbarch->half_format = floatformats_ieee_half; @@ -619,13 +616,14 @@ 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 significant_addr_bit, 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) - log.puts ("\n\tprint_insn"); + /* Skip verify of print_insn, invalid_p == 0 */ /* Skip verify of skip_trampoline_code, invalid_p == 0 */ /* Skip verify of skip_solib_resolver, invalid_p == 0 */ /* Skip verify of in_solib_return_trampoline, invalid_p == 0 */ + /* Skip verify of in_indirect_branch_thunk, invalid_p == 0 */ /* Skip verify of stack_frame_destroyed_p, invalid_p == 0 */ /* Skip verify of elf_make_msymbol_special, has predicate. */ /* Skip verify of coff_make_msymbol_special, invalid_p == 0 */ @@ -642,12 +640,12 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of fetch_pointer_argument, has predicate. */ /* Skip verify of iterate_over_regset_sections, 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 core_thread_name, has predicate. */ + /* Skip verify of core_xfer_siginfo, has predicate. */ /* Skip verify of gcore_bfd_target, has predicate. */ /* Skip verify of vtable_function_descriptors, invalid_p == 0 */ /* Skip verify of vbit_in_delta, invalid_p == 0 */ @@ -656,8 +654,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of displaced_step_copy_insn, has predicate. */ /* Skip verify of displaced_step_hw_singlestep, invalid_p == 0 */ /* Skip verify of displaced_step_fixup, has predicate. */ - if ((! gdbarch->displaced_step_free_closure) != (! gdbarch->displaced_step_copy_insn)) - log.puts ("\n\tdisplaced_step_free_closure"); if ((! gdbarch->displaced_step_location) != (! gdbarch->displaced_step_copy_insn)) log.puts ("\n\tdisplaced_step_location"); /* Skip verify of relocate_instruction, has predicate. */ @@ -712,8 +708,10 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of gcc_target_options, invalid_p == 0 */ /* Skip verify of gnu_triplet_regexp, invalid_p == 0 */ /* Skip verify of addressable_memory_unit_size, invalid_p == 0 */ + /* Skip verify of disassembler_options_implicit, invalid_p == 0 */ /* Skip verify of disassembler_options, invalid_p == 0 */ /* Skip verify of valid_disassembler_options, invalid_p == 0 */ + /* Skip verify of type_align, invalid_p == 0 */ if (!log.empty ()) internal_error (__FILE__, __LINE__, _("verify_gdbarch: the following are invalid ...%s"), @@ -887,6 +885,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) 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: gdbarch_core_xfer_siginfo_p() = %d\n", + gdbarch_core_xfer_siginfo_p (gdbarch)); + fprintf_unfiltered (file, + "gdbarch_dump: core_xfer_siginfo = <%s>\n", + host_address_to_string (gdbarch->core_xfer_siginfo)); fprintf_unfiltered (file, "gdbarch_dump: decr_pc_after_break = %s\n", core_addr_to_string_nz (gdbarch->decr_pc_after_break)); @@ -899,6 +903,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: disassembler_options = %s\n", pstring_ptr (gdbarch->disassembler_options)); + fprintf_unfiltered (file, + "gdbarch_dump: disassembler_options_implicit = %s\n", + pstring (gdbarch->disassembler_options_implicit)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_displaced_step_copy_insn_p() = %d\n", gdbarch_displaced_step_copy_insn_p (gdbarch)); @@ -911,9 +918,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: displaced_step_fixup = <%s>\n", host_address_to_string (gdbarch->displaced_step_fixup)); - fprintf_unfiltered (file, - "gdbarch_dump: displaced_step_free_closure = <%s>\n", - host_address_to_string (gdbarch->displaced_step_free_closure)); fprintf_unfiltered (file, "gdbarch_dump: displaced_step_hw_singlestep = <%s>\n", host_address_to_string (gdbarch->displaced_step_hw_singlestep)); @@ -971,12 +975,6 @@ 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: execute_dwarf_cfa_vendor_op = <%s>\n", host_address_to_string (gdbarch->execute_dwarf_cfa_vendor_op)); @@ -1106,6 +1104,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: have_nonsteppable_watchpoint = %s\n", plongest (gdbarch->have_nonsteppable_watchpoint)); + fprintf_unfiltered (file, + "gdbarch_dump: in_indirect_branch_thunk = <%s>\n", + host_address_to_string (gdbarch->in_indirect_branch_thunk)); fprintf_unfiltered (file, "gdbarch_dump: in_solib_return_trampoline = <%s>\n", host_address_to_string (gdbarch->in_solib_return_trampoline)); @@ -1160,9 +1161,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: long_double_format = %s\n", pformat (gdbarch->long_double_format)); - fprintf_unfiltered (file, - "gdbarch_dump: long_long_align_bit = %s\n", - plongest (gdbarch->long_long_align_bit)); fprintf_unfiltered (file, "gdbarch_dump: long_long_bit = %s\n", plongest (gdbarch->long_long_bit)); @@ -1331,6 +1329,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: short_bit = %s\n", plongest (gdbarch->short_bit)); + fprintf_unfiltered (file, + "gdbarch_dump: significant_addr_bit = %s\n", + plongest (gdbarch->significant_addr_bit)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_single_step_through_delay_p() = %d\n", gdbarch_single_step_through_delay_p (gdbarch)); @@ -1436,6 +1437,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: target_desc = %s\n", host_address_to_string (gdbarch->target_desc)); + fprintf_unfiltered (file, + "gdbarch_dump: type_align = <%s>\n", + host_address_to_string (gdbarch->type_align)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_unwind_pc_p() = %d\n", gdbarch_unwind_pc_p (gdbarch)); @@ -1627,23 +1631,6 @@ set_gdbarch_long_long_bit (struct gdbarch *gdbarch, gdbarch->long_long_bit = long_long_bit; } -int -gdbarch_long_long_align_bit (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of long_long_align_bit, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_long_long_align_bit called\n"); - return gdbarch->long_long_align_bit; -} - -void -set_gdbarch_long_long_align_bit (struct gdbarch *gdbarch, - int long_long_align_bit) -{ - gdbarch->long_long_align_bit = long_long_align_bit; -} - int gdbarch_half_bit (struct gdbarch *gdbarch) { @@ -1907,7 +1894,7 @@ gdbarch_read_pc_p (struct gdbarch *gdbarch) } CORE_ADDR -gdbarch_read_pc (struct gdbarch *gdbarch, struct regcache *regcache) +gdbarch_read_pc (struct gdbarch *gdbarch, readable_regcache *regcache) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->read_pc != NULL); @@ -1972,7 +1959,7 @@ gdbarch_pseudo_register_read_p (struct gdbarch *gdbarch) } enum register_status -gdbarch_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, int cookednum, gdb_byte *buf) +gdbarch_pseudo_register_read (struct gdbarch *gdbarch, readable_regcache *regcache, int cookednum, gdb_byte *buf) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->pseudo_register_read != NULL); @@ -1996,7 +1983,7 @@ gdbarch_pseudo_register_read_value_p (struct gdbarch *gdbarch) } struct value * -gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, struct regcache *regcache, int cookednum) +gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, readable_regcache *regcache, int cookednum) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->pseudo_register_read_value != NULL); @@ -3222,6 +3209,23 @@ set_gdbarch_addr_bits_remove (struct gdbarch *gdbarch, gdbarch->addr_bits_remove = addr_bits_remove; } +int +gdbarch_significant_addr_bit (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of significant_addr_bit, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_significant_addr_bit called\n"); + return gdbarch->significant_addr_bit; +} + +void +set_gdbarch_significant_addr_bit (struct gdbarch *gdbarch, + int significant_addr_bit) +{ + gdbarch->significant_addr_bit = significant_addr_bit; +} + int gdbarch_software_single_step_p (struct gdbarch *gdbarch) { @@ -3229,7 +3233,7 @@ gdbarch_software_single_step_p (struct gdbarch *gdbarch) return gdbarch->software_single_step != NULL; } -VEC (CORE_ADDR) * +std::vector gdbarch_software_single_step (struct gdbarch *gdbarch, struct regcache *regcache) { gdb_assert (gdbarch != NULL); @@ -3338,6 +3342,23 @@ set_gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, gdbarch->in_solib_return_trampoline = in_solib_return_trampoline; } +bool +gdbarch_in_indirect_branch_thunk (struct gdbarch *gdbarch, CORE_ADDR pc) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->in_indirect_branch_thunk != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_in_indirect_branch_thunk called\n"); + return gdbarch->in_indirect_branch_thunk (gdbarch, pc); +} + +void +set_gdbarch_in_indirect_branch_thunk (struct gdbarch *gdbarch, + gdbarch_in_indirect_branch_thunk_ftype in_indirect_branch_thunk) +{ + gdbarch->in_indirect_branch_thunk = in_indirect_branch_thunk; +} + int gdbarch_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR addr) { @@ -3659,30 +3680,6 @@ 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) { @@ -3803,6 +3800,30 @@ set_gdbarch_core_thread_name (struct gdbarch *gdbarch, gdbarch->core_thread_name = core_thread_name; } +int +gdbarch_core_xfer_siginfo_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->core_xfer_siginfo != NULL; +} + +LONGEST +gdbarch_core_xfer_siginfo (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->core_xfer_siginfo != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_core_xfer_siginfo called\n"); + return gdbarch->core_xfer_siginfo (gdbarch, readbuf, offset, len); +} + +void +set_gdbarch_core_xfer_siginfo (struct gdbarch *gdbarch, + gdbarch_core_xfer_siginfo_ftype core_xfer_siginfo) +{ + gdbarch->core_xfer_siginfo = core_xfer_siginfo; +} + int gdbarch_gcore_bfd_target_p (struct gdbarch *gdbarch) { @@ -3970,23 +3991,6 @@ set_gdbarch_displaced_step_fixup (struct gdbarch *gdbarch, gdbarch->displaced_step_fixup = displaced_step_fixup; } -void -gdbarch_displaced_step_free_closure (struct gdbarch *gdbarch, struct displaced_step_closure *closure) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->displaced_step_free_closure != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_displaced_step_free_closure called\n"); - gdbarch->displaced_step_free_closure (gdbarch, closure); -} - -void -set_gdbarch_displaced_step_free_closure (struct gdbarch *gdbarch, - gdbarch_displaced_step_free_closure_ftype displaced_step_free_closure) -{ - gdbarch->displaced_step_free_closure = displaced_step_free_closure; -} - CORE_ADDR gdbarch_displaced_step_location (struct gdbarch *gdbarch) { @@ -4270,13 +4274,13 @@ gdbarch_get_syscall_number_p (struct gdbarch *gdbarch) } LONGEST -gdbarch_get_syscall_number (struct gdbarch *gdbarch, ptid_t ptid) +gdbarch_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->get_syscall_number != NULL); if (gdbarch_debug >= 2) fprintf_unfiltered (gdb_stdlog, "gdbarch_get_syscall_number called\n"); - return gdbarch->get_syscall_number (gdbarch, ptid); + return gdbarch->get_syscall_number (gdbarch, thread); } void @@ -4652,7 +4656,7 @@ set_gdbarch_has_shared_address_space (struct gdbarch *gdbarch, } int -gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, char **msg) +gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->fast_tracepoint_valid_at != NULL); @@ -5045,6 +5049,23 @@ set_gdbarch_addressable_memory_unit_size (struct gdbarch *gdbarch, gdbarch->addressable_memory_unit_size = addressable_memory_unit_size; } +const char * +gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + /* Skip verify of disassembler_options_implicit, invalid_p == 0 */ + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_disassembler_options_implicit called\n"); + return gdbarch->disassembler_options_implicit; +} + +void +set_gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch, + const char * disassembler_options_implicit) +{ + gdbarch->disassembler_options_implicit = disassembler_options_implicit; +} + char ** gdbarch_disassembler_options (struct gdbarch *gdbarch) { @@ -5062,7 +5083,7 @@ set_gdbarch_disassembler_options (struct gdbarch *gdbarch, gdbarch->disassembler_options = disassembler_options; } -const disasm_options_t * +const disasm_options_and_args_t * gdbarch_valid_disassembler_options (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); @@ -5074,11 +5095,28 @@ gdbarch_valid_disassembler_options (struct gdbarch *gdbarch) void set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarch, - const disasm_options_t * valid_disassembler_options) + const disasm_options_and_args_t * valid_disassembler_options) { gdbarch->valid_disassembler_options = valid_disassembler_options; } +ULONGEST +gdbarch_type_align (struct gdbarch *gdbarch, struct type *type) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->type_align != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_type_align called\n"); + return gdbarch->type_align (gdbarch, type); +} + +void +set_gdbarch_type_align (struct gdbarch *gdbarch, + gdbarch_type_align_ftype type_align) +{ + gdbarch->type_align = type_align; +} + /* Keep a registry of per-architecture data-pointers required by GDB modules. */ @@ -5459,7 +5497,7 @@ set_target_gdbarch (struct gdbarch *new_gdbarch) gdb_assert (new_gdbarch != NULL); gdb_assert (new_gdbarch->initialized_p); current_inferior ()->gdbarch = new_gdbarch; - observer_notify_architecture_changed (new_gdbarch); + gdb::observers::architecture_changed.notify (new_gdbarch); registers_changed (); } @@ -5471,8 +5509,6 @@ target_gdbarch (void) return current_inferior ()->gdbarch; } -extern void _initialize_gdbarch (void); - void _initialize_gdbarch (void) {