gdb-3.1

1 files changed, 98 insertions, 593 deletions

diff --git a/gdb/inflow.c b/gdb/inflow.c
index 11e5e92..19da996 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -17,40 +17,20 @@ notice and this notice must be preserved on all copies.
 In other words, go ahead and share GDB, but don't try to stop
 anyone else from sharing it farther.  Help stamp out software hoarding!
 */
-
 #include "defs.h"
-#include "initialize.h"
 #include "param.h"
 #include "frame.h"
 #include "inferior.h"
 
+#ifdef USG
+#include <sys/types.h>
+#include <fcntl.h>
+#endif
+
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/dir.h>
-#ifndef UMAX_PTRACE
-#include <sys/user.h>
-#endif
 #include <signal.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#ifdef UMAX_PTRACE
-#include <a.out.h>
-#include <sys/ptrace.h>
-#define PTRACE_ATTACH PT_ATTACH
-#define PTRACE_DETACH PT_FREEPROC
-#endif
-
-#ifdef NEW_SUN_PTRACE
-#include <sys/ptrace.h>
-#include <machine/reg.h>
-#endif
-
-#ifdef HP9K320
-#include <sys/ptrace.h>
-#include <sys/reg.h>
-#include <sys/trap.h>
-#endif
 
 #ifdef HAVE_TERMIO
 #include <termio.h>
@@ -62,34 +42,48 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
 #define TIOCSETP TCSETAF
 #define TERMINAL struct termio
 #else
+#include <sys/ioctl.h>
+#include <fcntl.h>
 #include <sgtty.h>
 #define TERMINAL struct sgttyb
 #endif
 
+#ifdef SET_STACK_LIMIT_HUGE
+#include <sys/time.h>
+#include <sys/resource.h>
+extern int original_stack_limit;
+#endif /* SET_STACK_LIMIT_HUGE */
+
 extern int errno;
 
 /* Nonzero if we are debugging an attached outside process
    rather than an inferior.  */
 
-static int attach_flag;
+int attach_flag;
 
-START_FILE
 
 /* Record terminal status separately for debugger and inferior.  */
 
 static TERMINAL sg_inferior;
 static TERMINAL sg_ours;
+
 static int tflags_inferior;
 static int tflags_ours;
 
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
 static struct tchars tc_inferior;
 static struct tchars tc_ours;
+#endif
+
+#ifdef TIOCGLTC
 static struct ltchars ltc_inferior;
 static struct ltchars ltc_ours;
+#endif /* TIOCGLTC */
+
+#ifdef TIOCLGET
 static int lmode_inferior;
 static int lmode_ours;
-#endif /* TIOCGLTC */
+#endif
 
 #ifdef TIOCGPGRP
 static int pgrp_inferior;
@@ -120,11 +114,17 @@ terminal_init_inferior ()
   sg_inferior = sg_ours;
   tflags_inferior = tflags_ours;
 
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
   tc_inferior = tc_ours;
+#endif
+
+#ifdef TIOCGLTC
   ltc_inferior = ltc_ours;
+#endif
+
+#ifdef TIOCLGET
   lmode_inferior = lmode_ours;
-#endif /* TIOCGLTC */
+#endif
 
 #ifdef TIOCGPGRP
   pgrp_inferior = inferior_pid;
@@ -147,18 +147,21 @@ terminal_inferior ()
       fcntl (0, F_SETFL, tflags_inferior);
       fcntl (0, F_SETFL, tflags_inferior);
       ioctl (0, TIOCSETN, &sg_inferior);
-
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
       ioctl (0, TIOCSETC, &tc_inferior);
+#endif
+#ifdef TIOCGLTC
       ioctl (0, TIOCSLTC, &ltc_inferior);
+#endif
+#ifdef TIOCLGET
       ioctl (0, TIOCLSET, &lmode_inferior);
-#endif /* TIOCGLTC */
+#endif
 
 #ifdef TIOCGPGRP
       ioctl (0, TIOCSPGRP, &pgrp_inferior);
 #else
-      sigint_ours = (signal (SIGINT, SIG_IGN));
-      sigquit_ours = (signal (SIGQUIT, SIG_IGN));
+      sigint_ours = (int (*) ()) signal (SIGINT, SIG_IGN);
+      sigquit_ours = (int (*) ()) signal (SIGQUIT, SIG_IGN);
 #endif /* TIOCGPGRP */
     }
   terminal_is_ours = 0;
@@ -222,11 +225,15 @@ terminal_ours_1 (output_only)
       tflags_inferior = fcntl (0, F_GETFL, 0);
       ioctl (0, TIOCGETP, &sg_inferior);
 
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
       ioctl (0, TIOCGETC, &tc_inferior);
+#endif
+#ifdef TIOCGLTC
       ioctl (0, TIOCGLTC, &ltc_inferior);
+#endif
+#ifdef TIOCLGET
       ioctl (0, TIOCLGET, &lmode_inferior);
-#endif /* TIOCGLTC */
+#endif
     }
 
 #ifdef HAVE_TERMIO
@@ -243,11 +250,15 @@ terminal_ours_1 (output_only)
   fcntl (0, F_SETFL, tflags_ours);
   ioctl (0, TIOCSETN, &sg_ours);
 
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
   ioctl (0, TIOCSETC, &tc_ours);
+#endif
+#ifdef TIOCGLTC
   ioctl (0, TIOCSLTC, &ltc_ours);
+#endif
+#ifdef TIOCLGET
   ioctl (0, TIOCLSET, &lmode_ours);
-#endif /* TIOCGLTC */
+#endif
 
 
 #ifdef HAVE_TERMIO
@@ -283,18 +294,29 @@ term_status_command ()
 
 #else /* not HAVE_TERMIO */
 
-  printf ("fcntl flags = 0x%x, lmode = 0x%x,\nsgttyb.sg_flags = 0x%x, owner pid = %d.\n",
-	  tflags_inferior, lmode_inferior,
-	  sg_inferior.sg_flags, pgrp_inferior);
+  printf ("fcntl flags = 0x%x, sgttyb.sg_flags = 0x%x, owner pid = %d.\n",
+	  tflags_inferior, sg_inferior.sg_flags, pgrp_inferior);
+
+#endif /* not HAVE_TERMIO */
+
+#ifdef TIOCGETC
   printf ("tchars: ");
   for (i = 0; i < sizeof (struct tchars); i++)
     printf ("0x%x ", ((char *)&tc_inferior)[i]);
   printf ("\n");
+#endif
+
+#ifdef TIOCGLTC
   printf ("ltchars: ");
   for (i = 0; i < sizeof (struct ltchars); i++)
     printf ("0x%x ", ((char *)&ltc_inferior)[i]);
+  printf ("\n");
+  ioctl (0, TIOCSLTC, &ltc_ours);
+#endif
 
-#endif /* not HAVE_TERMIO */
+#ifdef TIOCLGET
+  printf ("lmode:  %x\n", lmode_inferior);
+#endif
 }
 
 static void
@@ -304,11 +326,7 @@ new_tty (ttyname)
   register int tty;
   register int fd;
 
-#if 0
-  /* I think it is better not to do this.  Then C-z on the GDB terminal
-     will still stop the program, while C-z on the data terminal
-     will be input.  */
-
+#ifdef TIOCNOTTY
   /* Disconnect the child process from our controlling terminal.  */
   tty = open("/dev/tty", O_RDWR);
   if (tty > 0)
@@ -317,6 +335,7 @@ new_tty (ttyname)
       close(tty);
     }
 #endif
+
   /* Now open the specified new terminal.  */
 
   tty = open(ttyname, O_RDWR);
@@ -361,19 +380,29 @@ create_inferior (allargs, env)
   /* exec is said to fail if the executable is open.  */
   close_exec_file ();
 
-  pid = vfork ();
+  pid = fork ();
   if (pid < 0)
-    perror_with_name ("vfork");
+    perror_with_name ("fork");
 
   if (pid == 0)
     {
-      char *args[4];
-
 #ifdef TIOCGPGRP
       /* Run inferior in a separate process group.  */
       setpgrp (getpid (), getpid ());
 #endif /* TIOCGPGRP */
 
+#ifdef SET_STACK_LIMIT_HUGE
+      /* Reset the stack limit back to what it was.  */
+      {
+	struct rlimit rlim;
+
+	getrlimit (RLIMIT_STACK, &rlim);
+	rlim.rlim_cur = original_stack_limit;
+	setrlimit (RLIMIT_STACK, &rlim);
+      }
+#endif /* SET_STACK_LIMIT_HUGE */
+
+
       inferior_thisrun_terminal = inferior_io_terminal;
       if (inferior_io_terminal != 0)
 	new_tty (inferior_io_terminal);
@@ -383,14 +412,8 @@ create_inferior (allargs, env)
 /*???      signal (SIGQUIT, SIG_DFL);
       signal (SIGINT, SIG_DFL);  */
 
-      ptrace (0);
-
-      args[0] = "sh";
-      args[1] = "-c";
-      args[2] = shell_command;
-      args[3] = 0;
-
-      execve (SHELL_FILE, args, env);
+      call_ptrace (0);
+      execle (SHELL_FILE, "sh", "-c", shell_command, 0, env);
 
       fprintf (stderr, "Cannot exec %s: %s.\n", SHELL_FILE,
 	       errno < sys_nerr ? sys_errlist[errno] : "unknown error");
@@ -414,538 +437,17 @@ kill_command ()
   kill_inferior ();
 }
 
-kill_inferior ()
-{
-  if (remote_debugging)
-    return;
-  if (inferior_pid == 0)
-    return;
-  ptrace (8, inferior_pid, 0, 0);
-  wait (0);
-  inferior_died ();
-}
-
-/* This is used when GDB is exiting.  It gives less chance of error.*/
-
-kill_inferior_fast ()
-{
-  if (remote_debugging)
-    return;
-  if (inferior_pid == 0)
-    return;
-  ptrace (8, inferior_pid, 0, 0);
-  wait (0);
-}
-
+void
 inferior_died ()
 {
   inferior_pid = 0;
   attach_flag = 0;
   mark_breakpoints_out ();
+  select_frame ( (FRAME) 0, -1);
   reopen_exec_file ();
   if (have_core_file_p ())
-    set_current_frame (read_register (FP_REGNUM));
-}
-
-/* Resume execution of the inferior process.
-   If STEP is nonzero, single-step it.
-   If SIGNAL is nonzero, give it that signal.  */
-
-void
-resume (step, signal)
-     int step;
-     int signal;
-{
-  errno = 0;
-  if (remote_debugging)
-    remote_resume (step, signal);
-  else
-    {
-#ifdef NO_SINGLE_STEP
-      if (step)
-	{
-	  single_step (signal);
-	}
-      else ptrace (7, inferior_pid, 1, signal);
-#else
-      ptrace (step ? 9 : 7, inferior_pid, 1, signal);
-#endif
-      if (errno)
-	perror_with_name ("ptrace");
-    }
-}
-
-#ifdef ATTACH_DETACH
-
-/* Start debugging the process whose number is PID.  */
-
-attach (pid)
-     int pid;
-{
-  errno = 0;
-  ptrace (PTRACE_ATTACH, pid, 0, 0);
-  if (errno)
-    perror_with_name ("ptrace");
-  attach_flag = 1;
-  return pid;
-}
-
-/* Stop debugging the process whose number is PID
-   and continue it with signal number SIGNAL.
-   SIGNAL = 0 means just continue it.  */
-
-void
-detach (signal)
-     int signal;
-{
-  errno = 0;
-  ptrace (PTRACE_DETACH, inferior_pid, 1, signal);
-  if (errno)
-    perror_with_name ("ptrace");
-  attach_flag = 0;
-}
-#endif /* ATTACH_DETACH */
-
-#ifdef NEW_SUN_PTRACE
-
-void
-fetch_inferior_registers ()
-{
-  struct regs inferior_registers;
-  struct fp_status inferior_fp_registers;
-  extern char registers[];
-
-  if (remote_debugging)
-    remote_fetch_registers (registers);
-  else
-    {
-      ptrace (PTRACE_GETREGS, inferior_pid, &inferior_registers);
-      ptrace (PTRACE_GETFPREGS, inferior_pid, &inferior_fp_registers);
-
-#if defined(sun2) || defined(sun3)
-      bcopy (&inferior_registers, registers, 16 * 4);
-      bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
-	     sizeof inferior_fp_registers.fps_regs);
-      *(int *)&registers[REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps;
-      *(int *)&registers[REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc;
-      bcopy (&inferior_fp_registers.fps_control,
-	     &registers[REGISTER_BYTE (FPC_REGNUM)],
-	     sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs);
-#endif
-#if defined(sun4)
-      registers[REGISTER_BYTE (0)] = 0;
-      bcopy (&inferior_registers.r_g1, &registers[REGISTER_BYTE (1)], 15 * 4);
-      bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
-	     sizeof inferior_fp_registers.fpu_fr);
-      *(int *)&registers[REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps; 
-      *(int *)&registers[REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc;
-      *(int *)&registers[REGISTER_BYTE (NPC_REGNUM)] = inferior_registers.r_npc;
-      *(int *)&registers[REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y;
-/*      *(int *)&registers[REGISTER_BYTE (RP_REGNUM)] =
-             inferior_registers.r_o7 + 8;
-      bcopy (&inferior_fp_registers.Fpu_fsr,
-	     &registers[REGISTER_BYTE (FPS_REGNUM)],
-	     sizeof (FPU_FSR_TYPE)); */
-      read_inferior_memory (inferior_registers.r_sp,
-			    &registers[REGISTER_BYTE (16)],
-			    16*4);
-#endif
-    }
-}
-
-/* Store our register values back into the inferior.
-   If REGNO is -1, do this for all registers.
-   Otherwise, REGNO specifies which register (so we can save time).  */
-
-store_inferior_registers (regno)
-     int regno;
-{
-  struct regs inferior_registers;
-  struct fp_status inferior_fp_registers;
-  extern char registers[];
-
-  if (remote_debugging)
-    remote_store_registers (registers);
-  else
-    {
-      int in_regs = 1, in_fpregs = 1, in_fparegs, in_cpregs = 1;
-
-#if defined(sun2) || defined(sun3)
-      if (in_regs)
-	{
-	  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)];
-	}
-      if (in_fpregs)
-	{
-	  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);
-	}
-      if (in_regs)
-	ptrace (PTRACE_SETREGS, inferior_pid, &inferior_registers);
-      if (in_fpregs)
-	ptrace (PTRACE_SETFPREGS, inferior_pid, &inferior_fp_registers);
-#endif
-#if defined(sun4)
-      if (regno >= 0)
-	if (FP0_REGNUM <= regno && regno <= FP0_REGNUM + 32)
-	  in_regs = 0;
-	else
-	  in_fpregs = 0;
-
-      if (in_regs)
-	{
-	  bcopy (&registers[REGISTER_BYTE (1)], &inferior_registers.r_g1, 15 * 4);
-	  inferior_registers.r_ps = *(int *)&registers[REGISTER_BYTE (PS_REGNUM)];
-	  inferior_registers.r_pc = *(int *)&registers[REGISTER_BYTE (PC_REGNUM)];
-	  inferior_registers.r_npc = *(int *)&registers[REGISTER_BYTE (NPC_REGNUM)];
-	  inferior_registers.r_y = *(int *)&registers[REGISTER_BYTE (Y_REGNUM)];
-	  write_inferior_memory (*(int *)&registers[REGISTER_BYTE (SP_REGNUM)],
-				 &registers[REGISTER_BYTE (16)],
-				 16*4);
-	}
-      if (in_fpregs)
-	{
-	  bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers,
-		 sizeof inferior_fp_registers.fpu_fr);
-  /*      bcopy (&registers[REGISTER_BYTE (FPS_REGNUM)],
-	         &inferior_fp_registers.Fpu_fsr,
-		 sizeof (FPU_FSR_TYPE));
-  ****/
-	}
-
-      if (in_regs)
-	ptrace (PTRACE_SETREGS, inferior_pid, &inferior_registers);
-      if (in_fpregs)
-	ptrace (PTRACE_SETFPREGS, inferior_pid, &inferior_fp_registers);
-#endif
-    }
-}
-
-#else
-#ifdef HP9K320
-
-#define FP_REGISTER_ADDR_DIFF(u, regno)					\
-  (((char *) (FP_REGISTER_ADDR (u, regno))) - ((char *) &(u)))
-
-#define INFERIOR_AR0(u)							\
-  ((ptrace								\
-    (PT_RUAREA, inferior_pid, ((char *) &u.u_ar0 - (char *) &u), 0))	\
-   - KERNEL_U_ADDR)
-
-static void
-fetch_inferior_register (regno, regaddr)
-     register int regno;
-     register unsigned int regaddr;
-{
-#ifndef HPUX_VERSION_5
-  if (regno == PS_REGNUM)
-    {
-      union { int i; short s[2]; } ps_val;
-      int regval;
-
-      ps_val.i = (ptrace (PT_RUAREA, inferior_pid, regaddr, 0));
-      regval = ps_val.s[0];
-      supply_register (regno, &regval);
-    }
-  else
-#endif /* not HPUX_VERSION_5 */
-    {
-      char buf[MAX_REGISTER_RAW_SIZE];
-      register int i;
-
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
-	{
-	  *(int *) &buf[i] = ptrace (PT_RUAREA, inferior_pid, regaddr, 0);
-	  regaddr += sizeof (int);
-	}
-      supply_register (regno, buf);
-    }
-  return;
-}
-
-static void
-store_inferior_register_1 (regno, regaddr, value)
-     int regno;
-     unsigned int regaddr;
-     int value;
-{
-  errno = 0;
-  ptrace (PT_WUAREA, inferior_pid, regaddr, value);
-#if 0
-  /* HP-UX randomly sets errno to non-zero for regno == 25.
-     However, the value is correctly written, so ignore errno. */
-  if (errno != 0)
-    {
-      char string_buf[64];
-
-      sprintf (string_buf, "writing register number %d", regno);
-      perror_with_name (string_buf);
-    }
-#endif
-  return;
-}
-
-static void
-store_inferior_register (regno, regaddr)
-     register int regno;
-     register unsigned int regaddr;
-{
-#ifndef HPUX_VERSION_5
-  if (regno == PS_REGNUM)
-    {
-      union { int i; short s[2]; } ps_val;
-
-      ps_val.i = (ptrace (PT_RUAREA, inferior_pid, regaddr, 0));
-      ps_val.s[0] = (read_register (regno));
-      store_inferior_register_1 (regno, regaddr, ps_val.i);
-    }
-  else
-#endif /* not HPUX_VERSION_5 */
-    {
-      char buf[MAX_REGISTER_RAW_SIZE];
-      register int i;
-      extern char registers[];
-
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
-	{
-	  store_inferior_register_1
-	    (regno, regaddr,
-	     (*(int *) &registers[(REGISTER_BYTE (regno)) + i]));
-	  regaddr += sizeof (int);
-	}
-    }
-  return;
-}
-
-void
-fetch_inferior_registers ()
-{
-  struct user u;
-  register int regno;
-  register unsigned int ar0_offset;
-
-  ar0_offset = (INFERIOR_AR0 (u));
-  for (regno = 0; (regno < FP0_REGNUM); regno++)
-    fetch_inferior_register (regno, (REGISTER_ADDR (ar0_offset, regno)));
-  for (; (regno < NUM_REGS); regno++)
-    fetch_inferior_register (regno, (FP_REGISTER_ADDR_DIFF (u, regno)));
-}
-
-/* Store our register values back into the inferior.
-   If REGNO is -1, do this for all registers.
-   Otherwise, REGNO specifies which register (so we can save time).  */
-
-store_inferior_registers (regno)
-     register int regno;
-{
-  struct user u;
-  register unsigned int ar0_offset;
-
-  if (regno >= FP0_REGNUM)
-    {
-      store_inferior_register (regno, (FP_REGISTER_ADDR_DIFF (u, regno)));
-      return;
-    }
-
-  ar0_offset = (INFERIOR_AR0 (u));
-  if (regno >= 0)
-    {
-      store_inferior_register (regno, (REGISTER_ADDR (ar0_offset, regno)));
-      return;
-    }
-
-  for (regno = 0; (regno < FP0_REGNUM); regno++)
-    store_inferior_register (regno, (REGISTER_ADDR (ar0_offset, regno)));
-  for (; (regno < NUM_REGS); regno++)
-    store_inferior_register (regno, (FP_REGISTER_ADDR_DIFF (u, regno)));
-  return;
-}
-
-#else /* not HP9K320 */
-
-void
-fetch_inferior_registers ()
-{
-  register int regno;
-  register unsigned int regaddr;
-  char buf[MAX_REGISTER_RAW_SIZE];
-  register int i;
-
-#ifdef UMAX_PTRACE
-  unsigned int offset = 0;
-#else
-  struct user u;
-  unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
-  offset = ptrace (3, inferior_pid, offset, 0) - KERNEL_U_ADDR;
-#endif
-
-  for (regno = 0; regno < NUM_REGS; regno++)
-    {
-      regaddr = register_addr (regno, offset);
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
- 	{
- 	  *(int *) &buf[i] = ptrace (3, inferior_pid, regaddr, 0);
- 	  regaddr += sizeof (int);
- 	}
-      supply_register (regno, buf);
-    }
-}
-
-/* Store our register values back into the inferior.
-   If REGNO is -1, do this for all registers.
-   Otherwise, REGNO specifies which register (so we can save time).  */
-
-store_inferior_registers (regno)
-     int regno;
-{
-  register unsigned int regaddr;
-  char buf[80];
-  extern char registers[];
-  int i;
-
-#ifdef UMAX_PTRACE
-  unsigned int offset = 0;
-#else
-  struct user u;
-  unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
-  offset = ptrace (3, inferior_pid, offset, 0) - KERNEL_U_ADDR;
-#endif
-
-  if (regno >= 0)
-    {
-      regaddr = register_addr (regno, offset);
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(int))
-	{
-	  errno = 0;
-	  ptrace (6, inferior_pid, regaddr,
-		  *(int *) &registers[REGISTER_BYTE (regno) + i]);
-	  if (errno != 0)
-	    {
-	      sprintf (buf, "writing register number %d(%d)", regno, i);
-	      perror_with_name (buf);
-	    }
-	  regaddr += sizeof(int);
-	}
-    }
-  else for (regno = 0; regno < NUM_REGS; regno++)
-    {
-      regaddr = register_addr (regno, offset);
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(int))
-	{
-	  errno = 0;
-	  ptrace (6, inferior_pid, regaddr,
-		  *(int *) &registers[REGISTER_BYTE (regno) + i]);
-	  if (errno != 0)
-	    {
-	      sprintf (buf, "writing register number %d(%d)", regno, i);
-	      perror_with_name (buf);
-	    }
-	  regaddr += sizeof(int);
-	}
-    }
-}
-
-#endif /* not HP9K320 */
-#endif /* not NEW_SUN_PTRACE */
-
-/* NOTE! I tried using PTRACE_READDATA, etc., to read and write memory
-   in the NEW_SUN_PTRACE case.
-   It ought to be straightforward.  But it appears that writing did
-   not write the data that I specified.  I cannot understand where
-   it got the data that it actually did write.  */
-
-/* Copy LEN bytes from inferior's memory starting at MEMADDR
-   to debugger memory starting at MYADDR.  */
-
-read_inferior_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-{
-  register int i;
-  /* Round starting address down to longword boundary.  */
-  register CORE_ADDR addr = memaddr & - sizeof (int);
-  /* Round ending address up; get number of longwords that makes.  */
-  register int count
-    = (((memaddr + len) - addr) + sizeof (int) - 1) / sizeof (int);
-  /* Allocate buffer of that many longwords.  */
-  register int *buffer = (int *) alloca (count * sizeof (int));
-
-  /* Read all the longwords */
-  for (i = 0; i < count; i++, addr += sizeof (int))
-    {
-      if (remote_debugging)
-	buffer[i] = remote_fetch_word (addr);
-      else
-	buffer[i] = ptrace (1, inferior_pid, addr, 0);
-    }
-
-  /* Copy appropriate bytes out of the buffer.  */
-  bcopy ((char *) buffer + (memaddr & (sizeof (int) - 1)), myaddr, len);
-}
-
-/* Copy LEN bytes of data from debugger memory at MYADDR
-   to inferior's memory at MEMADDR.
-   On failure (cannot write the inferior)
-   returns the value of errno.  */
-
-int
-write_inferior_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-{
-  register int i;
-  /* Round starting address down to longword boundary.  */
-  register CORE_ADDR addr = memaddr & - sizeof (int);
-  /* Round ending address up; get number of longwords that makes.  */
-  register int count
-    = (((memaddr + len) - addr) + sizeof (int) - 1) / sizeof (int);
-  /* Allocate buffer of that many longwords.  */
-  register int *buffer = (int *) alloca (count * sizeof (int));
-  extern int errno;
-
-  /* Fill start and end extra bytes of buffer with existing memory data.  */
-
-  if (remote_debugging)
-    buffer[0] = remote_fetch_word (addr);
-  else
-    buffer[0] = ptrace (1, inferior_pid, addr, 0);
-
-  if (count > 1)
-    {
-      if (remote_debugging)
-	buffer[count - 1]
-	  = remote_fetch_word (addr + (count - 1) * sizeof (int));
-      else
-	buffer[count - 1]
-	  = ptrace (1, inferior_pid,
-		    addr + (count - 1) * sizeof (int), 0);
-    }
-
-  /* Copy data to be written over corresponding part of buffer */
-
-  bcopy (myaddr, (char *) buffer + (memaddr & (sizeof (int) - 1)), len);
-
-  /* Write the entire buffer.  */
-
-  for (i = 0; i < count; i++, addr += sizeof (int))
-    {
-      errno = 0;
-      if (remote_debugging)
-	remote_store_word (addr, buffer[i]);
-      else
-	ptrace (4, inferior_pid, addr, buffer[i]);
-      if (errno)
-	return errno;
-    }
-
-  return 0;
+    set_current_frame ( create_new_frame (read_register (FP_REGNUM),
+					  read_pc ()));
 }
 
 static void
@@ -962,8 +464,8 @@ try_writing_regs_command ()
     {
       QUIT;
       errno = 0;
-      value = ptrace (3, inferior_pid, i, 0);
-      ptrace (6, inferior_pid, i, value);
+      value = call_ptrace (3, inferior_pid, i, 0);
+      call_ptrace (6, inferior_pid, i, value);
       if (errno == 0)
 	{
 	  printf (" Succeeded with address 0x%x; value 0x%x (%d).\n",
@@ -974,8 +476,8 @@ try_writing_regs_command ()
     }
 }
 
-static
-initialize ()
+void
+_initialize_inflow ()
 {
   add_com ("term-status", class_obscure, term_status_command,
 	   "Print info on inferior's saved terminal status.");
@@ -992,11 +494,15 @@ Report which ones can be written.");
   ioctl (0, TIOCGETP, &sg_ours);
   fcntl (0, F_GETFL, tflags_ours);
 
-#ifdef TIOCGLTC
+#ifdef TIOCGETC
   ioctl (0, TIOCGETC, &tc_ours);
+#endif
+#ifdef TIOCGLTC
   ioctl (0, TIOCGLTC, &ltc_ours);
+#endif
+#ifdef TIOCLGET
   ioctl (0, TIOCLGET, &lmode_ours);
-#endif /* TIOCGLTC */
+#endif
 
 #ifdef TIOCGPGRP
   ioctl (0, TIOCGPGRP, &pgrp_ours);
@@ -1005,4 +511,3 @@ Report which ones can be written.");
   terminal_is_ours = 1;
 }
 
-END_FILE