* gdb.mi/mi-var-cmd.exp: Correct test name. Allow any value for

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

diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c
index a2a7759b8228a3d9ca6f6e227230d824b4ff7417..a7ccd747fb52ba3eb0258cf67341ca1ff500d08d 100644 (file)
--- a/gdb/s390-nat.c
+++ b/gdb/s390-nat.c
@@ -1,5 +1,6 @@
 /* S390 native-dependent code for GDB, the GNU debugger.
-   Copyright 2001, 2003 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.
@@ -18,13 +19,14 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
-#include "tm.h"
 #include "regcache.h"
 #include "inferior.h"
+#include "target.h"
+#include "linux-nat.h"
 
 #include "s390-tdep.h"
 
@@ -32,7 +34,6 @@
 #include <sys/ptrace.h>
 #include <asm/types.h>
 #include <sys/procfs.h>
-#include <sys/user.h>
 #include <sys/ucontext.h>
 
 
@@ -47,6 +48,18 @@
 
 #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(i) \
+       ((TARGET_PTR_BIT == 32 \
+         && ((i) == S390_PSWA_REGNUM \
+             || ((i) >= S390_R0_REGNUM && (i) <= S390_R15_REGNUM)))? 4 : 0)
+#else
+#define SUBOFF(i) 0
+#endif
+
 
 /* Fill GDB's register array with the general-purpose register values
    in *REGP.  */
@@ -57,7 +70,7 @@ supply_gregset (gregset_t *regp)
   for (i = 0; i < S390_NUM_REGS; i++)
     if (regmap_gregset[i] != -1)
       regcache_raw_supply (current_regcache, i, 
-                          (char *)regp + regmap_gregset[i]);
+                          (char *)regp + regmap_gregset[i] + SUBOFF (i));
 }
 
 /* Fill register REGNO (if it is a general-purpose register) in
@@ -71,7 +84,7 @@ fill_gregset (gregset_t *regp, int regno)
     if (regmap_gregset[i] != -1)
       if (regno == -1 || regno == i)
        regcache_raw_collect (current_regcache, i, 
-                             (char *)regp + regmap_gregset[i]);
+                             (char *)regp + regmap_gregset[i] + SUBOFF (i));
 }
 
 /* Fill GDB's register array with the floating-point register values
@@ -124,7 +137,7 @@ fetch_regs (int tid)
   parea.process_addr = (addr_t) &regs;
   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");
+    perror_with_name (_("Couldn't get registers"));
 
   supply_gregset (&regs);
 }
@@ -141,12 +154,12 @@ store_regs (int tid, int regnum)
   parea.process_addr = (addr_t) &regs;
   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");
+    perror_with_name (_("Couldn't get registers"));
 
   fill_gregset (&regs, regnum);
 
   if (ptrace (PTRACE_POKEUSR_AREA, tid, (long) &parea) < 0)
-    perror_with_name ("Couldn't write registers");
+    perror_with_name (_("Couldn't write registers"));
 }
 
 /* Fetch all floating-point registers from process/thread TID and store
@@ -161,7 +174,7 @@ fetch_fpregs (int tid)
   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");
+    perror_with_name (_("Couldn't get floating point status"));
 
   supply_fpregset (&fpregs);
 }
@@ -178,18 +191,18 @@ store_fpregs (int tid, int regnum)
   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");
+    perror_with_name (_("Couldn't get floating point status"));
 
   fill_fpregset (&fpregs, regnum);
 
   if (ptrace (PTRACE_POKEUSR_AREA, tid, (long) &parea) < 0)
-    perror_with_name ("Couldn't write floating point status");
+    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.  */
-void
-fetch_inferior_registers (int regnum)
+static void
+s390_linux_fetch_inferior_registers (int regnum)
 {
   int tid = s390_inferior_tid ();
 
@@ -204,8 +217,8 @@ fetch_inferior_registers (int regnum)
 
 /* Store register REGNUM back into the child process.  If REGNUM is
    -1, do this for all registers.  */
-void
-store_inferior_registers (int regnum)
+static void
+s390_linux_store_inferior_registers (int regnum)
 {
   int tid = s390_inferior_tid ();
 
@@ -236,7 +249,7 @@ struct watch_area
 
 static struct watch_area *watch_base = NULL;
 
-int
+static int
 s390_stopped_by_watchpoint (void)
 {
   per_lowcore_bits per_lowcore;
@@ -250,7 +263,7 @@ s390_stopped_by_watchpoint (void)
   parea.process_addr = (addr_t) & per_lowcore;
   parea.kernel_addr = offsetof (struct user_regs_struct, per_info.lowcore);
   if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea) < 0)
-    perror_with_name ("Couldn't retrieve watchpoint status");
+    perror_with_name (_("Couldn't retrieve watchpoint status"));
 
   return per_lowcore.perc_storage_alteration == 1
         && per_lowcore.perc_store_real_address == 0;
@@ -277,7 +290,7 @@ s390_fix_watch_points (void)
   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)
-    perror_with_name ("Couldn't retrieve watchpoint status");
+    perror_with_name (_("Couldn't retrieve watchpoint status"));
 
   if (watch_base)
     {
@@ -293,11 +306,11 @@ s390_fix_watch_points (void)
   per_info.ending_addr = watch_hi_addr;
 
   if (ptrace (PTRACE_POKEUSR_AREA, tid, &parea) < 0)
-    perror_with_name ("Couldn't modify watchpoint status");
+    perror_with_name (_("Couldn't modify watchpoint status"));
 }
 
-int
-s390_insert_watchpoint (CORE_ADDR addr, int len)
+static int
+s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
 {
   struct watch_area *area = xmalloc (sizeof (struct watch_area));
   if (!area)
@@ -313,8 +326,8 @@ s390_insert_watchpoint (CORE_ADDR addr, int len)
   return 0;
 }
 
-int
-s390_remove_watchpoint (CORE_ADDR addr, int len)
+static int
+s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
 {
   struct watch_area *area, **parea;
 
@@ -338,10 +351,41 @@ s390_remove_watchpoint (CORE_ADDR addr, int len)
   return 0;
 }
 
+static int
+s390_can_use_hw_breakpoint (int type, int cnt, int othertype)
+{
+  return 1;
+}
 
-int
-kernel_u_size (void)
+static int
+s390_region_ok_for_hw_watchpoint (CORE_ADDR addr, int cnt)
 {
-  return sizeof (struct user);
+  return 1;
 }
 
+
+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;
+
+  /* Register the target.  */
+  linux_nat_add_target (t);
+}