Remove a use of is_mi_like_p from darwin-nat-info.c

[deliverable/binutils-gdb.git] / gdb / s390-linux-nat.c

diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index d1d2bf8e37e7643073832bdafb24045a1ca5bcf6..14086faaa0ca91062ff19b8337c72f1135715b82 100644 (file)
--- 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-2018 Free Software Foundation, Inc.
 
    Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
    for IBM Deutschland Entwicklung GmbH, IBM Corporation.
@@ -30,6 +30,7 @@
 #include "nat/linux-ptrace.h"
 #include "gdbcmd.h"
 
+#include "s390-tdep.h"
 #include "s390-linux-tdep.h"
 #include "elf/common.h"
 
@@ -39,6 +40,8 @@
 #include <sys/procfs.h>
 #include <sys/ucontext.h>
 #include <elf.h>
+#include <algorithm>
+#include "inf-ptrace.h"
 
 /* Per-thread arch-specific data.  */
 
@@ -52,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.  */
@@ -116,7 +120,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);
@@ -150,7 +154,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,
@@ -369,7 +373,7 @@ static void
 s390_linux_fetch_inferior_registers (struct target_ops *ops,
                                     struct regcache *regcache, int regnum)
 {
-  int tid = s390_inferior_tid ();
+  pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
 
   if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
     fetch_regs (regcache, tid);
@@ -380,7 +384,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)
@@ -404,6 +408,18 @@ 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
@@ -412,7 +428,7 @@ static void
 s390_linux_store_inferior_registers (struct target_ops *ops,
                                     struct regcache *regcache, int regnum)
 {
-  int tid = s390_inferior_tid ();
+  pid_t tid = get_ptrace_pid (regcache_get_ptid (regcache));
 
   if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
     store_regs (regcache, tid, regnum);
@@ -700,8 +716,8 @@ s390_prepare_to_resume (struct lwp_info *lp)
           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);
        }
 
       /* Enable storage-alteration events.  */
@@ -722,8 +738,8 @@ s390_prepare_to_resume (struct lwp_info *lp)
               VEC_iterate (s390_watch_area, state->break_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);
            }
 
          /* If there's just one breakpoint, enable instruction-fetching
@@ -774,6 +790,14 @@ s390_new_thread (struct lwp_info *lp)
   s390_mark_per_info_changed (lp);
 }
 
+/* Function to call when a thread is being deleted.  */
+
+static void
+s390_delete_thread (struct arch_lwp_info *arch_lwp)
+{
+  xfree (arch_lwp);
+}
+
 /* Iterator callback for s390_refresh_per_info.  */
 
 static int
@@ -972,8 +996,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 :
@@ -982,7 +1011,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 :
@@ -1000,8 +1030,6 @@ s390_read_description (struct target_ops *ops)
          tdesc_s390_linux32);
 }
 
-void _initialize_s390_nat (void);
-
 void
 _initialize_s390_nat (void)
 {
@@ -1031,6 +1059,7 @@ _initialize_s390_nat (void)
   /* Register the target.  */
   linux_nat_add_target (t);
   linux_nat_set_new_thread (t, s390_new_thread);
+  linux_nat_set_delete_thread (t, s390_delete_thread);
   linux_nat_set_prepare_to_resume (t, s390_prepare_to_resume);
   linux_nat_set_forget_process (t, s390_forget_process);
   linux_nat_set_new_fork (t, s390_linux_new_fork);