2002-02-27 Daniel Jacobowitz <drow@mvista.com>

        * gdbserver/linux-s390-low.c: New file.
        * regformats/reg-s390.dat: New file.
        * regformats/reg-s390x.dat: New file.
        * gdbserver/configure.srv: Add S/390.
        * gdbserver/Makefile.in: Add S/390.
        * configure.tgt: Enable gdbserver for S/390.

7 files changed, 249 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bf5ed3f283..a6b446b5c59 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* gdbserver/linux-s390-low.c: New file.
+	* regformats/reg-s390.dat: New file.
+	* regformats/reg-s390x.dat: New file.
+	* gdbserver/configure.srv: Add S/390.
+	* gdbserver/Makefile.in: Add S/390.
+	* configure.tgt: Enable gdbserver for S/390.
+
 2002-02-28  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* go32-nat.c (_initialize_go32_nat): Don't use periods in the
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index ce262746a61..efa9114591b 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -241,8 +241,12 @@ rs6000-*-lynxos*)	gdb_target=rs6000lynx ;;
 rs6000-*-aix4*)		gdb_target=aix4 ;;
 rs6000-*-*)		gdb_target=rs6000 ;;
 
-s390-*-*)		gdb_target=s390 ;;
-s390x-*-*)		gdb_target=s390x ;;
+s390-*-*)		gdb_target=s390
+			build_gdbserver=yes
+			;;
+s390x-*-*)		gdb_target=s390x
+			build_gdbserver=yes
+			;;
 
 sh*-*-pe)		gdb_target=wince ;;
 sh-*-hms)		gdb_target=embed ;;
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 31d3f62be07..9ed226eb7f6 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -242,6 +242,7 @@ linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h)
 linux-ia64-low.o: linux-ia64-low.c $(linux_low_h) $(server_h)
 linux-mips-low.o: linux-mips-low.c $(linux_low_h) $(server_h)
 linux-ppc-low.o: linux-ppc-low.c $(linux_low_h) $(server_h)
+linux-s390-low.o: linux-s390-low.c $(linux_low_h) $(server_h)
 linux-sh-low.o: linux-sh-low.c $(linux_low_h) $(server_h)
 linux-x86-64-low.o: linux-x86-64-low.c $(linux_low_h) $(server_h)
 
@@ -274,6 +275,12 @@ reg-mips.c : $(srcdir)/../regformats/reg-mips.dat $(regdat_sh)
 reg-ppc.o : reg-ppc.c $(regdef_h)
 reg-ppc.c : $(srcdir)/../regformats/reg-ppc.dat $(regdat_sh)
 	sh $(regdat_sh) $(srcdir)/../regformats/reg-ppc.dat reg-ppc.c
+reg-s390.o : reg-s390.c $(regdef_h)
+reg-s390.c : $(srcdir)/../regformats/reg-s390.dat $(regdat_sh)
+	sh $(regdat_sh) $(srcdir)/../regformats/reg-s390.dat reg-s390.c
+reg-s390x.o : reg-s390x.c $(regdef_h)
+reg-s390x.c : $(srcdir)/../regformats/reg-s390x.dat $(regdat_sh)
+	sh $(regdat_sh) $(srcdir)/../regformats/reg-s390x.dat reg-s390x.c
 reg-sh.o : reg-sh.c $(regdef_h)
 reg-sh.c : $(srcdir)/../regformats/reg-sh.dat $(regdat_sh)
 	sh $(regdat_sh) $(srcdir)/../regformats/reg-sh.dat reg-sh.c
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 523dcb6aaeb..3268cd77207 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -43,6 +43,14 @@ case "${target}" in
 			srv_tgtobj="linux-low.o linux-ppc-low.o"
 			srv_linux_usrregs=yes
 			;;
+  s390-*-linux*)	srv_regobj=reg-s390.o
+			srv_tgtobj="linux-low.o linux-s390-low.o"
+			srv_linux_usrregs=yes
+			;;
+  s390x-*-linux*)	srv_regobj=reg-s390x.o
+			srv_tgtobj="linux-low.o linux-s390-low.o"
+			srv_linux_usrregs=yes
+			;;
   sh*-*-linux*)		srv_regobj=reg-sh.o
 			srv_tgtobj="linux-low.o linux-sh-low.o"
 			srv_linux_usrregs=yes
diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c
new file mode 100644
index 00000000000..1920b9c7ad4
--- /dev/null
+++ b/gdb/gdbserver/linux-s390-low.c
@@ -0,0 +1,81 @@
+/* GNU/Linux S/390 specific low level interface, for the remote server
+   for GDB.
+   Copyright 2001, 2002
+   Free Software Foundation, Inc.
+
+   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 2 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, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* This file is used for both 31-bit and 64-bit S/390 systems.  */
+
+#include "server.h"
+#include "linux-low.h"
+
+#include <asm/ptrace.h>
+
+int num_regs = 67;
+
+int regmap[] = {
+  PT_PSWMASK, PT_PSWADDR,
+
+  PT_GPR0, PT_GPR1, PT_GPR2, PT_GPR3,
+  PT_GPR4, PT_GPR5, PT_GPR6, PT_GPR7,
+  PT_GPR8, PT_GPR9, PT_GPR10, PT_GPR11,
+  PT_GPR12, PT_GPR13, PT_GPR14, PT_GPR15,
+
+  PT_ACR0, PT_ACR1, PT_ACR2, PT_ACR3,
+  PT_ACR4, PT_ACR5, PT_ACR6, PT_ACR7,
+  PT_ACR8, PT_ACR9, PT_ACR10, PT_ACR11,
+  PT_ACR12, PT_ACR13, PT_ACR14, PT_ACR15,
+
+  -1, -1, -1, -1,
+  -1, -1, -1, -1,
+  -1, PT_CR_9, PT_CR_10, PT_CR_11,
+  -1, -1, -1, -1,
+  
+  PT_FPC,
+
+#ifdef PT_FPR0_HI
+  PT_FPR0_HI, PT_FPR1_HI, PT_FPR2_HI, PT_FPR3_HI,
+  PT_FPR4_HI, PT_FPR5_HI, PT_FPR6_HI, PT_FPR7_HI,
+  PT_FPR8_HI, PT_FPR9_HI, PT_FPR10_HI, PT_FPR11_HI,
+  PT_FPR12_HI, PT_FPR13_HI, PT_FPR14_HI, PT_FPR15_HI,
+#else
+  PT_FPR0, PT_FPR1, PT_FPR2, PT_FPR3,
+  PT_FPR4, PT_FPR5, PT_FPR6, PT_FPR7,
+  PT_FPR8, PT_FPR9, PT_FPR10, PT_FPR11,
+  PT_FPR12, PT_FPR13, PT_FPR14, PT_FPR15,
+#endif
+};
+
+int
+cannot_fetch_register (int regno)
+{
+  if (regmap[regno] == -1)
+    return 1;
+
+  return 0;
+}
+
+int
+cannot_store_register (int regno)
+{
+  if (regmap[regno] == -1)
+    return 1;
+
+  return 0;
+}
diff --git a/gdb/regformats/reg-s390.dat b/gdb/regformats/reg-s390.dat
new file mode 100644
index 00000000000..c533a489459
--- /dev/null
+++ b/gdb/regformats/reg-s390.dat
@@ -0,0 +1,69 @@
+name:s390
+expedite:r14,r15,pswa
+32:pswm
+32:pswa
+32:r0
+32:r1
+32:r2
+32:r3
+32:r4
+32:r5
+32:r6
+32:r7
+32:r8
+32:r9
+32:r10
+32:r11
+32:r12
+32:r13
+32:r14
+32:r15
+32:acr0
+32:acr1
+32:acr2
+32:acr3
+32:acr4
+32:acr5
+32:acr6
+32:acr7
+32:acr8
+32:acr9
+32:acr10
+32:acr11
+32:acr12
+32:acr13
+32:acr14
+32:acr15
+32:cr0
+32:cr1
+32:cr2
+32:cr3
+32:cr4
+32:cr5
+32:cr6
+32:cr7
+32:cr8
+32:cr9
+32:cr10
+32:cr11
+32:cr12
+32:cr13
+32:cr14
+32:cr15
+32:fpc
+64:f0
+64:f1
+64:f2
+64:f3
+64:f4
+64:f5
+64:f6
+64:f7
+64:f8
+64:f9
+64:f10
+64:f11
+64:f12
+64:f13
+64:f14
+64:f15
diff --git a/gdb/regformats/reg-s390x.dat b/gdb/regformats/reg-s390x.dat
new file mode 100644
index 00000000000..25bef05645a
--- /dev/null
+++ b/gdb/regformats/reg-s390x.dat
@@ -0,0 +1,69 @@
+name:s390
+expedite:r14,r15,pswa
+64:pswm
+64:pswa
+64:r0
+64:r1
+64:r2
+64:r3
+64:r4
+64:r5
+64:r6
+64:r7
+64:r8
+64:r9
+64:r10
+64:r11
+64:r12
+64:r13
+64:r14
+64:r15
+32:acr0
+32:acr1
+32:acr2
+32:acr3
+32:acr4
+32:acr5
+32:acr6
+32:acr7
+32:acr8
+32:acr9
+32:acr10
+32:acr11
+32:acr12
+32:acr13
+32:acr14
+32:acr15
+64:cr0
+64:cr1
+64:cr2
+64:cr3
+64:cr4
+64:cr5
+64:cr6
+64:cr7
+64:cr8
+64:cr9
+64:cr10
+64:cr11
+64:cr12
+64:cr13
+64:cr14
+64:cr15
+32:fpc
+64:f0
+64:f1
+64:f2
+64:f3
+64:f4
+64:f5
+64:f6
+64:f7
+64:f8
+64:f9
+64:f10
+64:f11
+64:f12
+64:f13
+64:f14
+64:f15