X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Farm-linux-nat.c;h=8bbaed5cf886826a1171b3ad9c4eaf52fde51ff0;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=163e1be0b44d8dd8129a095a473a718f43f6d278;hpb=73e1c03f93f0294b464dc2b67de1f9aaae84838d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 163e1be0b4..8bbaed5cf8 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -1,5 +1,5 @@ /* GNU/Linux on ARM native support. - Copyright (C) 1999-2018 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -27,6 +27,7 @@ #include "observable.h" #include "gdbthread.h" +#include "aarch32-tdep.h" #include "arm-tdep.h" #include "arm-linux-tdep.h" #include "aarch32-linux-nat.h" @@ -38,6 +39,7 @@ #include #include "nat/linux-ptrace.h" +#include "linux-tdep.h" /* Prototypes for supply_gregset etc. */ #include "gregset.h" @@ -64,8 +66,6 @@ #define PTRACE_SETHBPREGS 30 #endif -extern int arm_apcs_32; - class arm_linux_nat_target final : public linux_nat_target { public: @@ -119,7 +119,7 @@ fetch_fpregs (struct regcache *regcache) gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); /* Read the floating point state. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -155,7 +155,7 @@ store_fpregs (const struct regcache *regcache) gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); /* Read the floating point state. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -176,7 +176,7 @@ store_fpregs (const struct regcache *regcache) /* Store fpsr. */ if (REG_VALID == regcache->get_register_status (ARM_FPS_REGNUM)) - regcache_raw_collect (regcache, ARM_FPS_REGNUM, fp + NWFPE_FPSR_OFFSET); + regcache->raw_collect (ARM_FPS_REGNUM, fp + NWFPE_FPSR_OFFSET); /* Store the floating point registers. */ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++) @@ -205,11 +205,11 @@ store_fpregs (const struct regcache *regcache) static void fetch_regs (struct regcache *regcache) { - int ret, regno, tid; + int ret, tid; elf_gregset_t regs; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); if (have_ptrace_getregset == TRIBOOL_TRUE) { @@ -232,11 +232,11 @@ fetch_regs (struct regcache *regcache) static void store_regs (const struct regcache *regcache) { - int ret, regno, tid; + int ret, tid; elf_gregset_t regs; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); /* Fetch the general registers. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -275,8 +275,6 @@ store_regs (const struct regcache *regcache) /* Fetch all WMMX registers of the process and store into regcache. */ -#define IWMMXT_REGS_SIZE (16 * 8 + 6 * 4) - static void fetch_wmmx_regs (struct regcache *regcache) { @@ -284,7 +282,7 @@ fetch_wmmx_regs (struct regcache *regcache) int ret, regno, tid; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); ret = ptrace (PTRACE_GETWMMXREGS, tid, 0, regbuf); if (ret < 0) @@ -309,7 +307,7 @@ store_wmmx_regs (const struct regcache *regcache) int ret, regno, tid; /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); ret = ptrace (PTRACE_GETWMMXREGS, tid, 0, regbuf); if (ret < 0) @@ -317,18 +315,17 @@ store_wmmx_regs (const struct regcache *regcache) for (regno = 0; regno < 16; regno++) if (REG_VALID == regcache->get_register_status (regno + ARM_WR0_REGNUM)) - regcache_raw_collect (regcache, regno + ARM_WR0_REGNUM, - ®buf[regno * 8]); + regcache->raw_collect (regno + ARM_WR0_REGNUM, ®buf[regno * 8]); for (regno = 0; regno < 2; regno++) if (REG_VALID == regcache->get_register_status (regno + ARM_WCSSF_REGNUM)) - regcache_raw_collect (regcache, regno + ARM_WCSSF_REGNUM, - ®buf[16 * 8 + regno * 4]); + regcache->raw_collect (regno + ARM_WCSSF_REGNUM, + ®buf[16 * 8 + regno * 4]); for (regno = 0; regno < 4; regno++) if (REG_VALID == regcache->get_register_status (regno + ARM_WCGR0_REGNUM)) - regcache_raw_collect (regcache, regno + ARM_WCGR0_REGNUM, - ®buf[16 * 8 + 2 * 4 + regno * 4]); + regcache->raw_collect (regno + ARM_WCGR0_REGNUM, + ®buf[16 * 8 + 2 * 4 + regno * 4]); ret = ptrace (PTRACE_SETWMMXREGS, tid, 0, regbuf); @@ -339,20 +336,20 @@ store_wmmx_regs (const struct regcache *regcache) static void fetch_vfp_regs (struct regcache *regcache) { - gdb_byte regbuf[VFP_REGS_SIZE]; - int ret, regno, tid; + gdb_byte regbuf[ARM_VFP3_REGS_SIZE]; + int ret, tid; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); if (have_ptrace_getregset == TRIBOOL_TRUE) { struct iovec iov; iov.iov_base = regbuf; - iov.iov_len = VFP_REGS_SIZE; + iov.iov_len = ARM_VFP3_REGS_SIZE; ret = ptrace (PTRACE_GETREGSET, tid, NT_ARM_VFP, &iov); } else @@ -368,20 +365,20 @@ fetch_vfp_regs (struct regcache *regcache) static void store_vfp_regs (const struct regcache *regcache) { - gdb_byte regbuf[VFP_REGS_SIZE]; - int ret, regno, tid; + gdb_byte regbuf[ARM_VFP3_REGS_SIZE]; + int ret, tid; struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Get the thread id for the ptrace call. */ - tid = ptid_get_lwp (regcache->ptid ()); + tid = regcache->ptid ().lwp (); if (have_ptrace_getregset == TRIBOOL_TRUE) { struct iovec iov; iov.iov_base = regbuf; - iov.iov_len = VFP_REGS_SIZE; + iov.iov_len = ARM_VFP3_REGS_SIZE; ret = ptrace (PTRACE_GETREGSET, tid, NT_ARM_VFP, &iov); } else @@ -398,7 +395,7 @@ store_vfp_regs (const struct regcache *regcache) struct iovec iov; iov.iov_base = regbuf; - iov.iov_len = VFP_REGS_SIZE; + iov.iov_len = ARM_VFP3_REGS_SIZE; ret = ptrace (PTRACE_SETREGSET, tid, NT_ARM_VFP, &iov); } else @@ -534,13 +531,13 @@ ps_get_thread_area (struct ps_prochandle *ph, const struct target_desc * arm_linux_nat_target::read_description () { - CORE_ADDR arm_hwcap = 0; + CORE_ADDR arm_hwcap = linux_get_hwcap (this); if (have_ptrace_getregset == TRIBOOL_UNKNOWN) { elf_gregset_t gpregs; struct iovec iov; - int tid = ptid_get_lwp (inferior_ptid); + int tid = inferior_ptid.lwp (); iov.iov_base = &gpregs; iov.iov_len = sizeof (gpregs); @@ -552,42 +549,30 @@ arm_linux_nat_target::read_description () have_ptrace_getregset = TRIBOOL_TRUE; } - if (target_auxv_search (this, AT_HWCAP, &arm_hwcap) != 1) - { - return this->beneath->read_description (); - } - if (arm_hwcap & HWCAP_IWMMXT) - return tdesc_arm_with_iwmmxt; + return arm_read_description (ARM_FP_TYPE_IWMMXT); if (arm_hwcap & HWCAP_VFP) { - int pid; - char *buf; - const struct target_desc * result = NULL; + /* Make sure that the kernel supports reading VFP registers. Support was + added in 2.6.30. */ + int pid = inferior_ptid.lwp (); + errno = 0; + char *buf = (char *) alloca (ARM_VFP3_REGS_SIZE); + if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0 && errno == EIO) + return nullptr; /* NEON implies VFPv3-D32 or no-VFP unit. Say that we only support Neon with VFPv3-D32. */ if (arm_hwcap & HWCAP_NEON) - result = tdesc_arm_with_neon; + return aarch32_read_description (); else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3) - result = tdesc_arm_with_vfpv3; - else - result = tdesc_arm_with_vfpv2; - - /* Now make sure that the kernel supports reading these - registers. Support was added in 2.6.30. */ - pid = ptid_get_lwp (inferior_ptid); - errno = 0; - buf = (char *) alloca (VFP_REGS_SIZE); - if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0 - && errno == EIO) - result = NULL; + return arm_read_description (ARM_FP_TYPE_VFPV3); - return result; + return arm_read_description (ARM_FP_TYPE_VFPV2); } - return this->beneath->read_description (); + return this->beneath ()->read_description (); } /* Information describing the hardware breakpoint capabilities. */ @@ -623,7 +608,7 @@ arm_linux_get_hwbp_cap (void) int tid; unsigned int val; - tid = ptid_get_lwp (inferior_ptid); + tid = inferior_ptid.lwp (); if (ptrace (PTRACE_GETHBPREGS, tid, 0, &val) < 0) available = 0; else @@ -695,7 +680,7 @@ arm_linux_nat_target::can_use_hw_breakpoint (enum bptype type, return -1; } else - gdb_assert (FALSE); + gdb_assert_not_reached ("unknown breakpoint type"); return 1; } @@ -953,26 +938,18 @@ arm_linux_hw_breakpoint_equal (const struct arm_linux_hw_breakpoint *p1, /* Callback to mark a watch-/breakpoint to be updated in all threads of the current process. */ -struct update_registers_data -{ - int watch; - int index; -}; - static int -update_registers_callback (struct lwp_info *lwp, void *arg) +update_registers_callback (struct lwp_info *lwp, int watch, int index) { - struct update_registers_data *data = (struct update_registers_data *) arg; - if (lwp->arch_private == NULL) lwp->arch_private = XCNEW (struct arch_lwp_info); /* The actual update is done later just before resuming the lwp, we just mark that the registers need updating. */ - if (data->watch) - lwp->arch_private->wpts_changed[data->index] = 1; + if (watch) + lwp->arch_private->wpts_changed[index] = 1; else - lwp->arch_private->bpts_changed[data->index] = 1; + lwp->arch_private->bpts_changed[index] = 1; /* If the lwp isn't stopped, force it to momentarily pause, so we can update its breakpoint registers. */ @@ -992,10 +969,9 @@ arm_linux_insert_hw_breakpoint1 (const struct arm_linux_hw_breakpoint* bpt, ptid_t pid_ptid; gdb_byte count, i; struct arm_linux_hw_breakpoint* bpts; - struct update_registers_data data; - pid = ptid_get_pid (inferior_ptid); - pid_ptid = pid_to_ptid (pid); + pid = inferior_ptid.pid (); + pid_ptid = ptid_t (pid); if (watchpoint) { @@ -1011,10 +987,13 @@ arm_linux_insert_hw_breakpoint1 (const struct arm_linux_hw_breakpoint* bpt, for (i = 0; i < count; ++i) if (!arm_hwbp_control_is_enabled (bpts[i].control)) { - data.watch = watchpoint; - data.index = i; bpts[i] = *bpt; - iterate_over_lwps (pid_ptid, update_registers_callback, &data); + iterate_over_lwps (pid_ptid, + [=] (struct lwp_info *info) + { + return update_registers_callback (info, watchpoint, + i); + }); break; } @@ -1031,10 +1010,9 @@ arm_linux_remove_hw_breakpoint1 (const struct arm_linux_hw_breakpoint *bpt, gdb_byte count, i; ptid_t pid_ptid; struct arm_linux_hw_breakpoint* bpts; - struct update_registers_data data; - pid = ptid_get_pid (inferior_ptid); - pid_ptid = pid_to_ptid (pid); + pid = inferior_ptid.pid (); + pid_ptid = ptid_t (pid); if (watchpoint) { @@ -1050,10 +1028,13 @@ arm_linux_remove_hw_breakpoint1 (const struct arm_linux_hw_breakpoint *bpt, for (i = 0; i < count; ++i) if (arm_linux_hw_breakpoint_equal (bpt, bpts + i)) { - data.watch = watchpoint; - data.index = i; bpts[i].control = arm_hwbp_control_disable (bpts[i].control); - iterate_over_lwps (pid_ptid, update_registers_callback, &data); + iterate_over_lwps (pid_ptid, + [=] (struct lwp_info *info) + { + return update_registers_callback (info, watchpoint, + i); + }); break; } @@ -1065,7 +1046,6 @@ int arm_linux_nat_target::insert_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_breakpoint_count () == 0) @@ -1083,7 +1063,6 @@ int arm_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_breakpoint_count () == 0) @@ -1135,7 +1114,6 @@ arm_linux_nat_target::insert_watchpoint (CORE_ADDR addr, int len, enum target_hw_bp_type rw, struct expression *cond) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_watchpoint_count () == 0) @@ -1154,7 +1132,6 @@ arm_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len, enum target_hw_bp_type rw, struct expression *cond) { - struct lwp_info *lp; struct arm_linux_hw_breakpoint p; if (arm_linux_get_hw_watchpoint_count () == 0) @@ -1251,9 +1228,9 @@ arm_linux_nat_target::low_prepare_to_resume (struct lwp_info *lwp) struct arm_linux_hw_breakpoint *bpts, *wpts; struct arch_lwp_info *arm_lwp_info = lwp->arch_private; - pid = ptid_get_lwp (lwp->ptid); - bpts = arm_linux_get_debug_reg_state (ptid_get_pid (lwp->ptid))->bpts; - wpts = arm_linux_get_debug_reg_state (ptid_get_pid (lwp->ptid))->wpts; + pid = lwp->ptid.lwp (); + bpts = arm_linux_get_debug_reg_state (lwp->ptid.pid ())->bpts; + wpts = arm_linux_get_debug_reg_state (lwp->ptid.pid ())->wpts; /* NULL means this is the main thread still going through the shell, or, no watchpoint has been set yet. In that case, there's @@ -1316,14 +1293,15 @@ arm_linux_nat_target::low_new_fork (struct lwp_info *parent, pid_t child_pid) new process so that all breakpoints and watchpoints can be removed together. */ - parent_pid = ptid_get_pid (parent->ptid); + parent_pid = parent->ptid.pid (); parent_state = arm_linux_get_debug_reg_state (parent_pid); child_state = arm_linux_get_debug_reg_state (child_pid); *child_state = *parent_state; } +void _initialize_arm_linux_nat (); void -_initialize_arm_linux_nat (void) +_initialize_arm_linux_nat () { /* Register the target. */ linux_target = &the_arm_linux_nat_target;