* Rename remote-es1800.c to remote-es.c

[deliverable/binutils-gdb.git] / gdb / remote-vx.c

diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 3fef20880cb530ca1511b762150f6716db9f7cd3..bb621a546d574724550e39e8e930bd5c6ed02e09 100644 (file)
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -26,7 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbcore.h"
 #include "command.h"
 #include "symtab.h"
-#include "symfile.h"           /* for struct complaint */
+#include "complaints.h"
 
 #include <string.h>
 #include <errno.h>
@@ -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>
 
@@ -386,11 +385,7 @@ vx_read_register (regno)
   
   ptrace_in.pid = inferior_pid;
   ptrace_out.info.more_data = (caddr_t) &out_data;
-#ifndef I80960
-  out_data.len   = 18 * REGISTER_RAW_SIZE (0);         /* FIXME 68k hack */
-#else
-  out_data.len = (16 + 16 + 3) * REGISTER_RAW_SIZE (0);
-#endif
+  out_data.len   = VX_NUM_REGS * REGISTER_RAW_SIZE (0);
   out_data.bytes = (caddr_t) registers;
   
   status = net_ptrace_clnt_call (PTRACE_GETREGS, &ptrace_in, &ptrace_out);
@@ -402,50 +397,17 @@ vx_read_register (regno)
       perror_with_name ("net_ptrace_clnt_call(PTRACE_GETREGS)");
     }
   
-#ifdef I80960
-
-  {
+#ifdef VX_SIZE_FPREGS
     /* If the target has floating point registers, fetch them.
        Otherwise, zero the floating point register values in
        registers[] for good measure, even though we might not
        need to.  */
-    /* @@ Can't use this -- the rdb library for the 960 target
-       doesn't support setting or retrieving FP regs.  KR  */
-#if 0
-    struct fp_status inferior_fp_registers;
-
-    if (target_has_fp)
-      {
-       ptrace_in.pid = inferior_pid;
-       ptrace_out.info.more_data = (caddr_t) &inferior_fp_registers;
-       status = net_ptrace_clnt_call (PTRACE_GETFPREGS,
-                                      &ptrace_in, &ptrace_out);
-       if (status)
-         error (rpcerr);
-       if (ptrace_out.status == -1)
-         {
-           errno = ptrace_out.errno;
-           perror_with_name ("net_ptrace_clnt_call(PTRACE_GETFPREGS)");
-         }
-
-       bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
-              REGISTER_RAW_SIZE (FP0_REGNUM) * 4);
-      }
-    else
-      {
-       bzero ((char *) &registers[REGISTER_BYTE (FP0_REGNUM)],
-              REGISTER_RAW_SIZE (FP0_REGNUM) * 4);
-      }
-#endif
-  }
-#else  /* not 960, thus must be 68000:  FIXME!  */
 
   if (target_has_fp)
     {
       ptrace_in.pid = inferior_pid;
       ptrace_out.info.more_data = (caddr_t) &out_data;
-      out_data.len   =  8 * REGISTER_RAW_SIZE (FP0_REGNUM)     /* FIXME */
-                    + (3 * sizeof (REGISTER_TYPE));
+      out_data.len   =  VX_SIZE_FPREGS;
       out_data.bytes = (caddr_t) &registers[REGISTER_BYTE (FP0_REGNUM)];
   
       status = net_ptrace_clnt_call (PTRACE_GETFPREGS, &ptrace_in, &ptrace_out);
@@ -459,12 +421,9 @@ vx_read_register (regno)
     }
   else
     {
-      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)],
-            8 * REGISTER_RAW_SIZE (FP0_REGNUM));
-      bzero (&registers[REGISTER_BYTE (FPC_REGNUM)],
-            3 * sizeof (REGISTER_TYPE));
+      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)], VX_SIZE_FPREGS);
     }
-#endif  /* various architectures */
+#endif /* VX_SIZE_FPREGS */
 }
 
 /* Prepare to store registers.  Since we will store all of them,
@@ -503,15 +462,7 @@ vx_write_register (regno)
 
   in_data.bytes = registers;
 
-#ifdef I80960
-
-  in_data.len = (16 + 16 + 3) * sizeof (REGISTER_TYPE);
-
-#else  /* not 960 -- assume 68k -- FIXME */
-
-  in_data.len = 18 * sizeof (REGISTER_TYPE);
-
-#endif  /* Different register sets */
+  in_data.len = VX_NUM_REGS * sizeof (REGISTER_TYPE);
 
   /* XXX change second param to be a proc number */
   status = net_ptrace_clnt_call (PTRACE_SETREGS, &ptrace_in, &ptrace_out);
@@ -523,6 +474,7 @@ vx_write_register (regno)
       perror_with_name ("net_ptrace_clnt_call(PTRACE_SETREGS)");
     }
 
+#ifdef VX_SIZE_FPREGS
   /* Store floating point registers if the target has them.  */
 
   if (target_has_fp)
@@ -532,18 +484,8 @@ vx_write_register (regno)
       ptrace_in.info.more_data = (caddr_t) &in_data;
 
 
-#ifdef I80960
-#if 0 /* @@ Not supported by target.  */
-      in_data.bytes = &registers[REGISTER_BYTE (FP0_REGNUM)];
-      in_data.len = 4 * REGISTER_RAW_SIZE (FP0_REGNUM);
-#endif
-#else  /* not 960 -- assume 68k -- FIXME */
-
       in_data.bytes = &registers[REGISTER_BYTE (FP0_REGNUM)];
-      in_data.len = (8 * REGISTER_RAW_SIZE (FP0_REGNUM)
-                      + (3 * sizeof (REGISTER_TYPE)));
-
-#endif  /* Different register sets */
+      in_data.len = VX_SIZE_FPREGS;
 
       status = net_ptrace_clnt_call (PTRACE_SETFPREGS, &ptrace_in, &ptrace_out);
       if (status)
@@ -554,6 +496,7 @@ vx_write_register (regno)
          perror_with_name ("net_ptrace_clnt_call(PTRACE_SETFPREGS)");
        }
     }
+#endif  /* VX_SIZE_FPREGS */
 }
 
 /* Copy LEN bytes to or from remote inferior's memory starting at MEMADDR
@@ -810,7 +753,7 @@ vx_lookup_symbol (name, pAddr)
   status = net_clnt_call (VX_SYMBOL_INQ, xdr_wrapstring, &name,
                          xdr_SYMBOL_ADDR, &symbolAddr);
   if (status != RPC_SUCCESS) {
-      complain (&cant_contact_target, 0);
+      complain (&cant_contact_target);
       return -1;
   }
 
@@ -844,15 +787,23 @@ net_connect (host)
 {
   struct sockaddr_in destAddr;
   struct hostent *destHost;
+  unsigned long addr;
+  
+  /* Get the internet address for the given host.  Allow a numeric
+     IP address or a hostname.  */
 
-  /* get the internet address for the given host */
-
-  if ((destHost = (struct hostent *) gethostbyname (host)) == NULL)
-      error ("Invalid hostname.  Couldn't find remote host address.");
+  addr = inet_addr (host);
+  if (addr == -1)
+    {
+      destHost = (struct hostent *) gethostbyname (host);
+      if (destHost == NULL)
+       error ("Invalid hostname.  Couldn't find remote host address.");
+      addr = * (unsigned long *) destHost->h_addr;
+    }
 
   bzero (&destAddr, sizeof (destAddr));
 
-  destAddr.sin_addr.s_addr = * (u_long *) destHost->h_addr;
+  destAddr.sin_addr.s_addr = addr;
   destAddr.sin_family      = AF_INET;
   destAddr.sin_port        = 0;        /* set to actual port that remote
                                   ptrace is listening on.  */