* gdb.texinfo (Continuing and Stepping): When talking about "step"

[deliverable/binutils-gdb.git] / gdb / sparc-nat.c

diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 6b843635317d822b2043e4cc88b72e997a6f39c7..3f2768307cee87b8cf2923046c5d9c02f94b8e96 100644 (file)
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -1,5 +1,5 @@
-/* Functions specific to running gdb native on a Sun 4 running sunos4.
-   Copyright (C) 1989, 1992, Free Software Foundation, Inc.
+/* Functions specific to running gdb native on a SPARC running SunOS4.
+   Copyright 1989, 1992, 1993, 1994 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -20,7 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "defs.h"
 #include "inferior.h"
 #include "target.h"
-#include "nm.h"
 
 #include <signal.h>
 #include <sys/ptrace.h>
@@ -86,12 +85,13 @@ fetch_inferior_registers (regno)
         all the regs every time it is called!  FIXME.  */
       register_valid[WIM_REGNUM] = 1;  /* Not true yet, FIXME */
       register_valid[TBR_REGNUM] = 1;  /* Not true yet, FIXME */
-      register_valid[FPS_REGNUM] = 1;  /* Not true yet, FIXME */
       register_valid[CPS_REGNUM] = 1;  /* Not true yet, FIXME */
     }
 
   /* Floating point registers */
-  if (regno == -1 || (regno >= FP0_REGNUM && regno <= FP0_REGNUM + 31))
+  if (regno == -1 ||
+      regno == FPS_REGNUM ||
+      (regno >= FP0_REGNUM && regno <= FP0_REGNUM + 31))
     {
       if (0 != ptrace (PTRACE_GETFPREGS, inferior_pid,
                       (PTRACE_ARG3_TYPE) &inferior_fp_registers,
@@ -99,9 +99,9 @@ fetch_inferior_registers (regno)
            perror("ptrace_getfpregs");
       memcpy (&registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers,
              sizeof inferior_fp_registers.fpu_fr);
-      /* bcopy (&inferior_fp_registers.Fpu_fsr,
-            &registers[REGISTER_BYTE (FPS_REGNUM)],
-            sizeof (FPU_FSR_TYPE));  FIXME???  -- gnu@cyg */
+      memcpy (&registers[REGISTER_BYTE (FPS_REGNUM)],
+            &inferior_fp_registers.Fpu_fsr,
+            sizeof (FPU_FSR_TYPE));
       for (i = FP0_REGNUM; i <= FP0_REGNUM+31; i++)
        register_valid[i] = 1;
       register_valid[FPS_REGNUM] = 1;
@@ -122,7 +122,7 @@ fetch_inferior_registers (regno)
       CORE_ADDR sp = *(CORE_ADDR*)&registers[REGISTER_BYTE (SP_REGNUM)];
       i = REGISTER_BYTE (regno);
       if (register_valid[regno])
-       printf("register %d valid and read\n", regno);
+       printf_unfiltered("register %d valid and read\n", regno);
       target_xfer_memory (sp + i - REGISTER_BYTE (L0_REGNUM),
                          &registers[i], REGISTER_RAW_SIZE (regno), 0);
       register_valid[regno] = 1;
@@ -154,6 +154,8 @@ store_inferior_registers (regno)
          wanna_store = INT_REGS + STACK_REGS;
        else if (regno < L0_REGNUM || regno > I7_REGNUM)
          wanna_store = INT_REGS;
+       else if (regno == FPS_REGNUM)
+         wanna_store = FP_REGS;
        else
          wanna_store = STACK_REGS;
       }
@@ -225,10 +227,8 @@ store_inferior_registers (regno)
       if (!register_valid[FP0_REGNUM+9]) abort();
       memcpy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
              sizeof inferior_fp_registers.fpu_fr);
-
-/*    memcpy (&inferior_fp_registers.Fpu_fsr, 
+      memcpy (&inferior_fp_registers.Fpu_fsr, 
              &registers[REGISTER_BYTE (FPS_REGNUM)], sizeof (FPU_FSR_TYPE));
-****/
       if (0 !=
         ptrace (PTRACE_SETFPREGS, inferior_pid,
                 (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0))
@@ -273,8 +273,8 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, ignore)
       if (0 != target_read_memory (sp, &registers[REGISTER_BYTE (L0_REGNUM)], 
                          16 * REGISTER_RAW_SIZE (L0_REGNUM)))
        {
-         /* fprintf so user can still use gdb */
-         fprintf (stderr,
+         /* fprintf_unfiltered so user can still use gdb */
+         fprintf_unfiltered (gdb_stderr,
                   "Couldn't read input and local registers from core file\n");
        }
     }
@@ -291,7 +291,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, ignore)
                sizeof (FPU_FSR_TYPE));
       }
     else
-      fprintf (stderr, "Couldn't read float regs from core file\n");
+      fprintf_unfiltered (gdb_stderr, "Couldn't read float regs from core file\n");
   }
 }