X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fs390-linux-nat.c;h=69a3df0b0daf1b74356384a261b0ba76bec4aa95;hb=b93a00ca4d49ce35b52110ac1c49b9e5c4587019;hp=13bf7fdaacb603ffb9018d71305422577b168991;hpb=17c84ccaf042dfb7dd81e4670b74768fe5a96017;p=external%2Fbinutils.git diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c index 13bf7fd..69a3df0 100644 --- a/gdb/s390-linux-nat.c +++ b/gdb/s390-linux-nat.c @@ -1,5 +1,5 @@ /* S390 native-dependent code for GDB, the GNU debugger. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) for IBM Deutschland Entwicklung GmbH, IBM Corporation. @@ -28,7 +28,9 @@ #include "gregset.h" #include "regset.h" #include "nat/linux-ptrace.h" +#include "gdbcmd.h" +#include "s390-tdep.h" #include "s390-linux-tdep.h" #include "elf/common.h" @@ -38,6 +40,8 @@ #include #include #include +#include +#include "inf-ptrace.h" /* Per-thread arch-specific data. */ @@ -51,6 +55,7 @@ static int have_regset_last_break = 0; static int have_regset_system_call = 0; static int have_regset_tdb = 0; static int have_regset_vxrs = 0; +static int have_regset_gs = 0; /* Register map for 32-bit executables running under a 64-bit kernel. */ @@ -92,6 +97,53 @@ static const struct regset s390_64_gregset = #define S390_PSWA_OFFSET 8 #endif +/* PER-event mask bits and PER control bits (CR9). */ + +#define PER_BIT(n) (1UL << (63 - (n))) +#define PER_EVENT_BRANCH PER_BIT (32) +#define PER_EVENT_IFETCH PER_BIT (33) +#define PER_EVENT_STORE PER_BIT (34) +#define PER_EVENT_NULLIFICATION PER_BIT (39) +#define PER_CONTROL_BRANCH_ADDRESS PER_BIT (40) +#define PER_CONTROL_SUSPENSION PER_BIT (41) +#define PER_CONTROL_ALTERATION PER_BIT (42) + +class s390_linux_nat_target final : public linux_nat_target +{ +public: + /* Add our register access methods. */ + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; + + /* Add our watchpoint methods. */ + int can_use_hw_breakpoint (enum bptype, int, int) override; + int insert_hw_breakpoint (struct gdbarch *, struct bp_target_info *) + override; + int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *) + override; + int region_ok_for_hw_watchpoint (CORE_ADDR, int) override; + bool stopped_by_watchpoint () override; + int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type, + struct expression *) override; + int remove_watchpoint (CORE_ADDR, int, enum target_hw_bp_type, + struct expression *) override; + + /* Detect target architecture. */ + const struct target_desc *read_description () override; + int auxv_parse (gdb_byte **readptr, + gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) + override; + + /* Override linux_nat_target low methods. */ + void low_new_thread (struct lwp_info *lp) override; + void low_delete_thread (struct arch_lwp_info *lp) override; + void low_prepare_to_resume (struct lwp_info *lp) override; + void low_new_fork (struct lwp_info *parent, pid_t child_pid) override; + void low_forget_process (pid_t pid) override; +}; + +static s390_linux_nat_target the_s390_linux_nat_target; + /* Fill GDB's register array with the general-purpose register values in *REGP. @@ -103,7 +155,7 @@ void supply_gregset (struct regcache *regcache, const gregset_t *regp) { #ifdef __s390x__ - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); if (gdbarch_ptr_bit (gdbarch) == 32) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -117,10 +169,10 @@ supply_gregset (struct regcache *regcache, const gregset_t *regp) pswa = extract_unsigned_integer ((const gdb_byte *) regp + S390_PSWA_OFFSET, 8, byte_order); store_unsigned_integer (buf, 4, byte_order, (pswm >> 32) | 0x80000); - regcache_raw_supply (regcache, S390_PSWM_REGNUM, buf); + regcache->raw_supply (S390_PSWM_REGNUM, buf); store_unsigned_integer (buf, 4, byte_order, (pswa & 0x7fffffff) | (pswm & 0x80000000)); - regcache_raw_supply (regcache, S390_PSWA_REGNUM, buf); + regcache->raw_supply (S390_PSWA_REGNUM, buf); return; } #endif @@ -137,7 +189,7 @@ void fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno) { #ifdef __s390x__ - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); if (gdbarch_ptr_bit (gdbarch) == 32) { regcache_collect_regset (&s390_64_gregset, regcache, regno, @@ -157,14 +209,14 @@ fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno) if (regno == -1 || regno == S390_PSWM_REGNUM) { pswm &= 0x80000000; - regcache_raw_collect (regcache, S390_PSWM_REGNUM, buf); + regcache->raw_collect (S390_PSWM_REGNUM, buf); pswm |= (extract_unsigned_integer (buf, 4, byte_order) & 0xfff7ffff) << 32; } if (regno == -1 || regno == S390_PSWA_REGNUM) { - regcache_raw_collect (regcache, S390_PSWA_REGNUM, buf); + regcache->raw_collect (S390_PSWA_REGNUM, buf); pswa = extract_unsigned_integer (buf, 4, byte_order); pswm ^= (pswm ^ pswa) & 0x80000000; pswa &= 0x7fffffff; @@ -205,9 +257,9 @@ static int s390_inferior_tid (void) { /* GNU/Linux LWP ID's are process ID's. */ - int tid = ptid_get_lwp (inferior_ptid); + int tid = inferior_ptid.lwp (); if (tid == 0) - tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ + tid = inferior_ptid.pid (); /* Not a threaded program. */ return tid; } @@ -352,11 +404,10 @@ check_regset (int tid, int regset, int regsize) /* Fetch register REGNUM from the child process. If REGNUM is -1, do this for all registers. */ -static void -s390_linux_fetch_inferior_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +void +s390_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum) { - int tid = s390_inferior_tid (); + pid_t tid = get_ptrace_pid (regcache->ptid ()); if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum)) fetch_regs (regcache, tid); @@ -367,7 +418,7 @@ s390_linux_fetch_inferior_registers (struct target_ops *ops, if (have_regset_last_break) if (regnum == -1 || regnum == S390_LAST_BREAK_REGNUM) fetch_regset (regcache, tid, NT_S390_LAST_BREAK, 8, - (gdbarch_ptr_bit (get_regcache_arch (regcache)) == 32 + (gdbarch_ptr_bit (regcache->arch ()) == 32 ? &s390_last_break_regset : &s390x_last_break_regset)); if (have_regset_system_call) @@ -391,15 +442,26 @@ s390_linux_fetch_inferior_registers (struct target_ops *ops, fetch_regset (regcache, tid, NT_S390_VXRS_HIGH, 16 * 16, &s390_vxrs_high_regset); } + + if (have_regset_gs) + { + if (regnum == -1 || (regnum >= S390_GSD_REGNUM + && regnum <= S390_GSEPLA_REGNUM)) + fetch_regset (regcache, tid, NT_S390_GS_CB, 4 * 8, + &s390_gs_regset); + if (regnum == -1 || (regnum >= S390_BC_GSD_REGNUM + && regnum <= S390_BC_GSEPLA_REGNUM)) + fetch_regset (regcache, tid, NT_S390_GS_BC, 4 * 8, + &s390_gsbc_regset); + } } /* 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 target_ops *ops, - struct regcache *regcache, int regnum) +void +s390_linux_nat_target::store_registers (struct regcache *regcache, int regnum) { - int tid = s390_inferior_tid (); + pid_t tid = get_ptrace_pid (regcache->ptid ()); if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum)) store_regs (regcache, tid, regnum); @@ -430,8 +492,8 @@ s390_linux_store_inferior_registers (struct target_ops *ops, /* Hardware-assisted watchpoint handling. */ -/* We maintain a list of all currently active watchpoints in order - to properly handle watchpoint removal. +/* For each process 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. */ @@ -444,18 +506,176 @@ typedef struct watch_area DEF_VEC_O (s390_watch_area); -VEC_s390_watch_area *watch_areas = NULL; +/* Hardware debug state. */ -static int -s390_stopped_by_watchpoint (struct target_ops *ops) +struct s390_debug_reg_state +{ + VEC_s390_watch_area *watch_areas; + VEC_s390_watch_area *break_areas; +}; + +/* Per-process data. */ + +struct s390_process_info +{ + struct s390_process_info *next; + pid_t pid; + struct s390_debug_reg_state state; +}; + +static struct s390_process_info *s390_process_list = NULL; + +/* Find process data for process PID. */ + +static struct s390_process_info * +s390_find_process_pid (pid_t pid) +{ + struct s390_process_info *proc; + + for (proc = s390_process_list; proc; proc = proc->next) + if (proc->pid == pid) + return proc; + + return NULL; +} + +/* Add process data for process PID. Returns newly allocated info + object. */ + +static struct s390_process_info * +s390_add_process (pid_t pid) +{ + struct s390_process_info *proc = XCNEW (struct s390_process_info); + + proc->pid = pid; + proc->next = s390_process_list; + s390_process_list = proc; + + return proc; +} + +/* Get data specific info for process PID, creating it if necessary. + Never returns NULL. */ + +static struct s390_process_info * +s390_process_info_get (pid_t pid) +{ + struct s390_process_info *proc; + + proc = s390_find_process_pid (pid); + if (proc == NULL) + proc = s390_add_process (pid); + + return proc; +} + +/* Get hardware debug state for process PID. */ + +static struct s390_debug_reg_state * +s390_get_debug_reg_state (pid_t pid) +{ + return &s390_process_info_get (pid)->state; +} + +/* Called whenever GDB is no longer debugging process PID. It deletes + data structures that keep track of hardware debug state. */ + +void +s390_linux_nat_target::low_forget_process (pid_t pid) { + struct s390_process_info *proc, **proc_link; + + proc = s390_process_list; + proc_link = &s390_process_list; + + while (proc != NULL) + { + if (proc->pid == pid) + { + VEC_free (s390_watch_area, proc->state.watch_areas); + VEC_free (s390_watch_area, proc->state.break_areas); + *proc_link = proc->next; + xfree (proc); + return; + } + + proc_link = &proc->next; + proc = *proc_link; + } +} + +/* linux_nat_new_fork hook. */ + +void +s390_linux_nat_target::low_new_fork (struct lwp_info *parent, pid_t child_pid) +{ + pid_t parent_pid; + struct s390_debug_reg_state *parent_state; + struct s390_debug_reg_state *child_state; + + /* NULL means no watchpoint has ever been set in the parent. In + that case, there's nothing to do. */ + if (lwp_arch_private_info (parent) == NULL) + return; + + /* GDB core assumes the child inherits the watchpoints/hw breakpoints of + the parent. So copy the debug state from parent to child. */ + + parent_pid = parent->ptid.pid (); + parent_state = s390_get_debug_reg_state (parent_pid); + child_state = s390_get_debug_reg_state (child_pid); + + child_state->watch_areas = VEC_copy (s390_watch_area, + parent_state->watch_areas); + child_state->break_areas = VEC_copy (s390_watch_area, + parent_state->break_areas); +} + +/* Dump PER state. */ + +static void +s390_show_debug_regs (int tid, const char *where) +{ + per_struct per_info; + ptrace_area parea; + + parea.len = sizeof (per_info); + parea.process_addr = (addr_t) &per_info; + parea.kernel_addr = offsetof (struct user_regs_struct, per_info); + + if (ptrace (PTRACE_PEEKUSR_AREA, tid, &parea, 0) < 0) + perror_with_name (_("Couldn't retrieve debug regs")); + + debug_printf ("PER (debug) state for %d -- %s\n" + " cr9-11: %lx %lx %lx\n" + " start, end: %lx %lx\n" + " code/ATMID: %x address: %lx PAID: %x\n", + tid, + where, + per_info.control_regs.words.cr[0], + per_info.control_regs.words.cr[1], + per_info.control_regs.words.cr[2], + per_info.starting_addr, + per_info.ending_addr, + per_info.lowcore.words.perc_atmid, + per_info.lowcore.words.address, + per_info.lowcore.words.access_id); +} + +bool +s390_linux_nat_target::stopped_by_watchpoint () +{ + struct s390_debug_reg_state *state + = s390_get_debug_reg_state (inferior_ptid.pid ()); per_lowcore_bits per_lowcore; ptrace_area parea; - int result; + + if (show_debug_regs) + s390_show_debug_regs (s390_inferior_tid (), "stop"); /* Speed up common case. */ - if (VEC_empty (s390_watch_area, watch_areas)) - return 0; + if (VEC_empty (s390_watch_area, state->watch_areas)) + return false; parea.len = sizeof (per_lowcore); parea.process_addr = (addr_t) & per_lowcore; @@ -463,8 +683,8 @@ s390_stopped_by_watchpoint (struct target_ops *ops) if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea, 0) < 0) perror_with_name (_("Couldn't retrieve watchpoint status")); - result = (per_lowcore.perc_storage_alteration == 1 - && per_lowcore.perc_store_real_address == 0); + bool result = (per_lowcore.perc_storage_alteration == 1 + && per_lowcore.perc_store_real_address == 0); if (result) { @@ -479,10 +699,11 @@ s390_stopped_by_watchpoint (struct target_ops *ops) /* Each time before resuming a thread, update its PER info. */ -static void -s390_prepare_to_resume (struct lwp_info *lp) +void +s390_linux_nat_target::low_prepare_to_resume (struct lwp_info *lp) { int tid; + pid_t pid = ptid_of_lwp (lp).pid (); per_struct per_info; ptrace_area parea; @@ -491,45 +712,95 @@ s390_prepare_to_resume (struct lwp_info *lp) unsigned ix; s390_watch_area *area; struct arch_lwp_info *lp_priv = lwp_arch_private_info (lp); + struct s390_debug_reg_state *state = s390_get_debug_reg_state (pid); + int step = lwp_is_stepping (lp); - if (lp_priv == NULL || !lp_priv->per_info_changed) + /* Nothing to do if there was never any PER info for this thread. */ + if (lp_priv == NULL) return; + /* If PER info has changed, update it. When single-stepping, disable + hardware breakpoints (if any). Otherwise we're done. */ + if (!lp_priv->per_info_changed) + { + if (!step || VEC_empty (s390_watch_area, state->break_areas)) + return; + } + lp_priv->per_info_changed = 0; - tid = ptid_get_lwp (ptid_of_lwp (lp)); + tid = ptid_of_lwp (lp).lwp (); if (tid == 0) - tid = ptid_get_pid (ptid_of_lwp (lp)); + tid = pid; parea.len = sizeof (per_info); parea.process_addr = (addr_t) & per_info; parea.kernel_addr = offsetof (struct user_regs_struct, per_info); - if (ptrace (PTRACE_PEEKUSR_AREA, tid, &parea, 0) < 0) - perror_with_name (_("Couldn't retrieve watchpoint status")); - if (!VEC_empty (s390_watch_area, watch_areas)) + /* Clear PER info, but adjust the single_step field (used by older + kernels only). */ + memset (&per_info, 0, sizeof (per_info)); + per_info.single_step = (step != 0); + + if (!VEC_empty (s390_watch_area, state->watch_areas)) { for (ix = 0; - VEC_iterate (s390_watch_area, watch_areas, ix, area); + VEC_iterate (s390_watch_area, state->watch_areas, ix, area); ix++) { - watch_lo_addr = min (watch_lo_addr, area->lo_addr); - watch_hi_addr = max (watch_hi_addr, area->hi_addr); + watch_lo_addr = std::min (watch_lo_addr, area->lo_addr); + watch_hi_addr = std::max (watch_hi_addr, area->hi_addr); } - per_info.control_regs.bits.em_storage_alteration = 1; - per_info.control_regs.bits.storage_alt_space_ctl = 1; + /* Enable storage-alteration events. */ + per_info.control_regs.words.cr[0] |= (PER_EVENT_STORE + | PER_CONTROL_ALTERATION); } - else + + if (!VEC_empty (s390_watch_area, state->break_areas)) { - per_info.control_regs.bits.em_storage_alteration = 0; - per_info.control_regs.bits.storage_alt_space_ctl = 0; + /* Don't install hardware breakpoints while single-stepping, since + our PER settings (e.g. the nullification bit) might then conflict + with the kernel's. But re-install them afterwards. */ + if (step) + lp_priv->per_info_changed = 1; + else + { + for (ix = 0; + VEC_iterate (s390_watch_area, state->break_areas, ix, area); + ix++) + { + watch_lo_addr = std::min (watch_lo_addr, area->lo_addr); + watch_hi_addr = std::max (watch_hi_addr, area->hi_addr); + } + + /* If there's just one breakpoint, enable instruction-fetching + nullification events for the breakpoint address (fast). + Otherwise stop after any instruction within the PER area and + after any branch into it (slow). */ + if (watch_hi_addr == watch_lo_addr) + per_info.control_regs.words.cr[0] |= (PER_EVENT_NULLIFICATION + | PER_EVENT_IFETCH); + else + { + /* The PER area must include the instruction before the + first breakpoint address. */ + watch_lo_addr = watch_lo_addr > 6 ? watch_lo_addr - 6 : 0; + per_info.control_regs.words.cr[0] + |= (PER_EVENT_BRANCH + | PER_EVENT_IFETCH + | PER_CONTROL_BRANCH_ADDRESS); + } + } } per_info.starting_addr = watch_lo_addr; per_info.ending_addr = watch_hi_addr; if (ptrace (PTRACE_POKEUSR_AREA, tid, &parea, 0) < 0) perror_with_name (_("Couldn't modify watchpoint status")); + + if (show_debug_regs) + s390_show_debug_regs (tid, "resume"); } /* Mark the PER info as changed, so the next resume will update it. */ @@ -545,12 +816,20 @@ s390_mark_per_info_changed (struct lwp_info *lp) /* When attaching to a new thread, mark its PER info as changed. */ -static void -s390_new_thread (struct lwp_info *lp) +void +s390_linux_nat_target::low_new_thread (struct lwp_info *lp) { s390_mark_per_info_changed (lp); } +/* Function to call when a thread is being deleted. */ + +void +s390_linux_nat_target::low_delete_thread (struct arch_lwp_info *arch_lwp) +{ + xfree (arch_lwp); +} + /* Iterator callback for s390_refresh_per_info. */ static int @@ -568,41 +847,45 @@ s390_refresh_per_info_cb (struct lwp_info *lp, void *arg) static int s390_refresh_per_info (void) { - ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ())); + ptid_t pid_ptid = ptid_t (current_lwp_ptid ().pid ()); iterate_over_lwps (pid_ptid, s390_refresh_per_info_cb, NULL); return 0; } -static int -s390_insert_watchpoint (struct target_ops *self, - CORE_ADDR addr, int len, enum target_hw_bp_type type, - struct expression *cond) +int +s390_linux_nat_target::insert_watchpoint (CORE_ADDR addr, int len, + enum target_hw_bp_type type, + struct expression *cond) { s390_watch_area area; + struct s390_debug_reg_state *state + = s390_get_debug_reg_state (inferior_ptid.pid ()); area.lo_addr = addr; area.hi_addr = addr + len - 1; - VEC_safe_push (s390_watch_area, watch_areas, &area); + VEC_safe_push (s390_watch_area, state->watch_areas, &area); return s390_refresh_per_info (); } -static int -s390_remove_watchpoint (struct target_ops *self, - CORE_ADDR addr, int len, enum target_hw_bp_type type, - struct expression *cond) +int +s390_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len, + enum target_hw_bp_type type, + struct expression *cond) { unsigned ix; s390_watch_area *area; + struct s390_debug_reg_state *state + = s390_get_debug_reg_state (inferior_ptid.pid ()); for (ix = 0; - VEC_iterate (s390_watch_area, watch_areas, ix, area); + VEC_iterate (s390_watch_area, state->watch_areas, ix, area); ix++) { if (area->lo_addr == addr && area->hi_addr == addr + len - 1) { - VEC_unordered_remove (s390_watch_area, watch_areas, ix); + VEC_unordered_remove (s390_watch_area, state->watch_areas, ix); return s390_refresh_per_info (); } } @@ -612,16 +895,63 @@ s390_remove_watchpoint (struct target_ops *self, return -1; } -static int -s390_can_use_hw_breakpoint (struct target_ops *self, - enum bptype type, int cnt, int othertype) +/* Implement the "can_use_hw_breakpoint" target_ops method. */ + +int +s390_linux_nat_target::can_use_hw_breakpoint (enum bptype type, + int cnt, int othertype) { - return type == bp_hardware_watchpoint; + if (type == bp_hardware_watchpoint || type == bp_hardware_breakpoint) + return 1; + return 0; } -static int -s390_region_ok_for_hw_watchpoint (struct target_ops *self, - CORE_ADDR addr, int cnt) +/* Implement the "insert_hw_breakpoint" target_ops method. */ + +int +s390_linux_nat_target::insert_hw_breakpoint (struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt) +{ + s390_watch_area area; + struct s390_debug_reg_state *state; + + area.lo_addr = bp_tgt->placed_address = bp_tgt->reqstd_address; + area.hi_addr = area.lo_addr; + state = s390_get_debug_reg_state (inferior_ptid.pid ()); + VEC_safe_push (s390_watch_area, state->break_areas, &area); + + return s390_refresh_per_info (); +} + +/* Implement the "remove_hw_breakpoint" target_ops method. */ + +int +s390_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt) +{ + unsigned ix; + struct watch_area *area; + struct s390_debug_reg_state *state; + + state = s390_get_debug_reg_state (inferior_ptid.pid ()); + for (ix = 0; + VEC_iterate (s390_watch_area, state->break_areas, ix, area); + ix++) + { + if (area->lo_addr == bp_tgt->placed_address) + { + VEC_unordered_remove (s390_watch_area, state->break_areas, ix); + return s390_refresh_per_info (); + } + } + + fprintf_unfiltered (gdb_stderr, + "Attempt to remove nonexistent breakpoint.\n"); + return -1; +} + +int +s390_linux_nat_target::region_ok_for_hw_watchpoint (CORE_ADDR addr, int cnt) { return 1; } @@ -645,9 +975,10 @@ s390_target_wordsize (void) return wordsize; } -static int -s390_auxv_parse (struct target_ops *ops, gdb_byte **readptr, - gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) +int +s390_linux_nat_target::auxv_parse (gdb_byte **readptr, + gdb_byte *endptr, CORE_ADDR *typep, + CORE_ADDR *valp) { int sizeof_auxv_field = s390_target_wordsize (); enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); @@ -668,8 +999,8 @@ s390_auxv_parse (struct target_ops *ops, gdb_byte **readptr, return 1; } -static const struct target_desc * -s390_read_description (struct target_ops *ops) +const struct target_desc * +s390_linux_nat_target::read_description () { int tid = s390_inferior_tid (); @@ -687,7 +1018,7 @@ s390_read_description (struct target_ops *ops) { CORE_ADDR hwcap = 0; - target_auxv_search (¤t_target, AT_HWCAP, &hwcap); + target_auxv_search (current_top_target (), AT_HWCAP, &hwcap); have_regset_tdb = (hwcap & HWCAP_S390_TE) && check_regset (tid, NT_S390_TDB, s390_sizeof_tdbregset); @@ -695,8 +1026,13 @@ s390_read_description (struct target_ops *ops) && check_regset (tid, NT_S390_VXRS_LOW, 16 * 8) && check_regset (tid, NT_S390_VXRS_HIGH, 16 * 16); + have_regset_gs = (hwcap & HWCAP_S390_GS) + && check_regset (tid, NT_S390_GS_CB, 4 * 8) + && check_regset (tid, NT_S390_GS_BC, 4 * 8); + if (s390_target_wordsize () == 8) - return (have_regset_vxrs ? + return (have_regset_gs ? tdesc_s390x_gs_linux64 : + have_regset_vxrs ? (have_regset_tdb ? tdesc_s390x_tevx_linux64 : tdesc_s390x_vx_linux64) : have_regset_tdb ? tdesc_s390x_te_linux64 : @@ -705,7 +1041,8 @@ s390_read_description (struct target_ops *ops) tdesc_s390x_linux64); if (hwcap & HWCAP_S390_HIGH_GPRS) - return (have_regset_vxrs ? + return (have_regset_gs ? tdesc_s390_gs_linux64 : + have_regset_vxrs ? (have_regset_tdb ? tdesc_s390_tevx_linux64 : tdesc_s390_vx_linux64) : have_regset_tdb ? tdesc_s390_te_linux64 : @@ -723,34 +1060,23 @@ s390_read_description (struct target_ops *ops) tdesc_s390_linux32); } -void _initialize_s390_nat (void); - void _initialize_s390_nat (void) { - 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; - - /* Detect target architecture. */ - t->to_read_description = s390_read_description; - t->to_auxv_parse = s390_auxv_parse; - /* Register the target. */ - linux_nat_add_target (t); - linux_nat_set_new_thread (t, s390_new_thread); - linux_nat_set_prepare_to_resume (t, s390_prepare_to_resume); + linux_target = &the_s390_linux_nat_target; + add_inf_child_target (&the_s390_linux_nat_target); + + /* A maintenance command to enable showing the PER state. */ + add_setshow_boolean_cmd ("show-debug-regs", class_maintenance, + &show_debug_regs, _("\ +Set whether to show the PER (debug) hardware state."), _("\ +Show whether to show the PER (debug) hardware state."), _("\ +Use \"on\" to enable, \"off\" to disable.\n\ +If enabled, the PER state is shown after it is changed by GDB,\n\ +and when the inferior triggers a breakpoint or watchpoint."), + NULL, + NULL, + &maintenance_set_cmdlist, + &maintenance_show_cmdlist); }