Merge GDB 7.5.1

gdb/s390-nat.c

 /* S390 native-dependent code for GDB, the GNU debugger.
    Copyright (C) 2001, 2003-2007, 2009, 2012 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 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "regcache.h"
 #include "inferior.h"
 #include "target.h"
 #include "linux-nat.h"
 #include "auxv.h"
+#include "gregset.h"
 
 #include "s390-tdep.h"
 #include "elf/common.h"
 
 #include <asm/ptrace.h>
 #include <sys/ptrace.h>
 #include <asm/types.h>
 #include <sys/procfs.h>
 #include <sys/ucontext.h>
 #include <elf.h>
@@ skipping 426 matching lines @@
       /* 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)
+s390_fix_watch_points (struct lwp_info *lp)
 {
   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);
+  tid = TIDGET (lp->ptid);
   if (tid == 0)
-    tid = PIDGET (ptid);
+    tid = PIDGET (lp->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 = offsetof (struct user_regs_struct, per_info);
@@ skipping 27 matching lines @@
   if (!area)
     return -1; 
 
   area->lo_addr = addr;
   area->hi_addr = addr + len - 1;
  
   area->next = watch_base;
   watch_base = area;
 
   ALL_LWPS (lp)
-    s390_fix_watch_points (lp->ptid);
+    s390_fix_watch_points (lp);
   return 0;
 }
 
 static int
 s390_remove_watchpoint (CORE_ADDR addr, int len, int type,
                         struct expression *cond)
 {
   struct lwp_info *lp;
   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.\n");
       return -1;
     }
 
   area = *parea;
   *parea = area->next;
   xfree (area);
 
   ALL_LWPS (lp)
-    s390_fix_watch_points (lp->ptid);
+    s390_fix_watch_points (lp);
   return 0;
 }
 
 static int
 s390_can_use_hw_breakpoint (int type, int cnt, int othertype)
 {
   return type == bp_hardware_watchpoint;
 }
 
 static int
@@ skipping 116 matching lines @@
   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_fix_watch_points);
 }