2007-11-07 Markus Deuling <deuling@de.ibm.com>

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

diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c
index 845b8dd612aae91dc28ed65e7e8b2b988c433900..6fe6939bcafbd998f11fa5083a510dcb94baaf4e 100644 (file)
--- a/gdb/s390-nat.c
+++ b/gdb/s390-nat.c
@@ -9,7 +9,7 @@
 
    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,
@@ -18,9 +18,7 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "regcache.h"
@@ -53,7 +51,7 @@
    to make them look like 32-bit registers.  */
 #ifdef __s390x__
 #define SUBOFF(i) \
-       ((TARGET_PTR_BIT == 32 \
+       ((gdbarch_ptr_bit (current_gdbarch) == 32 \
          && ((i) == S390_PSWA_REGNUM \
              || ((i) >= S390_R0_REGNUM && (i) <= S390_R15_REGNUM)))? 4 : 0)
 #else
@@ -254,6 +252,7 @@ s390_stopped_by_watchpoint (void)
 {
   per_lowcore_bits per_lowcore;
   ptrace_area parea;
+  int result;
 
   /* Speed up common case.  */
   if (!watch_base)
@@ -265,14 +264,24 @@ s390_stopped_by_watchpoint (void)
   if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea) < 0)
     perror_with_name (_("Couldn't retrieve watchpoint status"));
 
-  return per_lowcore.perc_storage_alteration == 1
-        && per_lowcore.perc_store_real_address == 0;
+  result = (per_lowcore.perc_storage_alteration == 1
+           && per_lowcore.perc_store_real_address == 0);
+
+  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 (void)
+s390_fix_watch_points (ptid_t ptid)
 {
-  int tid = s390_inferior_tid ();
+  int tid;
 
   per_struct per_info;
   ptrace_area parea;
@@ -280,6 +289,10 @@ s390_fix_watch_points (void)
   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);
@@ -312,7 +325,10 @@ s390_fix_watch_points (void)
 static int
 s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
 {
+  struct lwp_info *lp;
+  ptid_t ptid;
   struct watch_area *area = xmalloc (sizeof (struct watch_area));
+
   if (!area)
     return -1; 
 
@@ -322,13 +338,16 @@ s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
   area->next = watch_base;
   watch_base = area;
 
-  s390_fix_watch_points ();
+  ALL_LWPS (lp, ptid)
+    s390_fix_watch_points (ptid);
   return 0;
 }
 
 static int
 s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
 {
+  struct lwp_info *lp;
+  ptid_t ptid;
   struct watch_area *area, **parea;
 
   for (parea = &watch_base; *parea; parea = &(*parea)->next)
@@ -347,7 +366,8 @@ s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
   *parea = area->next;
   xfree (area);
 
-  s390_fix_watch_points ();
+  ALL_LWPS (lp, ptid)
+    s390_fix_watch_points (ptid);
   return 0;
 }
 
@@ -388,4 +408,5 @@ _initialize_s390_nat (void)
 
   /* Register the target.  */
   linux_nat_add_target (t);
+  linux_nat_set_new_thread (t, s390_fix_watch_points);
 }