X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fs390-nat.c;h=3904c51b3889c67d1d1be4d3301dfb584f21db43;hb=0ee2386550e27d89777e3379a7f8b210809bd58e;hp=b7f59188850e5bc6a40afe392c954ad80aa44ac1;hpb=30413464fde363f43340064c168e7a78c3a81e82;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c index b7f5918885..3904c51b38 100644 --- a/gdb/s390-nat.c +++ b/gdb/s390-nat.c @@ -1,12 +1,15 @@ /* S390 native-dependent code for GDB, the GNU debugger. - Copyright 2001 Free Software Foundation, Inc + Copyright (C) 2001, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc + Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) for IBM Deutschland Entwicklung GmbH, IBM Corporation. + This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,113 +18,298 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" -#include "tm.h" #include "regcache.h" +#include "inferior.h" +#include "target.h" +#include "linux-nat.h" + +#include "s390-tdep.h" + #include #include -#include +#include #include -#include -#include #include -#ifndef offsetof -#define offsetof(type,member) ((size_t) &((type *)0)->member) -#endif -int -s390_register_u_addr (int blockend, int regnum) -{ - int retval; - - if (regnum >= S390_GP0_REGNUM && regnum <= S390_GP_LAST_REGNUM) - retval = PT_GPR0 + ((regnum - S390_GP0_REGNUM) * S390_GPR_SIZE); - else if (regnum >= S390_PSWM_REGNUM && regnum <= S390_PC_REGNUM) - retval = PT_PSWMASK + ((regnum - S390_PSWM_REGNUM) * S390_PSW_MASK_SIZE); - else if (regnum == S390_FPC_REGNUM) - retval = PT_FPC; - else if (regnum >= S390_FP0_REGNUM && regnum <= S390_FPLAST_REGNUM) - retval = -#if CONFIG_ARCH_S390X - PT_FPR0 +/* Map registers to gregset/ptrace offsets. + These arrays are defined in s390-tdep.c. */ + +#ifdef __s390x__ +#define regmap_gregset s390x_regmap_gregset #else - PT_FPR0_HI +#define regmap_gregset s390_regmap_gregset #endif - + ((regnum - S390_FP0_REGNUM) * S390_FPR_SIZE); - else if (regnum >= S390_FIRST_ACR && regnum <= S390_LAST_ACR) - retval = PT_ACR0 + ((regnum - S390_FIRST_ACR) * S390_ACR_SIZE); - else if (regnum >= (S390_FIRST_CR + 9) && regnum <= (S390_FIRST_CR + 11)) - retval = PT_CR_9 + ((regnum - (S390_FIRST_CR + 9)) * S390_CR_SIZE); - else - { -#ifdef GDBSERVER - error ("s390_register_u_addr invalid regnum %s %d regnum=%d", - __FILE__, (int) __LINE__, regnum); + +#define regmap_fpregset s390_regmap_fpregset + +/* When debugging a 32-bit executable running under a 64-bit kernel, + we have to fix up the 64-bit registers we get from the kernel + to make them look like 32-bit registers. */ +#ifdef __s390x__ +#define SUBOFF(gdbarch, i) \ + ((gdbarch_ptr_bit (gdbarch) == 32 \ + && ((i) == S390_PSWA_REGNUM \ + || ((i) >= S390_R0_REGNUM && (i) <= S390_R15_REGNUM)))? 4 : 0) #else - internal_error (__FILE__, __LINE__, - "s390_register_u_addr invalid regnum regnum=%d", - regnum); +#define SUBOFF(gdbarch, i) 0 #endif - retval = 0; - } - return retval + blockend; + + +/* Fill GDB's register array with the general-purpose register values + in *REGP. */ +void +supply_gregset (struct regcache *regcache, const gregset_t *regp) +{ + struct gdbarch *gdbarch = get_regcache_arch (regcache); + int i; + for (i = 0; i < S390_NUM_REGS; i++) + if (regmap_gregset[i] != -1) + regcache_raw_supply (regcache, i, + (const char *)regp + regmap_gregset[i] + + SUBOFF (gdbarch, i)); +} + +/* Fill register REGNO (if it is a general-purpose register) in + *REGP with the value in GDB's register array. If REGNO is -1, + do this for all registers. */ +void +fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno) +{ + struct gdbarch *gdbarch = get_regcache_arch (regcache); + int i; + for (i = 0; i < S390_NUM_REGS; i++) + if (regmap_gregset[i] != -1) + if (regno == -1 || regno == i) + regcache_raw_collect (regcache, i, + (char *)regp + regmap_gregset[i] + + SUBOFF (gdbarch, i)); +} + +/* Fill GDB's register array with the floating-point register values + in *REGP. */ +void +supply_fpregset (struct regcache *regcache, const fpregset_t *regp) +{ + int i; + for (i = 0; i < S390_NUM_REGS; i++) + if (regmap_fpregset[i] != -1) + regcache_raw_supply (regcache, i, + (const char *)regp + regmap_fpregset[i]); +} + +/* Fill register REGNO (if it is a general-purpose register) in + *REGP with the value in GDB's register array. If REGNO is -1, + do this for all registers. */ +void +fill_fpregset (const struct regcache *regcache, fpregset_t *regp, int regno) +{ + int i; + for (i = 0; i < S390_NUM_REGS; i++) + if (regmap_fpregset[i] != -1) + if (regno == -1 || regno == i) + regcache_raw_collect (regcache, i, + (char *)regp + regmap_fpregset[i]); +} + +/* Find the TID for the current inferior thread to use with ptrace. */ +static int +s390_inferior_tid (void) +{ + /* GNU/Linux LWP ID's are process ID's. */ + int tid = TIDGET (inferior_ptid); + if (tid == 0) + tid = PIDGET (inferior_ptid); /* Not a threaded program. */ + + return tid; +} + +/* Fetch all general-purpose registers from process/thread TID and + store their values in GDB's register cache. */ +static void +fetch_regs (struct regcache *regcache, int tid) +{ + gregset_t regs; + ptrace_area parea; + + parea.len = sizeof (regs); + parea.process_addr = (addr_t) ®s; + parea.kernel_addr = offsetof (struct user_regs_struct, psw); + if (ptrace (PTRACE_PEEKUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't get registers")); + + supply_gregset (regcache, (const gregset_t *) ®s); +} + +/* Store all valid general-purpose registers in GDB's register cache + into the process/thread specified by TID. */ +static void +store_regs (const struct regcache *regcache, int tid, int regnum) +{ + gregset_t regs; + ptrace_area parea; + + parea.len = sizeof (regs); + parea.process_addr = (addr_t) ®s; + parea.kernel_addr = offsetof (struct user_regs_struct, psw); + if (ptrace (PTRACE_PEEKUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't get registers")); + + fill_gregset (regcache, ®s, regnum); + + if (ptrace (PTRACE_POKEUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't write registers")); +} + +/* Fetch all floating-point registers from process/thread TID and store + their values in GDB's register cache. */ +static void +fetch_fpregs (struct regcache *regcache, int tid) +{ + fpregset_t fpregs; + ptrace_area parea; + + parea.len = sizeof (fpregs); + parea.process_addr = (addr_t) &fpregs; + parea.kernel_addr = offsetof (struct user_regs_struct, fp_regs); + if (ptrace (PTRACE_PEEKUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't get floating point status")); + + supply_fpregset (regcache, (const fpregset_t *) &fpregs); +} + +/* Store all valid floating-point registers in GDB's register cache + into the process/thread specified by TID. */ +static void +store_fpregs (const struct regcache *regcache, int tid, int regnum) +{ + fpregset_t fpregs; + ptrace_area parea; + + parea.len = sizeof (fpregs); + parea.process_addr = (addr_t) &fpregs; + parea.kernel_addr = offsetof (struct user_regs_struct, fp_regs); + if (ptrace (PTRACE_PEEKUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't get floating point status")); + + fill_fpregset (regcache, &fpregs, regnum); + + if (ptrace (PTRACE_POKEUSR_AREA, tid, (long) &parea) < 0) + perror_with_name (_("Couldn't write floating point status")); +} + +/* Fetch register REGNUM from the child process. If REGNUM is -1, do + this for all registers. */ +static void +s390_linux_fetch_inferior_registers (struct regcache *regcache, int regnum) +{ + int tid = s390_inferior_tid (); + + if (regnum == -1 + || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1)) + fetch_regs (regcache, tid); + + if (regnum == -1 + || (regnum < S390_NUM_REGS && regmap_fpregset[regnum] != -1)) + fetch_fpregs (regcache, tid); +} + +/* Store register REGNUM back into the child process. If REGNUM is + -1, do this for all registers. */ +static void +s390_linux_store_inferior_registers (struct regcache *regcache, int regnum) +{ + int tid = s390_inferior_tid (); + + if (regnum == -1 + || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1)) + store_regs (regcache, tid, regnum); + + if (regnum == -1 + || (regnum < S390_NUM_REGS && regmap_fpregset[regnum] != -1)) + store_fpregs (regcache, tid, regnum); } -#ifndef GDBSERVER -/* watch_areas are required if you put 2 or more watchpoints on the same - address or overlapping areas gdb will call us to delete the watchpoint - more than once when we try to delete them. - attempted reference counting to reduce the number of areas unfortunately - they didn't shrink when areas had to be split overlapping occurs. */ -struct watch_area; -typedef struct watch_area watch_area; + +/* Hardware-assisted watchpoint handling. */ + +/* We maintain a list of all currently active watchpoints in order + to properly handle watchpoint removal. + + The only thing we actually need is the total address space area + spanned by the watchpoints. */ + struct watch_area { - watch_area *next; + struct watch_area *next; CORE_ADDR lo_addr; CORE_ADDR hi_addr; }; -static watch_area *watch_base = NULL; -int watch_area_cnt = 0; -static CORE_ADDR watch_lo_addr = 0, watch_hi_addr = 0; - - +static struct watch_area *watch_base = NULL; -CORE_ADDR -s390_stopped_by_watchpoint (int pid) +static int +s390_stopped_by_watchpoint (void) { per_lowcore_bits per_lowcore; ptrace_area parea; + int result; + + /* Speed up common case. */ + if (!watch_base) + return 0; parea.len = sizeof (per_lowcore); parea.process_addr = (addr_t) & per_lowcore; parea.kernel_addr = offsetof (struct user_regs_struct, per_info.lowcore); - ptrace (PTRACE_PEEKUSR_AREA, pid, &parea); - return ((per_lowcore.perc_storage_alteration == 1) && - (per_lowcore.perc_store_real_address == 0)); -} + if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea) < 0) + perror_with_name (_("Couldn't retrieve watchpoint status")); + result = (per_lowcore.perc_storage_alteration == 1 + && per_lowcore.perc_store_real_address == 0); -void -s390_fix_watch_points (int pid) + if (result) + { + /* Do not report this watchpoint again. */ + memset (&per_lowcore, 0, sizeof (per_lowcore)); + if (ptrace (PTRACE_POKEUSR_AREA, s390_inferior_tid (), &parea) < 0) + perror_with_name (_("Couldn't clear watchpoint status")); + } + + return result; +} + +static void +s390_fix_watch_points (ptid_t ptid) { + int tid; + per_struct per_info; ptrace_area parea; + CORE_ADDR watch_lo_addr = (CORE_ADDR)-1, watch_hi_addr = 0; + struct watch_area *area; + + tid = TIDGET (ptid); + if (tid == 0) + tid = PIDGET (ptid); + + for (area = watch_base; area; area = area->next) + { + watch_lo_addr = min (watch_lo_addr, area->lo_addr); + watch_hi_addr = max (watch_hi_addr, area->hi_addr); + } + parea.len = sizeof (per_info); parea.process_addr = (addr_t) & per_info; - parea.kernel_addr = PT_CR_9; - ptrace (PTRACE_PEEKUSR_AREA, pid, &parea); - /* The kernel automatically sets the psw for per depending */ - /* on whether the per control registers are set for event recording */ - /* & sets cr9 & cr10 appropriately also */ - if (watch_area_cnt) + parea.kernel_addr = offsetof (struct user_regs_struct, per_info); + if (ptrace (PTRACE_PEEKUSR_AREA, tid, &parea) < 0) + perror_with_name (_("Couldn't retrieve watchpoint status")); + + if (watch_base) { per_info.control_regs.bits.em_storage_alteration = 1; per_info.control_regs.bits.storage_alt_space_ctl = 1; @@ -133,192 +321,96 @@ s390_fix_watch_points (int pid) } per_info.starting_addr = watch_lo_addr; per_info.ending_addr = watch_hi_addr; - ptrace (PTRACE_POKEUSR_AREA, pid, &parea); + + if (ptrace (PTRACE_POKEUSR_AREA, tid, &parea) < 0) + perror_with_name (_("Couldn't modify watchpoint status")); } -int -s390_insert_watchpoint (int pid, CORE_ADDR addr, int len, int rw) +static int +s390_insert_watchpoint (CORE_ADDR addr, int len, int type) { - CORE_ADDR hi_addr = addr + len - 1; - watch_area *newarea = (watch_area *) xmalloc (sizeof (watch_area)); - - - if (newarea) - { - newarea->next = watch_base; - watch_base = newarea; - watch_lo_addr = min (watch_lo_addr, addr); - watch_hi_addr = max (watch_hi_addr, hi_addr); - newarea->lo_addr = addr; - newarea->hi_addr = hi_addr; - if (watch_area_cnt == 0) - { - watch_lo_addr = newarea->lo_addr; - watch_hi_addr = newarea->hi_addr; - } - watch_area_cnt++; - s390_fix_watch_points (pid); - } - return newarea ? 0 : -1; + struct lwp_info *lp; + ptid_t ptid; + struct watch_area *area = xmalloc (sizeof (struct watch_area)); + + if (!area) + return -1; + + area->lo_addr = addr; + area->hi_addr = addr + len - 1; + + area->next = watch_base; + watch_base = area; + + ALL_LWPS (lp, ptid) + s390_fix_watch_points (ptid); + return 0; } - -int -s390_remove_watchpoint (int pid, CORE_ADDR addr, int len) +static int +s390_remove_watchpoint (CORE_ADDR addr, int len, int type) { - watch_area *curr = watch_base, *prev, *matchCurr; - CORE_ADDR hi_addr = addr + len - 1; - CORE_ADDR watch_second_lo_addr = 0xffffffffUL, watch_second_hi_addr = 0; - int lo_addr_ref_cnt, hi_addr_ref_cnt; - prev = matchCurr = NULL; - lo_addr_ref_cnt = (addr == watch_lo_addr); - hi_addr_ref_cnt = (addr == watch_hi_addr); - while (curr) - { - if (matchCurr == NULL) - { - if (curr->lo_addr == addr && curr->hi_addr == hi_addr) - { - matchCurr = curr; - if (prev) - prev->next = curr->next; - else - watch_base = curr->next; - } - prev = curr; - } - if (lo_addr_ref_cnt) - { - if (watch_lo_addr == curr->lo_addr) - lo_addr_ref_cnt++; - if (curr->lo_addr > watch_lo_addr && - curr->lo_addr < watch_second_lo_addr) - watch_second_lo_addr = curr->lo_addr; - } - if (hi_addr_ref_cnt) - { - if (watch_hi_addr == curr->hi_addr) - hi_addr_ref_cnt++; - if (curr->hi_addr < watch_hi_addr && - curr->hi_addr > watch_second_hi_addr) - watch_second_hi_addr = curr->hi_addr; - } - curr = curr->next; - } - if (matchCurr) - { - xfree (matchCurr); - watch_area_cnt--; - if (watch_area_cnt) - { - if (lo_addr_ref_cnt == 2) - watch_lo_addr = watch_second_lo_addr; - if (hi_addr_ref_cnt == 2) - watch_hi_addr = watch_second_hi_addr; - } - else - { - watch_lo_addr = watch_hi_addr = 0; - } - s390_fix_watch_points (pid); - return 0; - } - else + struct lwp_info *lp; + ptid_t ptid; + struct watch_area *area, **parea; + + for (parea = &watch_base; *parea; parea = &(*parea)->next) + if ((*parea)->lo_addr == addr + && (*parea)->hi_addr == addr + len - 1) + break; + + if (!*parea) { fprintf_unfiltered (gdb_stderr, - "Attempt to remove nonexistent watchpoint in s390_remove_watchpoint\n"); + "Attempt to remove nonexistent watchpoint.\n"); return -1; } -} - -int -kernel_u_size (void) -{ - return sizeof (struct user); -} + area = *parea; + *parea = area->next; + xfree (area); -#if (defined (S390_FP0_REGNUM) && defined (HAVE_FPREGSET_T) && defined(HAVE_SYS_PROCFS_H) && defined (HAVE_GREGSET_T)) -void -supply_gregset (gregset_t * gregsetp) -{ - int regi; - greg_t *gregp = (greg_t *) gregsetp; - - supply_register (S390_PSWM_REGNUM, (char *) &gregp[S390_PSWM_REGNUM]); - supply_register (S390_PC_REGNUM, (char *) &gregp[S390_PC_REGNUM]); - for (regi = 0; regi < S390_NUM_GPRS; regi++) - supply_register (S390_GP0_REGNUM + regi, - (char *) &gregp[S390_GP0_REGNUM + regi]); - for (regi = 0; regi < S390_NUM_ACRS; regi++) - supply_register (S390_FIRST_ACR + regi, - (char *) &gregp[S390_FIRST_ACR + regi]); - /* unfortunately this isn't in gregsetp */ - for (regi = 0; regi < S390_NUM_CRS; regi++) - supply_register (S390_FIRST_CR + regi, NULL); + ALL_LWPS (lp, ptid) + s390_fix_watch_points (ptid); + return 0; } - -void -supply_fpregset (fpregset_t * fpregsetp) +static int +s390_can_use_hw_breakpoint (int type, int cnt, int othertype) { - int regi; - - supply_register (S390_FPC_REGNUM, (char *) &fpregsetp->fpc); - for (regi = 0; regi < S390_NUM_FPRS; regi++) - supply_register (S390_FP0_REGNUM + regi, (char *) &fpregsetp->fprs[regi]); - + return 1; } -void -fill_gregset (gregset_t * gregsetp, int regno) +static int +s390_region_ok_for_hw_watchpoint (CORE_ADDR addr, int cnt) { - int regi; - greg_t *gregp = (greg_t *) gregsetp; - - if (regno < 0) - { - regcache_collect (S390_PSWM_REGNUM, &gregp[S390_PSWM_REGNUM]); - regcache_collect (S390_PC_REGNUM, &gregp[S390_PC_REGNUM]); - for (regi = 0; regi < S390_NUM_GPRS; regi++) - regcache_collect (S390_GP0_REGNUM + regi, - &gregp[S390_GP0_REGNUM + regi]); - for (regi = 0; regi < S390_NUM_ACRS; regi++) - regcache_collect (S390_FIRST_ACR + regi, - &gregp[S390_FIRST_ACR + regi]); - } - else if (regno >= S390_PSWM_REGNUM && regno <= S390_LAST_ACR) - regcache_collect (regno, &gregp[regno]); + return 1; } -/* Given a pointer to a floating point register set in /proc format - (fpregset_t *), update the register specified by REGNO from gdb's idea - of the current floating point register set. If REGNO is -1, update - them all. */ + +void _initialize_s390_nat (void); void -fill_fpregset (fpregset_t * fpregsetp, int regno) +_initialize_s390_nat (void) { - int regi; - - if (regno < 0) - { - regcache_collect (S390_FPC_REGNUM, &fpregsetp->fpc); - for (regi = 0; regi < S390_NUM_FPRS; regi++) - regcache_collect (S390_FP0_REGNUM + regi, &fpregsetp->fprs[regi]); - } - else if (regno == S390_FPC_REGNUM) - regcache_collect (S390_FPC_REGNUM, &fpregsetp->fpc); - else if (regno >= S390_FP0_REGNUM && regno <= S390_FPLAST_REGNUM) - regcache_collect (regno, &fpregsetp->fprs[regno - S390_FP0_REGNUM]); + struct target_ops *t; + + /* Fill in the generic GNU/Linux methods. */ + t = linux_target (); + + /* Add our register access methods. */ + t->to_fetch_registers = s390_linux_fetch_inferior_registers; + t->to_store_registers = s390_linux_store_inferior_registers; + + /* Add our watchpoint methods. */ + t->to_can_use_hw_breakpoint = s390_can_use_hw_breakpoint; + t->to_region_ok_for_hw_watchpoint = s390_region_ok_for_hw_watchpoint; + t->to_have_continuable_watchpoint = 1; + t->to_stopped_by_watchpoint = s390_stopped_by_watchpoint; + t->to_insert_watchpoint = s390_insert_watchpoint; + t->to_remove_watchpoint = s390_remove_watchpoint; + + /* Register the target. */ + linux_nat_add_target (t); + linux_nat_set_new_thread (t, s390_fix_watch_points); } - - -#else -#error "There are a few possibilities here" -#error "1) You aren't compiling for linux & don't need a core dumps to work." -#error "2) The header files sys/elf.h sys/user.h sys/ptrace.h & sys/procfs.h" -#error "libc files are inconsistent with linux/include/asm-s390/" -#error "3) you didn't do a completely clean build & delete config.cache." -#endif -#endif /* GDBSERVER */