* vx-share/{reg.h,xdr_regs.h,xdr_regs.c}: Remove, unused.

* remote-vx.c:  Don't include vx-share/reg.h.
* vx-share/ptrace.h:  Reproduce from scratch.

6 files changed, 21 insertions, 279 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c9b045db8b..6cfe59b988 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec  9 19:53:25 1992  John Gilmore  (gnu@cygnus.com)
+
+	* vx-share/{reg.h,xdr_regs.h,xdr_regs.c}:  Remove, unused.
+	* remote-vx.c:  Don't include vx-share/reg.h.
+	* vx-share/ptrace.h:  Reproduce from scratch.
+
 Tue Dec  8 13:30:58 1992  Fred Fish  (fnf@cygnus.com)
 
 	* c-lang.c (_initialize_c_language):  Name changed from
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 3fef20880c..90a0ef11f6 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -48,7 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "vx-share/xdr_ld.h"
 #include "vx-share/xdr_rdb.h"
 #include "vx-share/dbgRpcLib.h"
-#include "vx-share/reg.h"
 
 #include <symtab.h>
 
diff --git a/gdb/vx-share/ptrace.h b/gdb/vx-share/ptrace.h
index bdc0f0fc94..8f7b05728a 100644
--- a/gdb/vx-share/ptrace.h
+++ b/gdb/vx-share/ptrace.h
@@ -1,7 +1,16 @@
-/* THIS FILE WAS `BORROWED' FROM A COPYRIGHTED
-   SUN MICROSYSTEMS INCLUDE FILE.  IT NEEDS TO BE REBUILT FROM SCRATCH.
+/* Ptrace request codes implemented by the VxWorks remote debug protocol.
+   These values match those used by SunOS in some old release.  */
 
-	John Gilmore
-	Cygnus Support
- */
-FIXME
+enum ptracereq {
+	PTRACE_GETREGS		= 12,
+	PTRACE_GETFPREGS	= 14,
+	PTRACE_SETREGS		= 13,
+	PTRACE_SETFPREGS	= 15,
+	PTRACE_WRITEDATA	= 17,
+	PTRACE_READDATA		= 16,
+	PTRACE_SINGLESTEP	= 9,
+	PTRACE_CONT		= 7,
+	PTRACE_ATTACH		= 10,
+	PTRACE_DETACH		= 11,
+	PTRACE_KILL		= 8	/* no trailing comma */
+};
diff --git a/gdb/vx-share/reg.h b/gdb/vx-share/reg.h
deleted file mode 100644
index bbc426e867..0000000000
--- a/gdb/vx-share/reg.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _REG_
-#define _REG_
-
-#ifdef I80960
-
-/* Intel 960 register values passed over the wire by RPC:  */
-
-struct regs
-{
-  int r_lreg[16];		/* local registers              */
-  int r_greg[16];		/* global registers             */
-  int r_pcw;			/* process control word         */
-  int r_acw;			/* arithmetic control word      */
-  int r_tcw;			/* trace control word           */
-};
-
-#define FP_REG_SIZE	12
-
-struct fp_status {
-	char	fps_regs[4][FP_REG_SIZE];	/* floating point regs */
-};
-
-#else  /* For now, just 68000 */
-
-/* THE 68000 VERSION OF THIS FILE WAS `BORROWED' FROM A COPYRIGHTED
-   SUN MICROSYSTEMS INCLUDE FILE.  IT NEEDS TO BE REBUILT FROM SCRATCH.
-
-	John Gilmore
-	Cygnus Support
- */
-FIXME
-   
-#endif /* !I80960 */
-#endif !_REG_
diff --git a/gdb/vx-share/xdr_regs.c b/gdb/vx-share/xdr_regs.c
deleted file mode 100644
index e2848d5be0..0000000000
--- a/gdb/vx-share/xdr_regs.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* xdr_regs.c - xdr routines for 68k registers */
-
-/* Copyright 1984, 1985, 1986, 1987, 1988, 1989, 1992 Free Software Foundation, Inc.
-
-   This code was donated by Wind River Systems, Inc. */
-
-/*
-DESCRIPTION
-This module contains the eXternal Data Representation (XDR) routines
-for the GDB interface for VxWorks.
-*/
-
-#include "vxWorks.h"
-#include <rpc/rpc.h>
-#include "reg.h"
-#include "xdr_regs.h"
-
-
-#ifdef I80960
-/*******************************************************************************
-*
-* xdr_regs - xdr routine for i960 registers
-*/
-
-bool_t xdr_regs (xdrs, objp)
-    XDR *xdrs;
-    struct regs *objp;
-
-    {
-    if (! xdr_opaque(xdrs, (char *) objp->r_lreg, 16 * sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) objp->r_greg, 16 * sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) &objp->r_pcw, sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) &objp->r_acw, sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) &objp->r_tcw, sizeof(int)))
-	return(FALSE);
-
-    return(TRUE);
-    }
-
-/*******************************************************************************
-*
-* xdr_fp_status - xdr routine for i960 floating point registers
-*/
-
-bool_t xdr_fp_status (xdrs, objp)
-    XDR *xdrs;
-    struct fp_status *objp;
-
-    {
-    unsigned int size = 4 * FP_REG_SIZE;
-
-    /* We use xdr_bytes to indicate how many bytes of FP regs there are! */
-    if (! xdr_bytes (xdrs, (char *) objp->fps_regs, &size, 4 * FP_REG_SIZE))
-	return (FALSE);
-    return (TRUE);
-    }
-
-/*******************************************************************************
-*
-* xdr_ext_fp - xdr for a single fp register
-*/
-
-bool_t xdr_ext_fp (xdrs, objp)
-    XDR *xdrs;
-    char *objp;
-
-    {
-    unsigned int size = FP_REG_SIZE;
-
-    if (! xdr_bytes (xdrs, objp, &size, FP_REG_SIZE)) 
-	return(FALSE);
-
-    return(TRUE);
-    }
-#else	/* Must be 68K if it isn't i960 -- for now.  FIXME!  */
-
-/*******************************************************************************
-*
-* xdr_regs - xdr routine for 68k registers
-*/
-
-bool_t xdr_regs (xdrs, objp)
-    XDR *xdrs;
-    struct regs *objp;
-
-    {
-    if (! xdr_opaque(xdrs, (char *) objp->r_dreg, 8 * sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) objp->r_areg, 8 * sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) &objp->r_sr, sizeof(int)))
-	return(FALSE);
-    if (! xdr_opaque(xdrs, (char *) &objp->r_pc, sizeof(int)))
-	return(FALSE);
-
-    return(TRUE);
-    }
-
-/*******************************************************************************
-*
-* xdr_ext_fp - xdr for a single fp register
-*/
-
-bool_t xdr_ext_fp (xdrs, objp)
-    XDR *xdrs;
-    ext_fp *objp;
-
-    {
-    if (! xdr_vector(xdrs, (char *) objp->fp, 3, sizeof(int), xdr_int)) 
-	return(FALSE);
-
-    return(TRUE);
-    }
-/*******************************************************************************
-*
-* xdr_fp_status - xdr routine for floating point registers
-*/
-
-bool_t xdr_fp_status (xdrs, objp)
-    XDR *xdrs;
-    struct fp_status *objp;
-
-    {
-    if (! xdr_vector (xdrs, (char *) objp->fps_regs, 8, 
-		sizeof(ext_fp), xdr_ext_fp))
-	return (FALSE);
-    if (! xdr_int (xdrs, &objp->fps_control)) 
-	return (FALSE);
-    if (! xdr_int (xdrs, &objp->fps_status)) 
-	return (FALSE);
-    if (! xdr_int (xdrs, &objp->fps_iaddr)) 
-	return (FALSE);
-    if (! xdr_int (xdrs, &objp->fps_code)) 
-	return (FALSE);
-    if (! xdr_int (xdrs, &objp->fps_flags)) 
-	return (FALSE);
-
-    return (TRUE);
-    }
-/*******************************************************************************
-*
-* xdr_fpa_status - xdr for fpa status
-*/
-
-bool_t xdr_fpa_status (xdrs, objp)
-    XDR *xdrs;
-    struct fpa_status *objp;
-
-    {
-    if (! xdr_u_int (xdrs, &objp->fpas_state)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_imask)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_load_ptr)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_ierr)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_act_instr)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_nxt_instr)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_act_d1half)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_act_d2half)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_nxt_d1half)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_nxt_d2half)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_mode3_0)) 
-	return (FALSE);
-    if (! xdr_u_int (xdrs, &objp->fpas_wstatus)) 
-	return (FALSE);
-
-    return (TRUE);
-    }
-/*******************************************************************************
-*
-* xdr_fpa_long - xdr for fpa data register
-*/
-
-bool_t xdr_fpa_long (xdrs,objp)
-    XDR *xdrs;
-    fpa_long *objp;
-
-    {
-    if (! xdr_vector (xdrs, (char *) objp->fpl_data, 2, sizeof(int), xdr_int)) 
-	return (FALSE);
-
-    return (TRUE);
-    }
-/*******************************************************************************
-*
-* xdr_fpa_regs - xdr for fpa_regs 
-*/
-
-bool_t xdr_fpa_regs (xdrs, objp)
-    XDR *xdrs;
-    struct fpa_regs *objp;
-
-    {
-    if (! xdr_u_int (xdrs, &objp->fpar_flags)) 
-	return (FALSE);
-    if (! xdr_fpa_status (xdrs, &objp->fpar_status)) 
-	return (FALSE);
-    if (! xdr_vector (xdrs, (char *) objp->fpar_data, 
-    		    FPA_NDATA_REGS, sizeof(fpa_long), xdr_fpa_long)) 
-	return (FALSE);
-
-    return (TRUE);
-    }
-
-#endif /* I80960 */
-
diff --git a/gdb/vx-share/xdr_regs.h b/gdb/vx-share/xdr_regs.h
deleted file mode 100644
index ee0dbafb3c..0000000000
--- a/gdb/vx-share/xdr_regs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* xdr_regs.h - xdr header for 68k registers */
-
-/*  Copyright 1992 Free Software Foundation, Inc.
-
-    This code was donated by Wind River Systems, Inc. */
-
-/*
-modification history
---------------------
-01a,05jun90,llk  extracted from xdr_regs.h.
-*/
-
-/* xdr structures are defined in reg.h (a bad place for them, i might add) */
-
-bool_t xdr_regs();
-bool_t xdr_ext_fp();
-bool_t xdr_fp_status();
-bool_t xdr_fpa_status();
-bool_t xdr_fpa_long();
-bool_t xdr_fpa_regs();