X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Farm-linux-nat.c;h=d77ca9349849a07c8b18ab13f4a87fbb1f7412c0;hb=8b8c7c9f49992750f66f81b4601d593a3858d98c;hp=c167bce18b3023b5ba87ec3e047c1dc557bdcb5e;hpb=0bdb2f78497a1b3be65d1428cc02f7d4e1d3a888;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index c167bce18b..d77ca93498 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-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -29,10 +29,11 @@ #include "arm-tdep.h" #include "arm-linux-tdep.h" +#include "aarch32-linux-nat.h" #include #include -#include +#include "nat/gdb_ptrace.h" #include #include @@ -65,64 +66,6 @@ extern int arm_apcs_32; -/* On GNU/Linux, threads are implemented as pseudo-processes, in which - case we may be tracing more than one process at a time. In that - case, inferior_ptid will contain the main process ID and the - individual thread (process) ID. get_thread_id () is used to get - the thread id if it's available, and the process id otherwise. */ - -static int -get_thread_id (ptid_t ptid) -{ - int tid = ptid_get_lwp (ptid); - if (0 == tid) - tid = ptid_get_pid (ptid); - return tid; -} - -#define GET_THREAD_ID(PTID) get_thread_id (PTID) - -/* Get the value of a particular register from the floating point - state of the process and store it into regcache. */ - -static void -fetch_fpregister (struct regcache *regcache, int regno) -{ - int ret, tid; - gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; - - /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); - - /* Read the floating point state. */ - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = &fp; - iov.iov_len = ARM_LINUX_SIZEOF_NWFPE; - - ret = ptrace (PTRACE_GETREGSET, tid, NT_FPREGSET, &iov); - } - else - ret = ptrace (PT_GETFPREGS, tid, 0, fp); - - if (ret < 0) - { - warning (_("Unable to fetch floating point register.")); - return; - } - - /* Fetch fpsr. */ - if (ARM_FPS_REGNUM == regno) - regcache_raw_supply (regcache, ARM_FPS_REGNUM, - fp + NWFPE_FPSR_OFFSET); - - /* Fetch the floating point register. */ - if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM) - supply_nwfpe_register (regcache, regno, fp); -} - /* Get the whole floating point state of the process and store it into regcache. */ @@ -133,7 +76,7 @@ fetch_fpregs (struct regcache *regcache) gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); /* Read the floating point state. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -149,10 +92,7 @@ fetch_fpregs (struct regcache *regcache) ret = ptrace (PT_GETFPREGS, tid, 0, fp); if (ret < 0) - { - warning (_("Unable to fetch the floating point registers.")); - return; - } + perror_with_name (_("Unable to fetch the floating point registers.")); /* Fetch fpsr. */ regcache_raw_supply (regcache, ARM_FPS_REGNUM, @@ -163,65 +103,6 @@ fetch_fpregs (struct regcache *regcache) supply_nwfpe_register (regcache, regno, fp); } -/* Save a particular register into the floating point state of the - process using the contents from regcache. */ - -static void -store_fpregister (const struct regcache *regcache, int regno) -{ - int ret, tid; - gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; - - /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); - - /* Read the floating point state. */ - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = &fp; - iov.iov_len = ARM_LINUX_SIZEOF_NWFPE; - - ret = ptrace (PTRACE_GETREGSET, tid, NT_FPREGSET, &iov); - } - else - ret = ptrace (PT_GETFPREGS, tid, 0, fp); - - if (ret < 0) - { - warning (_("Unable to fetch the floating point registers.")); - return; - } - - /* Store fpsr. */ - if (ARM_FPS_REGNUM == regno - && REG_VALID == regcache_register_status (regcache, ARM_FPS_REGNUM)) - regcache_raw_collect (regcache, ARM_FPS_REGNUM, fp + NWFPE_FPSR_OFFSET); - - /* Store the floating point register. */ - if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM) - collect_nwfpe_register (regcache, regno, fp); - - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = &fp; - iov.iov_len = ARM_LINUX_SIZEOF_NWFPE; - - ret = ptrace (PTRACE_SETREGSET, tid, NT_FPREGSET, &iov); - } - else - ret = ptrace (PTRACE_SETFPREGS, tid, 0, fp); - - if (ret < 0) - { - warning (_("Unable to store floating point register.")); - return; - } -} - /* Save the whole floating point state of the process using the contents from regcache. */ @@ -232,7 +113,7 @@ store_fpregs (const struct regcache *regcache) gdb_byte fp[ARM_LINUX_SIZEOF_NWFPE]; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); /* Read the floating point state. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -249,10 +130,7 @@ store_fpregs (const struct regcache *regcache) ret = ptrace (PT_GETFPREGS, tid, 0, fp); if (ret < 0) - { - warning (_("Unable to fetch the floating point registers.")); - return; - } + perror_with_name (_("Unable to fetch the floating point registers.")); /* Store fpsr. */ if (REG_VALID == regcache_register_status (regcache, ARM_FPS_REGNUM)) @@ -276,63 +154,7 @@ store_fpregs (const struct regcache *regcache) ret = ptrace (PTRACE_SETFPREGS, tid, 0, fp); if (ret < 0) - { - warning (_("Unable to store floating point registers.")); - return; - } -} - -/* Fetch a general register of the process and store into - regcache. */ - -static void -fetch_register (struct regcache *regcache, int regno) -{ - int ret, tid; - elf_gregset_t regs; - - /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); - - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = ®s; - iov.iov_len = sizeof (regs); - - ret = ptrace (PTRACE_GETREGSET, tid, NT_PRSTATUS, &iov); - } - else - ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); - - if (ret < 0) - { - warning (_("Unable to fetch general register.")); - return; - } - - if (regno >= ARM_A1_REGNUM && regno < ARM_PC_REGNUM) - regcache_raw_supply (regcache, regno, (char *) ®s[regno]); - - if (ARM_PS_REGNUM == regno) - { - if (arm_apcs_32) - regcache_raw_supply (regcache, ARM_PS_REGNUM, - (char *) ®s[ARM_CPSR_GREGNUM]); - else - regcache_raw_supply (regcache, ARM_PS_REGNUM, - (char *) ®s[ARM_PC_REGNUM]); - } - - if (ARM_PC_REGNUM == regno) - { - regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove - (get_regcache_arch (regcache), - regs[ARM_PC_REGNUM]); - regcache_raw_supply (regcache, ARM_PC_REGNUM, - (char *) ®s[ARM_PC_REGNUM]); - } + perror_with_name (_("Unable to store floating point registers.")); } /* Fetch all general registers of the process and store into @@ -345,58 +167,8 @@ fetch_regs (struct regcache *regcache) elf_gregset_t regs; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); - - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = ®s; - iov.iov_len = sizeof (regs); - - ret = ptrace (PTRACE_GETREGSET, tid, NT_PRSTATUS, &iov); - } - else - ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); - - if (ret < 0) - { - warning (_("Unable to fetch general registers.")); - return; - } - - for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++) - regcache_raw_supply (regcache, regno, (char *) ®s[regno]); - - if (arm_apcs_32) - regcache_raw_supply (regcache, ARM_PS_REGNUM, - (char *) ®s[ARM_CPSR_GREGNUM]); - else - regcache_raw_supply (regcache, ARM_PS_REGNUM, - (char *) ®s[ARM_PC_REGNUM]); - - regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove - (get_regcache_arch (regcache), regs[ARM_PC_REGNUM]); - regcache_raw_supply (regcache, ARM_PC_REGNUM, - (char *) ®s[ARM_PC_REGNUM]); -} - -/* Store all general registers of the process from the values in - regcache. */ - -static void -store_register (const struct regcache *regcache, int regno) -{ - int ret, tid; - elf_gregset_t regs; - - if (REG_VALID != regcache_register_status (regcache, regno)) - return; - - /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); - /* Get the general registers from the process. */ if (have_ptrace_getregset == TRIBOOL_TRUE) { struct iovec iov; @@ -410,37 +182,9 @@ store_register (const struct regcache *regcache, int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) - { - warning (_("Unable to fetch general registers.")); - return; - } - - if (regno >= ARM_A1_REGNUM && regno <= ARM_PC_REGNUM) - regcache_raw_collect (regcache, regno, (char *) ®s[regno]); - else if (arm_apcs_32 && regno == ARM_PS_REGNUM) - regcache_raw_collect (regcache, regno, - (char *) ®s[ARM_CPSR_GREGNUM]); - else if (!arm_apcs_32 && regno == ARM_PS_REGNUM) - regcache_raw_collect (regcache, ARM_PC_REGNUM, - (char *) ®s[ARM_PC_REGNUM]); - - if (have_ptrace_getregset == TRIBOOL_TRUE) - { - struct iovec iov; - - iov.iov_base = ®s; - iov.iov_len = sizeof (regs); - - ret = ptrace (PTRACE_SETREGSET, tid, NT_PRSTATUS, &iov); - } - else - ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); + perror_with_name (_("Unable to fetch general registers.")); - if (ret < 0) - { - warning (_("Unable to store general register.")); - return; - } + aarch32_gp_regcache_supply (regcache, (uint32_t *) regs, arm_apcs_32); } static void @@ -450,7 +194,7 @@ store_regs (const struct regcache *regcache) elf_gregset_t regs; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); /* Fetch the general registers. */ if (have_ptrace_getregset == TRIBOOL_TRUE) @@ -466,20 +210,9 @@ store_regs (const struct regcache *regcache) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) - { - warning (_("Unable to fetch general registers.")); - return; - } + perror_with_name (_("Unable to fetch general registers.")); - for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++) - { - if (REG_VALID == regcache_register_status (regcache, regno)) - regcache_raw_collect (regcache, regno, (char *) ®s[regno]); - } - - if (arm_apcs_32 && REG_VALID == regcache_register_status (regcache, ARM_PS_REGNUM)) - regcache_raw_collect (regcache, ARM_PS_REGNUM, - (char *) ®s[ARM_CPSR_GREGNUM]); + aarch32_gp_regcache_collect (regcache, (uint32_t *) regs, arm_apcs_32); if (have_ptrace_getregset == TRIBOOL_TRUE) { @@ -494,10 +227,7 @@ store_regs (const struct regcache *regcache) ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); if (ret < 0) - { - warning (_("Unable to store general registers.")); - return; - } + perror_with_name (_("Unable to store general registers.")); } /* Fetch all WMMX registers of the process and store into @@ -512,14 +242,11 @@ fetch_wmmx_regs (struct regcache *regcache) int ret, regno, tid; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); ret = ptrace (PTRACE_GETWMMXREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to fetch WMMX registers.")); - return; - } + perror_with_name (_("Unable to fetch WMMX registers.")); for (regno = 0; regno < 16; regno++) regcache_raw_supply (regcache, regno + ARM_WR0_REGNUM, @@ -541,14 +268,11 @@ store_wmmx_regs (const struct regcache *regcache) int ret, regno, tid; /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); ret = ptrace (PTRACE_GETWMMXREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to fetch WMMX registers.")); - return; - } + perror_with_name (_("Unable to fetch WMMX registers.")); for (regno = 0; regno < 16; regno++) if (REG_VALID == regcache_register_status (regcache, @@ -571,27 +295,19 @@ store_wmmx_regs (const struct regcache *regcache) ret = ptrace (PTRACE_SETWMMXREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to store WMMX registers.")); - return; - } + perror_with_name (_("Unable to store WMMX registers.")); } -/* Fetch and store VFP Registers. The kernel object has space for 32 - 64-bit registers, and the FPSCR. This is even when on a VFPv2 or - VFPv3D16 target. */ -#define VFP_REGS_SIZE (32 * 8 + 4) - static void fetch_vfp_regs (struct regcache *regcache) { - char regbuf[VFP_REGS_SIZE]; + gdb_byte regbuf[VFP_REGS_SIZE]; int ret, regno, tid; struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); if (have_ptrace_getregset == TRIBOOL_TRUE) { @@ -605,29 +321,22 @@ fetch_vfp_regs (struct regcache *regcache) ret = ptrace (PTRACE_GETVFPREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to fetch VFP registers.")); - return; - } - - for (regno = 0; regno < tdep->vfp_register_count; regno++) - regcache_raw_supply (regcache, regno + ARM_D0_REGNUM, - (char *) regbuf + regno * 8); + perror_with_name (_("Unable to fetch VFP registers.")); - regcache_raw_supply (regcache, ARM_FPSCR_REGNUM, - (char *) regbuf + 32 * 8); + aarch32_vfp_regcache_supply (regcache, regbuf, + tdep->vfp_register_count); } static void store_vfp_regs (const struct regcache *regcache) { - char regbuf[VFP_REGS_SIZE]; + gdb_byte regbuf[VFP_REGS_SIZE]; int ret, regno, tid; struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Get the thread id for the ptrace call. */ - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); if (have_ptrace_getregset == TRIBOOL_TRUE) { @@ -641,17 +350,10 @@ store_vfp_regs (const struct regcache *regcache) ret = ptrace (PTRACE_GETVFPREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to fetch VFP registers (for update).")); - return; - } - - for (regno = 0; regno < tdep->vfp_register_count; regno++) - regcache_raw_collect (regcache, regno + ARM_D0_REGNUM, - (char *) regbuf + regno * 8); + perror_with_name (_("Unable to fetch VFP registers (for update).")); - regcache_raw_collect (regcache, ARM_FPSCR_REGNUM, - (char *) regbuf + 32 * 8); + aarch32_vfp_regcache_collect (regcache, regbuf, + tdep->vfp_register_count); if (have_ptrace_getregset == TRIBOOL_TRUE) { @@ -665,10 +367,7 @@ store_vfp_regs (const struct regcache *regcache) ret = ptrace (PTRACE_SETVFPREGS, tid, 0, regbuf); if (ret < 0) - { - warning (_("Unable to store VFP registers.")); - return; - } + perror_with_name (_("Unable to store VFP registers.")); } /* Fetch registers from the child process. Fetch all registers if @@ -694,9 +393,9 @@ arm_linux_fetch_inferior_registers (struct target_ops *ops, else { if (regno < ARM_F0_REGNUM || regno == ARM_PS_REGNUM) - fetch_register (regcache, regno); + fetch_regs (regcache); else if (regno >= ARM_F0_REGNUM && regno <= ARM_FPS_REGNUM) - fetch_fpregister (regcache, regno); + fetch_fpregs (regcache); else if (tdep->have_wmmx_registers && regno >= ARM_WR0_REGNUM && regno <= ARM_WCGR7_REGNUM) fetch_wmmx_regs (regcache); @@ -730,9 +429,9 @@ arm_linux_store_inferior_registers (struct target_ops *ops, else { if (regno < ARM_F0_REGNUM || regno == ARM_PS_REGNUM) - store_register (regcache, regno); + store_regs (regcache); else if ((regno >= ARM_F0_REGNUM) && (regno <= ARM_FPS_REGNUM)) - store_fpregister (regcache, regno); + store_fpregs (regcache); else if (tdep->have_wmmx_registers && regno >= ARM_WR0_REGNUM && regno <= ARM_WCGR7_REGNUM) store_wmmx_regs (regcache); @@ -801,7 +500,7 @@ arm_linux_read_description (struct target_ops *ops) { elf_gregset_t gpregs; struct iovec iov; - int tid = GET_THREAD_ID (inferior_ptid); + int tid = ptid_get_lwp (inferior_ptid); iov.iov_base = &gpregs; iov.iov_len = sizeof (gpregs); @@ -840,7 +539,7 @@ arm_linux_read_description (struct target_ops *ops) registers. Support was added in 2.6.30. */ pid = ptid_get_lwp (inferior_ptid); errno = 0; - buf = alloca (VFP_REGS_SIZE); + buf = (char *) alloca (VFP_REGS_SIZE); if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0 && errno == EIO) result = NULL; @@ -884,7 +583,7 @@ arm_linux_get_hwbp_cap (void) int tid; unsigned int val; - tid = GET_THREAD_ID (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); if (ptrace (PTRACE_GETHBPREGS, tid, 0, &val) < 0) available = 0; else @@ -934,7 +633,8 @@ arm_linux_get_hw_watchpoint_count (void) there is not an appropriate resource available, otherwise returns 1. */ static int arm_linux_can_use_hw_breakpoint (struct target_ops *self, - int type, int cnt, int ot) + enum bptype type, + int cnt, int ot) { if (type == bp_hardware_watchpoint || type == bp_read_watchpoint || type == bp_access_watchpoint || type == bp_watchpoint) @@ -1055,7 +755,7 @@ arm_linux_add_process (pid_t pid) { struct arm_linux_process_info *proc; - proc = xcalloc (1, sizeof (*proc)); + proc = XCNEW (struct arm_linux_process_info); proc->pid = pid; proc->next = arm_linux_process_list; @@ -1170,14 +870,14 @@ arm_linux_hw_breakpoint_initialize (struct gdbarch *gdbarch, p->control = arm_hwbp_control_initialize (mask, arm_hwbp_break, 1); } -/* Get the ARM hardware breakpoint type from the RW value we're given when - asked to set a watchpoint. */ +/* Get the ARM hardware breakpoint type from the TYPE value we're + given when asked to set a watchpoint. */ static arm_hwbp_type -arm_linux_get_hwbp_type (int rw) +arm_linux_get_hwbp_type (enum target_hw_bp_type type) { - if (rw == hw_read) + if (type == hw_read) return arm_hwbp_load; - else if (rw == hw_write) + else if (type == hw_write) return arm_hwbp_store; else return arm_hwbp_access; @@ -1186,7 +886,8 @@ arm_linux_get_hwbp_type (int rw) /* Initialize the hardware breakpoint structure P for a watchpoint at ADDR to LEN. The type of watchpoint is given in RW. */ static void -arm_linux_hw_watchpoint_initialize (CORE_ADDR addr, int len, int rw, +arm_linux_hw_watchpoint_initialize (CORE_ADDR addr, int len, + enum target_hw_bp_type type, struct arm_linux_hw_breakpoint *p) { const struct arm_linux_hwbp_cap *cap = arm_linux_get_hwbp_cap (); @@ -1199,7 +900,7 @@ arm_linux_hw_watchpoint_initialize (CORE_ADDR addr, int len, int rw, p->address = (unsigned int) addr; p->control = arm_hwbp_control_initialize (mask, - arm_linux_get_hwbp_type (rw), 1); + arm_linux_get_hwbp_type (type), 1); } /* Are two break-/watch-points equal? */ @@ -1395,7 +1096,8 @@ arm_linux_region_ok_for_hw_watchpoint (struct target_ops *self, /* Insert a Hardware breakpoint. */ static int arm_linux_insert_watchpoint (struct target_ops *self, - CORE_ADDR addr, int len, int rw, + CORE_ADDR addr, int len, + enum target_hw_bp_type rw, struct expression *cond) { struct lwp_info *lp; @@ -1413,8 +1115,8 @@ arm_linux_insert_watchpoint (struct target_ops *self, /* Remove a hardware breakpoint. */ static int -arm_linux_remove_watchpoint (struct target_ops *self, - CORE_ADDR addr, int len, int rw, +arm_linux_remove_watchpoint (struct target_ops *self, CORE_ADDR addr, + int len, enum target_hw_bp_type rw, struct expression *cond) { struct lwp_info *lp;