X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Faarch64-linux-tdep.c;h=34ba0d87baaff12f1f9711e777ab15a0a394f59b;hb=c5316fc6e634858a3821e612e613342da562e0b3;hp=e55b1a726ff184499f2f17de352939a6daf2928d;hpb=05c71722fc5d9407d712b58b80eaf469ffbc406f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index e55b1a726f..34ba0d87ba 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for GNU/Linux AArch64. - Copyright (C) 2009-2018 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. Contributed by ARM Ltd. This file is part of GDB. @@ -21,7 +21,6 @@ #include "defs.h" #include "gdbarch.h" -#include "arch-utils.h" #include "glibc-tdep.h" #include "linux-tdep.h" #include "aarch64-tdep.h" @@ -31,12 +30,11 @@ #include "symtab.h" #include "tramp-frame.h" #include "trad-frame.h" +#include "target/target.h" -#include "inferior.h" #include "regcache.h" #include "regset.h" -#include "cli/cli-utils.h" #include "stap-probe.h" #include "parser-defs.h" #include "user-regs.h" @@ -45,8 +43,6 @@ #include "record-full.h" #include "linux-record.h" -#include "auxv.h" -#include "elf/common.h" /* Signal frame handling. @@ -137,6 +133,8 @@ #define AARCH64_SIGCONTEXT_XO_OFFSET 8 #define AARCH64_SIGCONTEXT_RESERVED_OFFSET 288 +#define AARCH64_SIGCONTEXT_RESERVED_SIZE 4096 + /* Unique identifiers that may be used for aarch64_ctx.magic. */ #define AARCH64_EXTRA_MAGIC 0x45585401 #define AARCH64_FPSIMD_MAGIC 0x46508001 @@ -197,9 +195,11 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, CORE_ADDR sigcontext_addr = (sp + AARCH64_RT_SIGFRAME_UCONTEXT_OFFSET + AARCH64_UCONTEXT_SIGCONTEXT_OFFSET ); CORE_ADDR section = sigcontext_addr + AARCH64_SIGCONTEXT_RESERVED_OFFSET; + CORE_ADDR section_end = section + AARCH64_SIGCONTEXT_RESERVED_SIZE; CORE_ADDR fpsimd = 0; CORE_ADDR sve_regs = 0; uint32_t size, magic; + bool extra_found = false; int num_regs = gdbarch_num_regs (gdbarch); /* Read in the integer registers. */ @@ -218,8 +218,9 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, sigcontext_addr + AARCH64_SIGCONTEXT_XO_OFFSET + 32 * AARCH64_SIGCONTEXT_REG_SIZE); - /* Find the FP and SVE sections. */ - while ((magic = read_aarch64_ctx (section, byte_order, &size)) != 0) + /* Search for the FP and SVE sections, stopping at null. */ + while ((magic = read_aarch64_ctx (section, byte_order, &size)) != 0 + && size != 0) { switch (magic) { @@ -247,8 +248,8 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, vq = sve_vq_from_vl (extract_unsigned_integer (buf, 2, byte_order)); if (vq != tdep->vq) - error (_("Invalid vector length in signal frame %d vs %ld."), vq, - tdep->vq); + error (_("Invalid vector length in signal frame %d vs %s."), vq, + pulongest (tdep->vq)); if (size >= AARCH64_SVE_CONTEXT_SIZE (vq)) sve_regs = section + AARCH64_SVE_CONTEXT_REGS_OFFSET; @@ -273,12 +274,20 @@ aarch64_linux_sigframe_init (const struct tramp_frame *self, } section = extract_unsigned_integer (buf, 8, byte_order); + extra_found = true; break; } default: + section += size; break; } + + /* Prevent searching past the end of the reserved section. The extra + section does not have a hard coded limit - we have to rely on it ending + with nulls. */ + if (!extra_found && section > section_end) + break; } if (sve_regs != 0) @@ -439,7 +448,7 @@ aarch64_linux_core_read_vq (struct gdbarch *gdbarch, bfd *abfd) return 0; } - size_t size = bfd_section_size (abfd, sve_section); + size_t size = bfd_section_size (sve_section); /* Check extended state size. */ if (size < SVE_HEADER_SIZE) @@ -573,7 +582,7 @@ aarch64_linux_collect_sve_regset (const struct regset *regset, size - SVE_HEADER_SIZE); } -/* Implement the "regset_from_core_section" gdbarch method. */ +/* Implement the "iterate_over_regset_sections" gdbarch method. */ static void aarch64_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, @@ -614,6 +623,26 @@ aarch64_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, else cb (".reg2", AARCH64_LINUX_SIZEOF_FPREGSET, AARCH64_LINUX_SIZEOF_FPREGSET, &aarch64_linux_fpregset, NULL, cb_data); + + + if (tdep->has_pauth ()) + { + /* Create this on the fly in order to handle the variable location. */ + const struct regcache_map_entry pauth_regmap[] = + { + { 2, AARCH64_PAUTH_DMASK_REGNUM (tdep->pauth_reg_base), 8}, + { 0 } + }; + + const struct regset aarch64_linux_pauth_regset = + { + pauth_regmap, regcache_supply_regset, regcache_collect_regset + }; + + cb (".reg-aarch-pauth", AARCH64_LINUX_SIZEOF_PAUTH, + AARCH64_LINUX_SIZEOF_PAUTH, &aarch64_linux_pauth_regset, + "pauth registers", cb_data); + } } /* Implement the "core_read_description" gdbarch method. */ @@ -622,12 +651,10 @@ static const struct target_desc * aarch64_linux_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - CORE_ADDR aarch64_hwcap = 0; - - if (target_auxv_search (target, AT_HWCAP, &aarch64_hwcap) != 1) - return NULL; + CORE_ADDR hwcap = linux_get_hwcap (target); - return aarch64_read_description (aarch64_linux_core_read_vq (gdbarch, abfd)); + return aarch64_read_description (aarch64_linux_core_read_vq (gdbarch, abfd), + hwcap & AARCH64_HWCAP_PACA); } /* Implementation of `gdbarch_stap_is_single_operand', as defined in @@ -744,28 +771,6 @@ aarch64_stap_parse_special_token (struct gdbarch *gdbarch, return 1; } -/* Implement the "get_syscall_number" gdbarch method. */ - -static LONGEST -aarch64_linux_get_syscall_number (struct gdbarch *gdbarch, - thread_info *thread) -{ - struct regcache *regs = get_thread_regcache (thread); - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - - /* The content of register x8. */ - gdb_byte buf[X_REGISTER_SIZE]; - /* The result. */ - LONGEST ret; - - /* Getting the system call number from the register x8. */ - regs->cooked_read (AARCH64_DWARF_X0 + 8, buf); - - ret = extract_signed_integer (buf, X_REGISTER_SIZE, byte_order); - - return ret; -} - /* AArch64 process record-replay constructs: syscall, signal etc. */ struct linux_record_tdep aarch64_linux_record_tdep; @@ -1321,6 +1326,40 @@ aarch64_canonicalize_syscall (enum aarch64_syscall syscall_number) } } +/* Retrieve the syscall number at a ptrace syscall-stop, either on syscall entry + or exit. Return -1 upon error. */ + +static LONGEST +aarch64_linux_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread) +{ + struct regcache *regs = get_thread_regcache (thread); + LONGEST ret; + + /* Get the system call number from register x8. */ + regs->cooked_read (AARCH64_X0_REGNUM + 8, &ret); + + /* On exit from a successful execve, we will be in a new process and all the + registers will be cleared - x0 to x30 will be 0, except for a 1 in x7. + This function will only ever get called when stopped at the entry or exit + of a syscall, so by checking for 0 in x0 (arg0/retval), x1 (arg1), x8 + (syscall), x29 (FP) and x30 (LR) we can infer: + 1) Either inferior is at exit from successful execve. + 2) Or inferior is at entry to a call to io_setup with invalid arguments and + a corrupted FP and LR. + It should be safe enough to assume case 1. */ + if (ret == 0) + { + LONGEST x1 = -1, fp = -1, lr = -1; + regs->cooked_read (AARCH64_X0_REGNUM + 1, &x1); + regs->cooked_read (AARCH64_FP_REGNUM, &fp); + regs->cooked_read (AARCH64_LR_REGNUM, &lr); + if (x1 == 0 && fp ==0 && lr == 0) + return aarch64_sys_execve; + } + + return ret; +} + /* Record all registers but PC register for process-record. */ static int @@ -1386,11 +1425,11 @@ aarch64_linux_syscall_record (struct regcache *regcache, /* Implement the "gcc_target_options" gdbarch method. */ -static char * +static std::string aarch64_linux_gcc_target_options (struct gdbarch *gdbarch) { /* GCC doesn't know "-m64". */ - return NULL; + return {}; } static void @@ -1615,7 +1654,7 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_get_syscall_number (gdbarch, aarch64_linux_get_syscall_number); /* Displaced stepping. */ - set_gdbarch_max_insn_length (gdbarch, 4 * DISPLACED_MODIFIED_INSNS); + set_gdbarch_max_insn_length (gdbarch, 4 * AARCH64_DISPLACED_MODIFIED_INSNS); set_gdbarch_displaced_step_copy_insn (gdbarch, aarch64_displaced_step_copy_insn); set_gdbarch_displaced_step_fixup (gdbarch, aarch64_displaced_step_fixup); @@ -1626,8 +1665,9 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_gcc_target_options (gdbarch, aarch64_linux_gcc_target_options); } +void _initialize_aarch64_linux_tdep (); void -_initialize_aarch64_linux_tdep (void) +_initialize_aarch64_linux_tdep () { gdbarch_register_osabi (bfd_arch_aarch64, 0, GDB_OSABI_LINUX, aarch64_linux_init_abi);