Sun Aug 1 22:58:18 1993 Stu Grossman (grossman at cygnus.com)

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

diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 42090b75616ae69aae9bc6ad97a4dcebfe60e874..6824f80d4c07aa233becc28fbad51bc4c994c19a 100644 (file)
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -1,5 +1,5 @@
 /* Memory-access and commands for remote VxWorks processes, for GDB.
 /* Memory-access and commands for remote VxWorks processes, for GDB.

-   Copyright (C) 1990-1991  Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992 Free Software Foundation, Inc.

    Contributed by Wind River Systems and Cygnus Support.
 
 This file is part of GDB.
    Contributed by Wind River Systems and Cygnus Support.
 
 This file is part of GDB.


@@ -18,9 +18,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 

-#include <stdio.h>

 #include "defs.h"
 #include "defs.h"

-#include "param.h"

 #include "frame.h"
 #include "inferior.h"
 #include "wait.h"
 #include "frame.h"
 #include "inferior.h"
 #include "wait.h"


@@ -28,31 +26,32 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbcore.h"
 #include "command.h"
 #include "symtab.h"
 #include "gdbcore.h"
 #include "command.h"
 #include "symtab.h"

-#include "symfile.h"           /* for struct complaint */
+#include "complaints.h"
+#include "gdbcmd.h"

 
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/types.h>
 
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/types.h>

-#include <sys/time.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

+#define malloc bogon_malloc    /* Sun claims "char *malloc()" not void * */

 #define free bogon_free                /* Sun claims "int free()" not void */
 #define free bogon_free                /* Sun claims "int free()" not void */

+#define realloc bogon_realloc  /* Sun claims "char *realloc()", not void * */

 #include <rpc/rpc.h>
 #include <rpc/rpc.h>

+#undef malloc

 #undef free
 #undef free

+#undef realloc

 #include <sys/time.h>          /* UTek's <rpc/rpc.h> doesn't #incl this */
 #include <netdb.h>
 #include <sys/time.h>          /* UTek's <rpc/rpc.h> doesn't #incl this */
 #include <netdb.h>

-#include <ptrace.h>
-#include "xdr_ptrace.h"
-#include "xdr_ld.h"
-#include "xdr_rdb.h"
-#include "dbgRpcLib.h"
-
-/* get rid of value.h if possible */
-#include <value.h>
+#include "vx-share/ptrace.h"
+#include "vx-share/xdr_ptrace.h"
+#include "vx-share/xdr_ld.h"
+#include "vx-share/xdr_rdb.h"
+#include "vx-share/dbgRpcLib.h"
+

 #include <symtab.h>
 #include <symtab.h>

- 
-extern value call_function_by_hand ();
+

 extern void symbol_file_command ();
 extern int stop_soon_quietly;          /* for wait_for_inferior */
 
 extern void symbol_file_command ();
 extern int stop_soon_quietly;          /* for wait_for_inferior */
 


@@ -88,7 +87,7 @@ static char *find_white_space ();
  
 /* Tell the VxWorks target system to download a file.
    The load addresses of the text, data, and bss segments are
  
 /* Tell the VxWorks target system to download a file.
    The load addresses of the text, data, and bss segments are

-   stored in pTextAddr, pDataAddr, and *pBssAddr (respectively).
+   stored in *pTextAddr, *pDataAddr, and *pBssAddr (respectively).

    Returns 0 for success, -1 for failure.  */
 
 static int
    Returns 0 for success, -1 for failure.  */
 
 static int


@@ -109,7 +108,7 @@ net_load (filename, pTextAddr, pDataAddr, pBssAddr)
        The load on the target side can take quite a while, easily
        more than 10 seconds.  The user can kill this call by typing
        CTRL-C if there really is a problem with the load.  
        The load on the target side can take quite a while, easily
        more than 10 seconds.  The user can kill this call by typing
        CTRL-C if there really is a problem with the load.  

-       
+

        Do not change the tv_sec value without checking -- select() imposes
        a limit of 10**8 on it for no good reason that I can see...  */
 
        Do not change the tv_sec value without checking -- select() imposes
        a limit of 10**8 on it for no good reason that I can see...  */
 


@@ -121,7 +120,7 @@ net_load (filename, pTextAddr, pDataAddr, pBssAddr)
 
     if (status == RPC_SUCCESS)
       {
 
     if (status == RPC_SUCCESS)
       {

-        if (*ldstruct.name == NULL)    /* load failed on VxWorks side */
+        if (*ldstruct.name == 0)       /* load failed on VxWorks side */

           return -1;
        *pTextAddr = ldstruct.txt_addr;
        *pDataAddr = ldstruct.data_addr;
           return -1;
        *pTextAddr = ldstruct.txt_addr;
        *pDataAddr = ldstruct.data_addr;


@@ -163,7 +162,7 @@ net_break (addr, procnum)
  
 /* returns 0 if successful, errno otherwise */
 
  
 /* returns 0 if successful, errno otherwise */
 

-int
+static int

 vx_insert_breakpoint (addr)
     int addr;
     {
 vx_insert_breakpoint (addr)
     int addr;
     {


@@ -172,7 +171,7 @@ vx_insert_breakpoint (addr)
 
 /* returns 0 if successful, errno otherwise */
 
 
 /* returns 0 if successful, errno otherwise */
 

-int
+static int

 vx_remove_breakpoint (addr)
     int addr;
     {
 vx_remove_breakpoint (addr)
     int addr;
     {


@@ -186,7 +185,7 @@ vx_remove_breakpoint (addr)
    Returns process id.  Errors reported with error().
    On VxWorks, we ignore exec_file.  */
  
    Returns process id.  Errors reported with error().
    On VxWorks, we ignore exec_file.  */
  

-void
+static void

 vx_create_inferior (exec_file, args, env)
      char *exec_file;
      char *args;
 vx_create_inferior (exec_file, args, env)
      char *exec_file;
      char *args;


@@ -223,10 +222,6 @@ vx_create_inferior (exec_file, args, env)
   push_target (&vx_run_ops);
   inferior_pid = taskStart.pid;
 
   push_target (&vx_run_ops);
   inferior_pid = taskStart.pid;
 

-#if defined (START_INFERIOR_HOOK)
-  START_INFERIOR_HOOK ();
-#endif
-

   /* We will get a trace trap after one instruction.
      Insert breakpoints and continue.  */
 
   /* We will get a trace trap after one instruction.
      Insert breakpoints and continue.  */
 


@@ -239,8 +234,6 @@ vx_create_inferior (exec_file, args, env)
   /* Install inferior's terminal modes.  */
   target_terminal_inferior ();
 
   /* Install inferior's terminal modes.  */
   target_terminal_inferior ();
 

-  /* remote_start(args); */
-  /* trap_expected = 0; */

   stop_soon_quietly = 1;
   wait_for_inferior ();                /* Get the task spawn event */
   stop_soon_quietly = 0;
   stop_soon_quietly = 1;
   wait_for_inferior ();                /* Get the task spawn event */
   stop_soon_quietly = 0;


@@ -334,7 +327,7 @@ find_white_space (p)
    to the debugged task.
    Returns -1 if remote wait failed, task status otherwise.  */
 
    to the debugged task.
    Returns -1 if remote wait failed, task status otherwise.  */
 

-int
+static int

 net_wait (pEvent)
     RDB_EVENT *pEvent;
 {
 net_wait (pEvent)
     RDB_EVENT *pEvent;
 {


@@ -352,7 +345,7 @@ net_wait (pEvent)
 /* Suspend the remote task.
    Returns -1 if suspend fails on target system, 0 otherwise.  */
 
 /* Suspend the remote task.
    Returns -1 if suspend fails on target system, 0 otherwise.  */
 

-int
+static int

 net_quit ()
 {
     int pid;
 net_quit ()
 {
     int pid;


@@ -374,15 +367,15 @@ net_quit ()
 
 /* Read a register or registers from the remote system.  */
 
 
 /* Read a register or registers from the remote system.  */
 

-int
+static void

 vx_read_register (regno)
      int regno;
 {
   int status;
   Rptrace ptrace_in;
   Ptrace_return ptrace_out;
 vx_read_register (regno)
      int regno;
 {
   int status;
   Rptrace ptrace_in;
   Ptrace_return ptrace_out;

-  struct regs inferior_registers;
-  struct fp_status inferior_fp_registers;
+  C_bytes in_data;
+  C_bytes out_data;

   extern char registers[];
 
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   extern char registers[];
 
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));


@@ -392,105 +385,56 @@ vx_read_register (regno)
   registers_fetched ();
   
   ptrace_in.pid = inferior_pid;
   registers_fetched ();
   
   ptrace_in.pid = inferior_pid;

-  ptrace_out.info.more_data = (caddr_t) &inferior_registers;
+  ptrace_out.info.more_data = (caddr_t) &out_data;
+  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);
   if (status)
     error (rpcerr);
   if (ptrace_out.status == -1)
     {
       errno = ptrace_out.errno;
   status = net_ptrace_clnt_call (PTRACE_GETREGS, &ptrace_in, &ptrace_out);
   if (status)
     error (rpcerr);
   if (ptrace_out.status == -1)
     {
       errno = ptrace_out.errno;

-      return -1;
+      perror_with_name ("net_ptrace_clnt_call(PTRACE_GETREGS)");

     }
   
     }
   

-#ifdef I80960
-
-      bcopy ((char *) inferior_registers.r_lreg,
-            &registers[REGISTER_BYTE (R0_REGNUM)], 16 * sizeof (int));
-      bcopy ((char *) inferior_registers.r_greg,
-            &registers[REGISTER_BYTE (G0_REGNUM)], 16 * sizeof (int));
-
-      /* Don't assume that a location in registers[] is properly aligned.  */
-
-      bcopy ((char *) &inferior_registers.r_pcw,
-            &registers[REGISTER_BYTE (PCW_REGNUM)], sizeof (int));
-      bcopy ((char *) &inferior_registers.r_acw,
-            &registers[REGISTER_BYTE (ACW_REGNUM)], sizeof (int));
-      bcopy ((char *) &inferior_registers.r_lreg[2],   /* r2 (RIP) -> IP */
-            &registers[REGISTER_BYTE (IP_REGNUM)], sizeof (int));
-      bcopy ((char *) &inferior_registers.r_tcw,
-            &registers[REGISTER_BYTE (TCW_REGNUM)], sizeof (int));
-
-      /* 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.  */
-
-      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;
-             return -1;
-           }
-         
-         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);
-       }
-
-#else  /* not 960, thus must be 68000:  FIXME!  */
-
-  bcopy (&inferior_registers, registers, 16 * 4);
-  *(int *)&registers[REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps;
-  *(int *)&registers[REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc;
+#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.  */

 
   if (target_has_fp)
     {
       ptrace_in.pid = inferior_pid;
 
   if (target_has_fp)
     {
       ptrace_in.pid = inferior_pid;

-      ptrace_out.info.more_data = (caddr_t) &inferior_fp_registers;
+      ptrace_out.info.more_data = (caddr_t) &out_data;
+      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);
       if (status)
        error (rpcerr);
       if (ptrace_out.status == -1)
        {
          errno = ptrace_out.errno;
       status = net_ptrace_clnt_call (PTRACE_GETFPREGS, &ptrace_in, &ptrace_out);
       if (status)
        error (rpcerr);
       if (ptrace_out.status == -1)
        {
          errno = ptrace_out.errno;

-         return -1;
+         perror_with_name ("net_ptrace_clnt_call(PTRACE_GETFPREGS)");

        }
        }

-      
-      bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
-            sizeof inferior_fp_registers.fps_regs);
-      bcopy (&inferior_fp_registers.fps_control,
-        &registers[REGISTER_BYTE (FPC_REGNUM)],
-        sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);

     }
   else
     {
     }
   else
     {

-      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)],
-            sizeof inferior_fp_registers.fps_regs);
-      bzero (&registers[REGISTER_BYTE (FPC_REGNUM)],
-        sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);
+      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)], VX_SIZE_FPREGS);

     }
     }

-#endif  /* various architectures */
-
-  return 0;
+#endif /* VX_SIZE_FPREGS */

 }
 
 /* Prepare to store registers.  Since we will store all of them,
    read out their current values now.  */
 
 }
 
 /* Prepare to store registers.  Since we will store all of them,
    read out their current values now.  */
 

-void
+static void

 vx_prepare_to_store ()
 {
 vx_prepare_to_store ()
 {

-  vx_read_register (-1);
+  /* Fetch all registers, if any of them are not yet fetched.  */
+  read_register_bytes (0, NULL, REGISTER_BYTES);

 }
 
 
 }
 
 


@@ -499,11 +443,12 @@ vx_prepare_to_store ()
    Otherwise, REGNO specifies which register (so we can save time).  */
    /* FIXME, look at REGNO to save time here */
 
    Otherwise, REGNO specifies which register (so we can save time).  */
    /* FIXME, look at REGNO to save time here */
 

+static void

 vx_write_register (regno)
      int regno;
 {
 vx_write_register (regno)
      int regno;
 {

-  struct regs inferior_registers;
-  struct fp_status inferior_fp_registers;
+  C_bytes in_data;
+  C_bytes out_data;

   extern char registers[];
   int status;
   Rptrace ptrace_in;
   extern char registers[];
   int status;
   Rptrace ptrace_in;


@@ -512,33 +457,13 @@ vx_write_register (regno)
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   bzero ((char *) &ptrace_out, sizeof (ptrace_out));
 
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   bzero ((char *) &ptrace_out, sizeof (ptrace_out));
 

-#ifdef I80960
-
-  bcopy (&registers[REGISTER_BYTE (R0_REGNUM)],
-        (char *) inferior_registers.r_lreg, 16 * sizeof (int));
-  bcopy (&registers[REGISTER_BYTE (G0_REGNUM)],
-        (char *) inferior_registers.r_greg, 16 * sizeof (int));
-
-  /* Don't assume that a location in registers[] is properly aligned.  */
-
-  bcopy (&registers[REGISTER_BYTE (PCW_REGNUM)],
-        (char *) &inferior_registers.r_pcw, sizeof (int));
-  bcopy (&registers[REGISTER_BYTE (ACW_REGNUM)],
-        (char *) &inferior_registers.r_acw, sizeof (int));
-  bcopy (&registers[REGISTER_BYTE (TCW_REGNUM)],
-        (char *) &inferior_registers.r_tcw, sizeof (int));
-
-#else  /* not 960 -- assume 68k -- FIXME */
-
-  bcopy (registers, &inferior_registers, 16 * 4);
-  inferior_registers.r_ps = *(int *)&registers[REGISTER_BYTE (PS_REGNUM)];
-  inferior_registers.r_pc = *(int *)&registers[REGISTER_BYTE (PC_REGNUM)];
+  ptrace_in.pid = inferior_pid;
+  ptrace_in.info.ttype     = DATA;
+  ptrace_in.info.more_data = (caddr_t) &in_data;

 
 

-#endif  /* Different register sets */
+  in_data.bytes = registers;

 
 

-  ptrace_in.pid = inferior_pid;
-  ptrace_in.info.ttype     = REGS;
-  ptrace_in.info.more_data = (caddr_t) &inferior_registers;
+  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);
 
   /* XXX change second param to be a proc number */
   status = net_ptrace_clnt_call (PTRACE_SETREGS, &ptrace_in, &ptrace_out);


@@ -547,31 +472,21 @@ vx_write_register (regno)
   if (ptrace_out.status == -1)
     {
       errno = ptrace_out.errno;
   if (ptrace_out.status == -1)
     {
       errno = ptrace_out.errno;

-      return -1;
+      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)
     {
   /* Store floating point registers if the target has them.  */
 
   if (target_has_fp)
     {

-#ifdef I80960
-
-      bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers,
-            sizeof inferior_fp_registers.fps_regs);
-
-#else  /* not 960 -- assume 68k -- FIXME */
-
-      bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers,
-            sizeof inferior_fp_registers.fps_regs);
-      bcopy (&registers[REGISTER_BYTE (FPC_REGNUM)],
-        &inferior_fp_registers.fps_control,
-         sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);
+      ptrace_in.pid = inferior_pid;
+      ptrace_in.info.ttype     = DATA;
+      ptrace_in.info.more_data = (caddr_t) &in_data;

 
 

-#endif  /* Different register sets */

 
 

-      ptrace_in.pid = inferior_pid;
-      ptrace_in.info.ttype     = FPREGS;
-      ptrace_in.info.more_data = (caddr_t) &inferior_fp_registers;
+      in_data.bytes = &registers[REGISTER_BYTE (FP0_REGNUM)];
+      in_data.len = VX_SIZE_FPREGS;

 
       status = net_ptrace_clnt_call (PTRACE_SETFPREGS, &ptrace_in, &ptrace_out);
       if (status)
 
       status = net_ptrace_clnt_call (PTRACE_SETFPREGS, &ptrace_in, &ptrace_out);
       if (status)


@@ -579,10 +494,10 @@ vx_write_register (regno)
       if (ptrace_out.status == -1)
        {
          errno = ptrace_out.errno;
       if (ptrace_out.status == -1)
        {
          errno = ptrace_out.errno;

-         return -1;
+         perror_with_name ("net_ptrace_clnt_call(PTRACE_SETFPREGS)");

        }
     }
        }
     }

-  return 0;
+#endif  /* VX_SIZE_FPREGS */

 }
 
 /* Copy LEN bytes to or from remote inferior's memory starting at MEMADDR
 }
 
 /* Copy LEN bytes to or from remote inferior's memory starting at MEMADDR


@@ -593,7 +508,7 @@ vx_write_register (regno)
    handle the current address but can handle one N bytes further, but
    vxworks doesn't give us that information.  */
 
    handle the current address but can handle one N bytes further, but
    vxworks doesn't give us that information.  */
 

-int
+static int

 vx_xfer_memory (memaddr, myaddr, len, write, target)
      CORE_ADDR memaddr;
      char *myaddr;
 vx_xfer_memory (memaddr, myaddr, len, write, target)
      CORE_ADDR memaddr;
      char *myaddr;


@@ -643,7 +558,7 @@ vx_xfer_memory (memaddr, myaddr, len, write, target)
   return len;          /* Moved *all* the bytes */
 }
 
   return len;          /* Moved *all* the bytes */
 }
 

-void
+static void

 vx_files_info ()
 {
   printf ("\tAttached to host `%s'", vx_host);
 vx_files_info ()
 {
   printf ("\tAttached to host `%s'", vx_host);


@@ -651,7 +566,7 @@ vx_files_info ()
   printf (".\n");
 }
 
   printf (".\n");
 }
 

-void
+static void

 vx_run_files_info ()
 {
   printf ("\tRunning %s VxWorks process %s", 
 vx_run_files_info ()
 {
   printf ("\tRunning %s VxWorks process %s", 


@@ -662,8 +577,9 @@ vx_run_files_info ()
   printf(".\n");
 }
 
   printf(".\n");
 }
 

-void
-vx_resume (step, siggnal)
+static void
+vx_resume (pid, step, siggnal)
+     int pid;

      int step;
      int siggnal;
 {
      int step;
      int siggnal;
 {


@@ -677,7 +593,7 @@ vx_resume (step, siggnal)
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   bzero ((char *) &ptrace_out, sizeof (ptrace_out));
 
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   bzero ((char *) &ptrace_out, sizeof (ptrace_out));
 

-  ptrace_in.pid = inferior_pid;
+  ptrace_in.pid = pid;

   ptrace_in.addr = 1;  /* Target side insists on this, or it panics.  */
 
   /* XXX change second param to be a proc number */
   ptrace_in.addr = 1;  /* Target side insists on this, or it panics.  */
 
   /* XXX change second param to be a proc number */


@@ -692,7 +608,7 @@ vx_resume (step, siggnal)
     }
 }
 
     }
 }
 

-void
+static void

 vx_mourn_inferior ()
 {
   pop_target ();               /* Pop back to no-child state */
 vx_mourn_inferior ()
 {
   pop_target ();               /* Pop back to no-child state */


@@ -702,7 +618,7 @@ vx_mourn_inferior ()
 \f
 /* This function allows the addition of incrementally linked object files.  */
 
 \f
 /* This function allows the addition of incrementally linked object files.  */
 

-void
+static void

 vx_load_command (arg_string, from_tty)
      char* arg_string;
      int from_tty;
 vx_load_command (arg_string, from_tty)
      char* arg_string;
      int from_tty;


@@ -726,7 +642,7 @@ vx_load_command (arg_string, from_tty)
   immediate_quit--;
 
   /* FIXME, for now we ignore data_addr and bss_addr.  */
   immediate_quit--;
 
   /* FIXME, for now we ignore data_addr and bss_addr.  */

-  symbol_file_add (arg_string, from_tty, text_addr, 0);
+  symbol_file_add (arg_string, from_tty, text_addr, 0, 0, 0);

 }
 
 #ifdef FIXME  /* Not ready for prime time */
 }
 
 #ifdef FIXME  /* Not ready for prime time */


@@ -790,7 +706,7 @@ net_ptrace_clnt_call (request, pPtraceIn, pPtraceOut)
    NULL, memory for the buffer will be allocated by XDR.
    Returns -1 if rpc failed, 0 otherwise.  */
 
    NULL, memory for the buffer will be allocated by XDR.
    Returns -1 if rpc failed, 0 otherwise.  */
 

-int
+static int

 net_get_boot_file (pBootFile)
      char **pBootFile;
 {
 net_get_boot_file (pBootFile)
      char **pBootFile;
 {


@@ -806,7 +722,7 @@ net_get_boot_file (pBootFile)
    There's no way to check if the returned loadTable is correct.
    VxWorks doesn't check it.  */
 
    There's no way to check if the returned loadTable is correct.
    VxWorks doesn't check it.  */
 

-int
+static int

 net_get_symbols (pLoadTable)
      ldtabl *pLoadTable;               /* return pointer to ldtabl here */
 {
 net_get_symbols (pLoadTable)
      ldtabl *pLoadTable;               /* return pointer to ldtabl here */
 {


@@ -825,7 +741,7 @@ net_get_symbols (pLoadTable)
 struct complaint cant_contact_target =
   {"Lost contact with VxWorks target", 0, 0};
 
 struct complaint cant_contact_target =
   {"Lost contact with VxWorks target", 0, 0};
 

-int
+static int

 vx_lookup_symbol (name, pAddr)
      char *name;               /* symbol name */
      CORE_ADDR *pAddr;
 vx_lookup_symbol (name, pAddr)
      char *name;               /* symbol name */
      CORE_ADDR *pAddr;


@@ -839,7 +755,7 @@ vx_lookup_symbol (name, pAddr)
   status = net_clnt_call (VX_SYMBOL_INQ, xdr_wrapstring, &name,
                          xdr_SYMBOL_ADDR, &symbolAddr);
   if (status != RPC_SUCCESS) {
   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;
   }
 
       return -1;
   }
 


@@ -851,7 +767,7 @@ vx_lookup_symbol (name, pAddr)
    Returns 1 if target has floating point processor, 0 otherwise.
    Calls error() if rpc fails.  */
 
    Returns 1 if target has floating point processor, 0 otherwise.
    Calls error() if rpc fails.  */
 

-int
+static int

 net_check_for_fp ()
 {
   enum clnt_stat status;
 net_check_for_fp ()
 {
   enum clnt_stat status;


@@ -867,21 +783,29 @@ net_check_for_fp ()
 /* Establish an RPC connection with the VxWorks target system.
    Calls error () if unable to establish connection.  */
 
 /* Establish an RPC connection with the VxWorks target system.
    Calls error () if unable to establish connection.  */
 

-void
+static void

 net_connect (host)
      char *host;
 {
   struct sockaddr_in destAddr;
   struct hostent *destHost;
 net_connect (host)
      char *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));
 
 
   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.  */
   destAddr.sin_family      = AF_INET;
   destAddr.sin_port        = 0;        /* set to actual port that remote
                                   ptrace is listening on.  */


@@ -1019,6 +943,7 @@ vx_wait (status)
 
     case EVENT_ZERO_DIV:       /* Division by zero */
       WSETSTOP (w, SIGFPE);    /* Like Unix, call it a float exception. */
 
     case EVENT_ZERO_DIV:       /* Division by zero */
       WSETSTOP (w, SIGFPE);    /* Like Unix, call it a float exception. */

+      break;

 
     case EVENT_SIGNAL:
       /* The target is not running Unix, and its
 
     case EVENT_SIGNAL:
       /* The target is not running Unix, and its


@@ -1049,7 +974,7 @@ add_symbol_stub (arg)
   struct ldfile *pLoadFile = (struct ldfile *)arg;
 
   printf("\t%s: ", pLoadFile->name);
   struct ldfile *pLoadFile = (struct ldfile *)arg;
 
   printf("\t%s: ", pLoadFile->name);

-  symbol_file_add (pLoadFile->name, 0, pLoadFile->txt_addr, 0);
+  symbol_file_add (pLoadFile->name, 0, pLoadFile->txt_addr, 0, 0, 0);

   printf ("ok\n");
   return 1;
 }
   printf ("ok\n");
   return 1;
 }


@@ -1108,8 +1033,9 @@ vx_open (args, from_tty)
     {
       if (*bootFile) {
        printf_filtered ("\t%s: ", bootFile);
     {
       if (*bootFile) {
        printf_filtered ("\t%s: ", bootFile);

-       if (catch_errors (symbol_stub, bootFile,
-               "Error while reading symbols from boot file:\n"))
+       if (catch_errors
+           (symbol_stub, bootFile,
+            "Error while reading symbols from boot file:\n", RETURN_MASK_ALL))

          puts_filtered ("ok\n");
       } else if (from_tty)
        printf ("VxWorks kernel symbols not loaded.\n");
          puts_filtered ("ok\n");
       } else if (from_tty)
        printf ("VxWorks kernel symbols not loaded.\n");


@@ -1145,7 +1071,8 @@ vx_open (args, from_tty)
       /* Botches, FIXME:
         (1)  Searches the PATH, not the source path.
         (2)  data and bss are assumed to be at the usual offsets from text.  */
       /* Botches, FIXME:
         (1)  Searches the PATH, not the source path.
         (2)  data and bss are assumed to be at the usual offsets from text.  */

-      catch_errors (add_symbol_stub, (char *)pLoadFile, (char *)0);
+      catch_errors (add_symbol_stub, (char *)pLoadFile, (char *)0,
+                   RETURN_MASK_ALL);

 #endif
     }
   printf_filtered ("Done.\n");
 #endif
     }
   printf_filtered ("Done.\n");


@@ -1153,8 +1080,7 @@ vx_open (args, from_tty)
   clnt_freeres (pClient, xdr_ldtabl, &loadTable);
 }
 \f
   clnt_freeres (pClient, xdr_ldtabl, &loadTable);
 }
 \f

-/* attach_command --
-   takes a task started up outside of gdb and ``attaches'' to it.
+/* Takes a task started up outside of gdb and ``attaches'' to it.

    This stops it cold in its tracks and allows us to start tracing it.  */
 
 static void
    This stops it cold in its tracks and allows us to start tracing it.  */
 
 static void


@@ -1168,8 +1094,6 @@ vx_attach (args, from_tty)
   Ptrace_return ptrace_out;
   int status;
 
   Ptrace_return ptrace_out;
   int status;
 

-  dont_repeat();
-

   if (!args)
     error_no_arg ("process-id to attach");
 
   if (!args)
     error_no_arg ("process-id to attach");
 


@@ -1197,27 +1121,6 @@ vx_attach (args, from_tty)
   push_target (&vx_run_ops);
   inferior_pid = pid;
   vx_running = 0;
   push_target (&vx_run_ops);
   inferior_pid = pid;
   vx_running = 0;

-
-#if defined (START_INFERIOR_HOOK)
-  START_INFERIOR_HOOK ();
-#endif
-
-  mark_breakpoints_out ();
-
-  /* Set up the "saved terminal modes" of the inferior
-     based on what modes we are starting it with.  */
-  target_terminal_init ();
-
-  /* Install inferior's terminal modes.  */
-  target_terminal_inferior ();
-
-  /* We will get a task spawn event immediately.  */
-  init_wait_for_inferior ();
-  clear_proceed_status ();
-  stop_soon_quietly = 1;
-  wait_for_inferior ();
-  stop_soon_quietly = 0;
-  normal_stop ();

 }
 
 
 }
 
 


@@ -1269,19 +1172,13 @@ vx_detach (args, from_tty)
 /* vx_kill -- takes a running task and wipes it out.  */
 
 static void
 /* vx_kill -- takes a running task and wipes it out.  */
 
 static void

-vx_kill (args, from_tty)
-     char *args;
-     int from_tty;
+vx_kill ()

 {
   Rptrace ptrace_in;
   Ptrace_return ptrace_out;
   int status;
 
 {
   Rptrace ptrace_in;
   Ptrace_return ptrace_out;
   int status;
 

-  if (args)
-    error ("Argument given to VxWorks \"kill\".");
-
-  if (from_tty)
-      printf ("Killing pid %s.\n", local_hex_string(inferior_pid));
+  printf ("Killing pid %s.\n", local_hex_string(inferior_pid));

 
   bzero ((char *)&ptrace_in,  sizeof (ptrace_in));
   bzero ((char *)&ptrace_out, sizeof (ptrace_out));
 
   bzero ((char *)&ptrace_in,  sizeof (ptrace_in));
   bzero ((char *)&ptrace_out, sizeof (ptrace_out));


@@ -1289,21 +1186,22 @@ vx_kill (args, from_tty)
 
   status = net_ptrace_clnt_call (PTRACE_KILL, &ptrace_in, &ptrace_out);
   if (status == -1)
 
   status = net_ptrace_clnt_call (PTRACE_KILL, &ptrace_in, &ptrace_out);
   if (status == -1)

-    error (rpcerr);
-  if (ptrace_out.status == -1)
+    warning (rpcerr);
+  else if (ptrace_out.status == -1)

     {
       errno = ptrace_out.errno;
       perror_with_name ("Killing VxWorks process");
     }
 
     {
       errno = ptrace_out.errno;
       perror_with_name ("Killing VxWorks process");
     }
 

-  /* If it gives good status, the process is *gone*, no events remain.  */
+  /* If it gives good status, the process is *gone*, no events remain.
+     If the kill failed, assume the process is gone anyhow.  */

   inferior_pid = 0;
   pop_target ();       /* go back to non-executing VxWorks connection */
 }
 
 /* Clean up from the VxWorks process target as it goes away.  */
 
   inferior_pid = 0;
   pop_target ();       /* go back to non-executing VxWorks connection */
 }
 
 /* Clean up from the VxWorks process target as it goes away.  */
 

-void
+static void

 vx_proc_close (quitting)
      int quitting;
 {
 vx_proc_close (quitting)
      int quitting;
 {


@@ -1313,77 +1211,6 @@ vx_proc_close (quitting)
   vx_running = 0;
 }
 \f
   vx_running = 0;
 }
 \f

-/* Cross-net conversion of floats to and from extended form.
-   (This is needed because different target machines have different
-    extended floating point formats.)  */
-
-/* Convert from an extended float to a double.
-
-   The extended float is stored as raw data pointed to by FROM.
-   Return the converted value as raw data in the double pointed to by TO.
-*/
-
-static void
-vx_convert_to_virtual (regno, from, to)
-    int regno;
-    char *from;
-    char *to;
-{
-  enum clnt_stat status;
-
-  if (REGISTER_CONVERTIBLE (regno)) 
-    {
-      if (!target_has_fp) {
-       *(double *)to = 0.0;    /* Skip the trouble if no float anyway */
-       return;
-      }
-
-      status = net_clnt_call (VX_CONV_FROM_68881, xdr_ext_fp, from,
-                             xdr_double, to);
-
-      if (status == RPC_SUCCESS)
-         return;
-      else
-         error (rpcerr);
-    }
-  else
-    bcopy (from, to, REGISTER_VIRTUAL_SIZE (regno));
-}
-
-
-/* The converse:  convert from a double to an extended float.
-
-   The double is stored as raw data pointed to by FROM.
-   Return the converted value as raw data in the extended
-   float pointed to by TO.
-*/
-
-static void
-vx_convert_from_virtual (regno, from, to)
-    int regno;
-    char *from;
-    char *to;
-{
-  enum clnt_stat status;
-
-  if (REGISTER_CONVERTIBLE (regno)) 
-    {
-      if (!target_has_fp) {
-       bzero (to, REGISTER_RAW_SIZE (FP0_REGNUM));     /* Shrug */
-       return;
-      }
-
-      status = net_clnt_call (VX_CONV_TO_68881, xdr_double, from,
-                             xdr_ext_fp, to);
-      if (status == RPC_SUCCESS)
-         return;
-      else
-         error (rpcerr);
-    }
-  else
-    bcopy (from, to, REGISTER_VIRTUAL_SIZE (regno));
-}
-\f

 /* Make an RPC call to the VxWorks target.
    Returns RPC status.  */
 
 /* Make an RPC call to the VxWorks target.
    Returns RPC status.  */
 


@@ -1407,7 +1234,7 @@ net_clnt_call (procNum, inProc, in, outProc, out)
 
 /* Clean up before losing control.  */
 
 
 /* Clean up before losing control.  */
 

-void
+static void

 vx_close (quitting)
      int quitting;
 {
 vx_close (quitting)
      int quitting;
 {


@@ -1439,15 +1266,16 @@ Specify the name of the machine to connect to.",
        vx_open, vx_close, vx_attach, 0, /* vx_detach, */
        0, 0, /* resume, wait */
        0, 0, /* read_reg, write_reg */
        vx_open, vx_close, vx_attach, 0, /* vx_detach, */
        0, 0, /* resume, wait */
        0, 0, /* read_reg, write_reg */

-       0, vx_convert_to_virtual, vx_convert_from_virtual,  /* prep_to_store, */
+       0, /* prep_to_store, */

        vx_xfer_memory, vx_files_info,
        0, 0, /* insert_breakpoint, remove_breakpoint */
        0, 0, 0, 0, 0,  /* terminal stuff */
        0, /* vx_kill, */
        vx_load_command,
        vx_xfer_memory, vx_files_info,
        0, 0, /* insert_breakpoint, remove_breakpoint */
        0, 0, 0, 0, 0,  /* terminal stuff */
        0, /* vx_kill, */
        vx_load_command,

-       0,  /* call_function */

        vx_lookup_symbol,
        vx_create_inferior, 0,  /* mourn_inferior */
        vx_lookup_symbol,
        vx_create_inferior, 0,  /* mourn_inferior */

+       0, /* can_run */
+       0, /* notice_signals */

        core_stratum, 0, /* next */
        1, 1, 0, 0, 0,  /* all mem, mem, stack, regs, exec */
        0, 0,                   /* Section pointers */
        core_stratum, 0, /* next */
        1, 1, 0, 0, 0,  /* all mem, mem, stack, regs, exec */
        0, 0,                   /* Section pointers */


@@ -1462,15 +1290,16 @@ struct target_ops vx_run_ops = {
        vx_proc_open, vx_proc_close, 0, vx_detach, /* vx_attach */
        vx_resume, vx_wait,
        vx_read_register, vx_write_register,
        vx_proc_open, vx_proc_close, 0, vx_detach, /* vx_attach */
        vx_resume, vx_wait,
        vx_read_register, vx_write_register,

-       vx_prepare_to_store, vx_convert_to_virtual, vx_convert_from_virtual,
+       vx_prepare_to_store,

        vx_xfer_memory, vx_run_files_info,
        vx_insert_breakpoint, vx_remove_breakpoint,
        0, 0, 0, 0, 0,  /* terminal stuff */
        vx_kill,
        vx_load_command,
        vx_xfer_memory, vx_run_files_info,
        vx_insert_breakpoint, vx_remove_breakpoint,
        0, 0, 0, 0, 0,  /* terminal stuff */
        vx_kill,
        vx_load_command,

-       call_function_by_hand,  /* FIXME, calling fns is maybe botched? */

        vx_lookup_symbol,
        0, vx_mourn_inferior,
        vx_lookup_symbol,
        0, vx_mourn_inferior,

+       0,  /* can_run */
+       0, /* notice_signals */

        process_stratum, 0, /* next */
        0, 1, 1, 1, 1,  /* all mem, mem, stack, regs, exec */
                        /* all_mem is off to avoid spurious msg in "i files" */
        process_stratum, 0, /* next */
        0, 1, 1, 1, 1,  /* all mem, mem, stack, regs, exec */
                        /* all_mem is off to avoid spurious msg in "i files" */


@@ -1482,6 +1311,14 @@ struct target_ops vx_run_ops = {
 void
 _initialize_vx ()
 {
 void
 _initialize_vx ()
 {

-  add_target (&vx_ops);
+  
+ add_show_from_set
+    (add_set_cmd ("vxworks-timeout", class_support, var_uinteger,
+                 (char *) &rpcTimeout.tv_sec,
+                 "Set seconds to wait for rpc calls to return.\n\
+Set the number of seconds to wait for rpc calls to return.", &setlist),
+     &showlist);
+
+   add_target (&vx_ops);

   add_target (&vx_run_ops);
 }
   add_target (&vx_run_ops);
 }