2004-02-17 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>

	Committed by Jim Blandy  <jimb@redhat.com>.
	* config/s390/nm-linux.h: Update comments.  Do not include "solib.h".
	(KERNEL_U_ADDR, REGISTER_U_ADDR, U_REGS_OFFSET): Remove.
	(FETCH_INFERIOR_REGISTERS): Define.
	* config/s390/s390.mh (NATDEPFILES): Remove core-aout.o and
	core-regset.o.
	* config/s390/s390x.mt: Remove.
	* config/s390/tm-s390.h: Remove.
	* config/s390/tm-linux.h: Do not include "s390/tm-s390.h".
	(TARGET_ELF64): Remove.
	(SKIP_TRAMPOLINE_CODE): Do not undefine.
	* configure.tgt [s390-*-*, s390x-*-*]: Merge into single
	s390*-*-* case; always set gdb_target to s390.
	* regformats/reg-s390.dat: Remove control registers.
	* regformats/reg-s390x.dat: Likewise.
	* s390-tdep.h: New file.
	* s390-nat.c: Do not include <asm/processor.h> or <value.h>.
	Include "inferior.h" and "s390-tdep.h".
	Remove private definition of offsetof.
	(s390_register_u_addr): Remove.
	(regmap_gregset, regmap_fpregset): Define.
	(supply_gregset, fill_gregset): Reimplement.
	(supply_fpregset, fill_fpregset): Likewise.
	(s390_inferior_tid): New function.
	(fetch_regs, store_regs, fetch_fpregs, store_fpregs): Likewise.
	(fetch_inferior_registers, store_inferior_registers): Likewise.
	* s390-tdep.c: Do not define S390_TDEP.  Include "defs.h" instead
	of <defs.h>.  Include "reggroups.h", "regset.h", and "s390-tdep.h".
	Global replace of S390_GP0_REGNUM by S390_R0_REGNUM.
	Global replace of S390_FP0_REGNUM by S390_F0_REGNUM.
	(struct gdbarch_tdep): Define.
	(struct s390_register_info): Define.
	(s390_register_info): New variable.
	(s390_register_name): Reimplement.
	(s390_register_type): New function.
	(s390_register_raw_size, s390x_register_raw_size): Remove.
	(s390_cannot_fetch_register): Remove.
	(s390_register_byte): Remove.
	(s390_register_virtual_type, s390x_register_virtual_type): Remove.
	(s390_dwarf_regmap): New variable.
	(s390_dwarf_reg_to_regnum): New function.
	(s390_stab_reg_to_regnum): Remove.
	(s390_pseudo_register_read, s390_pseudo_register_write): New functions.
	(s390x_pseudo_register_read, s390x_pseudo_register_write): Likewise.
	(s390_convert_register_p): Likewise.
	(s390_register_to_value, s390_value_to_register): Likewise.
	(s390_register_reggroup_p): Likewise.
	(s390_regmap_gregset, s390x_regmap_gregset, s390_regmap_fpregset,
	s390_gregset, s390x_gregset, s390_fpregset): New variables.
	(s390_supply_regset, s390_regset_from_core_section): New functions.
	(GDB_TARGET_IS_ESAME): Move here from tm-s390.h.
	(S390_FPR_SIZE): Likewise.
	(S390_GPR_SIZE): Likewise.  Redefine in terms of GDB_TARGET_IS_ESAME.
	Global replace of DEPRECATED_REGISTER_SIZE by S390_GPR_SIZE.
	(S390_NUM_GPRS): Move here from tm-s390.h.
	(S390_NUM_FPRS): Likewise.
	(s390_in_function_epilogue_p): New function.
	(s390_is_sigreturn): Replace S390_PSW_ADDR_SIZE by S390_GPR_SIZE.
	Replace S390_PC_REGNUM by S390_PSWA_REGNUM.
	(s390_gdbarch_init): Allocate and set up gdbarch_tdep structure.
	Replace s390_stab_reg_to_regnum by s390_dwarf_reg_to_regnum.
	Replace S390_FP_REGNUM by S390_SP_REGNUM.
	Remove calls to:
	set_gdbarch_deprecated_max_register_raw_size,
	set_gdbarch_deprecated_max_register_virtual_size,
	set_gdbarch_deprecated_register_byte,
	set_gdbarch_cannot_fetch_register,
	set_gdbarch_cannot_store_register,
	set_gdbarch_deprecated_register_size,
	set_gdbarch_deprecated_register_raw_size,
	set_gdbarch_deprecated_register_virtual_size,
	set_gdbarch_deprecated_register_virtual_type,
	set_gdbarch_deprecated_register_bytes.
	Add calls to:
	set_gdbarch_num_pseudo_regs,
	set_gdbarch_register_type,
	set_gdbarch_convert_register_p,
	set_gdbarch_register_to_value,
	set_gdbarch_value_to_register,
	set_gdbarch_register_reggroup_p,
	set_gdbarch_regset_from_core_section,
	set_gdbarch_pseudo_register_read,
	set_gdbarch_pseudo_register_write,
	set_gdbarch_in_function_epilogue_p.
	* Makefile.in (s390-nat.o, s390-tdep.o): Update dependencies.
	(s390_tdep_h): New variable.

5 files changed, 8 insertions, 124 deletions

diff --git a/gdb/config/s390/nm-linux.h b/gdb/config/s390/nm-linux.h
index df601de..6931efb 100644
--- a/gdb/config/s390/nm-linux.h
+++ b/gdb/config/s390/nm-linux.h
@@ -1,6 +1,6 @@
 /* Native support for GNU/Linux on S390.
 
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
 
    Ported by D.J. Barrow for IBM Deutschland Entwicklung GmbH, IBM
    Corporation.  derived from i390-nmlinux.h
@@ -27,30 +27,17 @@
 
 #include "config/nm-linux.h"
 
-/* This is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-#define KERNEL_U_ADDR 0x0
 
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-	(addr) = s390_register_u_addr((blockend),(regno));
-extern int s390_register_u_addr (int, int);
+/* ptrace access.  */
 
-/* Return sizeof user struct to callers in less machine dependent routines */
+#define PTRACE_ARG3_TYPE long
+#define PTRACE_XFER_TYPE long
+
+#define FETCH_INFERIOR_REGISTERS
 
 #define KERNEL_U_SIZE kernel_u_size()
 extern int kernel_u_size (void);
 
-#define U_REGS_OFFSET 0
-
-
-/* We define this if link.h is available, because with ELF we use SVR4 style
-   shared libraries. */
-
-#ifdef HAVE_LINK_H
-#define SVR4_SHARED_LIBS
-#include "solib.h"		/* Support for shared libraries. */
-#endif
-
 
 /* WATCHPOINT SPECIFIC STUFF */
 
@@ -81,8 +68,4 @@ extern int s390_remove_watchpoint (int pid, CORE_ADDR addr, int len);
 	 ((type) == bp_read_watchpoint) || \
          ((type) == bp_access_watchpoint))
 
-
-/* Needed for s390x */
-#define PTRACE_ARG3_TYPE long
-#define PTRACE_XFER_TYPE long
 #endif /* nm_linux.h */
diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
index b45fa11..3db7bd9 100644
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/s390.mh
@@ -1,6 +1,5 @@
 # Host: S390, running Linux
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o s390-nat.o \
-	core-aout.o core-regset.o linux-proc.o gcore.o thread-db.o lin-lwp.o \
-	proc-service.o linux-nat.o
+	linux-proc.o gcore.o thread-db.o lin-lwp.o proc-service.o linux-nat.o
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/s390/s390x.mt b/gdb/config/s390/s390x.mt
deleted file mode 100644
index d0c8262..0000000
--- a/gdb/config/s390/s390x.mt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Target: S390 running Linux
-TM_FILE= tm-linux.h
-TDEPFILES=s390-tdep.o solib.o
-# Post 5.0 tdep-files
-TDEPFILES+=solib-svr4.o solib-legacy.o
-
-# needed for gdbserver.
-MT_CFLAGS= -DCONFIG_ARCH_S390X
diff --git a/gdb/config/s390/tm-linux.h b/gdb/config/s390/tm-linux.h
index 7b406e0..d13d06d 100644
--- a/gdb/config/s390/tm-linux.h
+++ b/gdb/config/s390/tm-linux.h
@@ -1,6 +1,6 @@
 /* Target definitions for GDB for a s390 running GNU/Linux.
 
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
 
    Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
    for IBM Deutschland Entwicklung GmbH, IBM Corporation.
@@ -25,18 +25,6 @@
 #ifndef TM_LINUX_H
 #define TM_LINUX_H
 
-#undef  TARGET_ELF64
-#define TARGET_ELF64 (gdbarch_tdep (current_gdbarch)->intreg_size==8)
-
 #include "config/tm-linux.h"
 
-/* Zap several macros defined in the above header so that multi-arch
-   can safely re-define them.  The ``correct fix'' involves
-   eliminating either the above include or even this file.  */
-#undef SKIP_TRAMPOLINE_CODE
-
-#include "s390/tm-s390.h"
-
-
-
 #endif /* TM_LINUX_H */
diff --git a/gdb/config/s390/tm-s390.h b/gdb/config/s390/tm-s390.h
deleted file mode 100644
index d36c279..0000000
--- a/gdb/config/s390/tm-s390.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Macro definitions for GDB on an S390.
-   Copyright 2001 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 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.  */
-
-#if !defined(TM_S390_H)
-#define TM_S390_H 1
-
-#define S390_NUM_GPRS      (16)
-#define S390_GPR_SIZE      DEPRECATED_REGISTER_SIZE
-#define S390_PSW_MASK_SIZE DEPRECATED_REGISTER_SIZE
-#define S390_PSW_ADDR_SIZE DEPRECATED_REGISTER_SIZE
-#define S390_NUM_FPRS      (16)
-#define S390_FPR_SIZE      (8)
-#define S390_FPC_SIZE      (4)
-#define S390_FPC_PAD_SIZE  (4)	/* gcc insists on aligning the fpregs */
-#define S390_NUM_CRS       (16)
-#define S390_CR_SIZE       DEPRECATED_REGISTER_SIZE
-#define S390_NUM_ACRS      (16)
-#define S390_ACR_SIZE      (4)
-
-#define S390_NUM_REGS      (2+S390_NUM_GPRS+S390_NUM_ACRS+S390_NUM_CRS+1+S390_NUM_FPRS)
-#define S390_FIRST_ACR     (2+S390_NUM_GPRS)
-#define S390_LAST_ACR      (S390_FIRST_ACR+S390_NUM_ACRS-1)
-#define S390_FIRST_CR      (S390_FIRST_ACR+S390_NUM_ACRS)
-#define S390_LAST_CR       (S390_FIRST_CR+S390_NUM_CRS-1)
-
-#define S390_PSWM_REGNUM    0
-#define S390_PC_REGNUM      1
-#define	S390_GP0_REGNUM     2	/* GPR register 0 */
-#define S390_GP_LAST_REGNUM (S390_GP0_REGNUM+S390_NUM_GPRS-1)
-/* Usually return address */
-#define S390_RETADDR_REGNUM (S390_GP0_REGNUM+14)
-/* Contains address of top of stack */
-#define S390_SP_REGNUM      (S390_GP0_REGNUM+15)
-/* needed in findvar.c still */
-#define S390_FP_REGNUM     S390_SP_REGNUM
-#define S390_FRAME_REGNUM  (S390_GP0_REGNUM+11)
-#define S390_FPC_REGNUM    (S390_GP0_REGNUM+S390_NUM_GPRS+S390_NUM_ACRS+S390_NUM_CRS)
-/* FPR (Floating point) register 0 */
-#define S390_FP0_REGNUM    (S390_FPC_REGNUM+1)
-/* Last floating point register */
-#define S390_FPLAST_REGNUM (S390_FP0_REGNUM+S390_NUM_FPRS-1)
-#define S390_LAST_REGNUM   S390_FPLAST_REGNUM
-
-
-#define S390_ACR0_OFFSET ((S390_PSW_MASK_SIZE+S390_PSW_ADDR_SIZE)+(S390_GPR_SIZE*S390_NUM_GPRS))
-#define S390_CR0_OFFSET (S390_ACR0_OFFSET+(S390_ACR_SIZE*S390_NUM_ACRS))
-#define S390_FPC_OFFSET (S390_CR0_OFFSET+(S390_CR_SIZE*S390_NUM_CRS))
-#define S390_FP0_OFFSET (S390_FPC_OFFSET+(S390_FPC_SIZE+S390_FPC_PAD_SIZE))
-#define S390_GPR6_STACK_OFFSET (GDB_TARGET_IS_ESAME ? 48:24)
-
-#define S390_REGISTER_BYTES ((4+4)+(4*S390_NUM_GPRS)+(4*S390_NUM_ACRS)+ \
-(4*S390_NUM_CRS)+(S390_FPC_SIZE+S390_FPC_PAD_SIZE)+(S390_FPR_SIZE*S390_NUM_FPRS))
-
-#define S390X_REGISTER_BYTES ((8+8)+(8*S390_NUM_GPRS)+(4*S390_NUM_ACRS)+ \
-(8*S390_NUM_CRS)+(S390_FPC_SIZE+S390_FPC_PAD_SIZE)+(S390_FPR_SIZE*S390_NUM_FPRS))
-
-#define GDB_TARGET_IS_ESAME (TARGET_ARCHITECTURE->mach == bfd_mach_s390_64)
-
-#endif /* ifndef TM_S390_H */