Mon Mar 24 19:43:16 1997 Geoffrey Noer <[email protected]>

[binutils.git] / gdb / pyr-xdep.c

diff --git a/gdb/pyr-xdep.c b/gdb/pyr-xdep.c
index 114ea64ede165e801cb34c8d6f9012ddb71212dd..e205b50a87d12b0f56ce6c41be76a04f44eed707 100644 (file)
--- a/gdb/pyr-xdep.c
+++ b/gdb/pyr-xdep.c
@@ -15,11 +15,9 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 

-#include <stdio.h>

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

-#include "param.h"

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


@@ -32,12 +30,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbcore.h"
 #include <sys/user.h>          /* After a.out.h  */
 #include <sys/file.h>
 #include "gdbcore.h"
 #include <sys/user.h>          /* After a.out.h  */
 #include <sys/file.h>

-#include <sys/stat.h>
+#include "gdb_stat.h"
+

 \f
 void
 \f
 void

-fetch_inferior_registers ()
+fetch_inferior_registers (regno)
+     int regno;

 {
 {

-  register int regno, datum;
+  register int datum;

   register unsigned int regaddr;
   int reg_buf[NUM_REGS+1];
   struct user u;
   register unsigned int regaddr;
   int reg_buf[NUM_REGS+1];
   struct user u;


@@ -46,16 +46,16 @@ fetch_inferior_registers ()
   registers_fetched ();
   
   for (regno = 0; regno < 64; regno++) {
   registers_fetched ();
   
   for (regno = 0; regno < 64; regno++) {

-    reg_buf[regno] = ptrace (3, inferior_pid, regno, 0);
+    reg_buf[regno] = ptrace (3, inferior_pid, (PTRACE_ARG3_TYPE) regno, 0);

     
 #if defined(PYRAMID_CONTROL_FRAME_DEBUGGING)
     
 #if defined(PYRAMID_CONTROL_FRAME_DEBUGGING)

-    printf ("Fetching %s from inferior, got %0x\n",
+    printf_unfiltered ("Fetching register %s, got %0x\n",

            reg_names[regno],
            reg_buf[regno]);
 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
     
     if (reg_buf[regno] == -1 && errno == EIO) {
            reg_names[regno],
            reg_buf[regno]);
 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
     
     if (reg_buf[regno] == -1 && errno == EIO) {

-      printf("fetch_interior_registers: fetching %s from inferior\n",
+      printf_unfiltered("fetch_interior_registers: fetching register %s\n",

             reg_names[regno]);
       errno = 0;
     }
             reg_names[regno]);
       errno = 0;
     }


@@ -63,8 +63,8 @@ fetch_inferior_registers ()
   }
   /* that leaves regs 64, 65, and 66 */
   datum = ptrace (3, inferior_pid,
   }
   /* that leaves regs 64, 65, and 66 */
   datum = ptrace (3, inferior_pid,

-                 ((char *)&u.u_pcb.pcb_csp) -
-                 ((char *)&u), 0);
+                 (PTRACE_ARG3_TYPE) (((char *)&u.u_pcb.pcb_csp) -
+                 ((char *)&u)), 0);

   
   
   
   
   
   


@@ -100,10 +100,11 @@ fetch_inferior_registers ()
   
   while (1) {
     register int inferior_saved_pc;
   
   while (1) {
     register int inferior_saved_pc;

-    inferior_saved_pc = ptrace (1, inferior_pid, datum+((32+15)*4), 0);
+    inferior_saved_pc = ptrace (1, inferior_pid,
+                               (PTRACE_ARG3_TYPE) (datum+((32+15)*4)), 0);

     if (inferior_saved_pc > 0) break;
 #if defined(PYRAMID_CONTROL_FRAME_DEBUGGING)
     if (inferior_saved_pc > 0) break;
 #if defined(PYRAMID_CONTROL_FRAME_DEBUGGING)

-    printf("skipping kernel frame %08x, pc=%08x\n", datum,
+    printf_unfiltered("skipping kernel frame %08x, pc=%08x\n", datum,

           inferior_saved_pc);
 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
     skipped_frames++;
           inferior_saved_pc);
 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
     skipped_frames++;


@@ -114,7 +115,7 @@ fetch_inferior_registers ()
   supply_register(CSP_REGNUM, reg_buf+CSP_REGNUM);
 #ifdef  PYRAMID_CONTROL_FRAME_DEBUGGING
   if (skipped_frames) {
   supply_register(CSP_REGNUM, reg_buf+CSP_REGNUM);
 #ifdef  PYRAMID_CONTROL_FRAME_DEBUGGING
   if (skipped_frames) {

-    fprintf (stderr,
+    fprintf_unfiltered (stderr,

             "skipped %d frames from %x to %x; cfp was %x, now %x\n",
             skipped_frames, reg_buf[CSP_REGNUM]);
   }
             "skipped %d frames from %x to %x; cfp was %x, now %x\n",
             skipped_frames, reg_buf[CSP_REGNUM]);
   }


@@ -125,6 +126,7 @@ fetch_inferior_registers ()
    If REGNO is -1, do this for all registers.
    Otherwise, REGNO specifies which register (so we can save time).  */
 
    If REGNO is -1, do this for all registers.
    Otherwise, REGNO specifies which register (so we can save time).  */
 

+void

 store_inferior_registers (regno)
      int regno;
 {
 store_inferior_registers (regno)
      int regno;
 {


@@ -137,7 +139,8 @@ store_inferior_registers (regno)
        /*regaddr = register_addr (regno, offset);*/
        regaddr = regno;
        errno = 0;
        /*regaddr = register_addr (regno, offset);*/
        regaddr = regno;
        errno = 0;

-       ptrace (6, inferior_pid, regaddr, read_register (regno));
+       ptrace (6, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
+               read_register (regno));

        if (errno != 0)
          {
            sprintf (buf, "writing register number %d", regno);
        if (errno != 0)
          {
            sprintf (buf, "writing register number %d", regno);


@@ -152,7 +155,8 @@ store_inferior_registers (regno)
          /*regaddr = register_addr (regno, offset);*/
          regaddr = regno;
          errno = 0;
          /*regaddr = register_addr (regno, offset);*/
          regaddr = regno;
          errno = 0;

-         ptrace (6, inferior_pid, regaddr, read_register (regno));
+         ptrace (6, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
+                 read_register (regno));

          if (errno != 0)
            {
              sprintf (buf, "writing all regs, number %d", regno);
          if (errno != 0)
            {
              sprintf (buf, "writing all regs, number %d", regno);


@@ -167,7 +171,7 @@ extern unsigned int last_frame_offset;
 
 #ifdef PYRAMID_CORE
 
 
 #ifdef PYRAMID_CORE
 

-/* Can't make definitions here static, since core.c needs them
+/* Can't make definitions here static, since corefile.c needs them

    to do bounds checking on the core-file areas. O well. */
 
 /* have two stacks: one for data, one for register windows. */
    to do bounds checking on the core-file areas. O well. */
 
 /* have two stacks: one for data, one for register windows. */


@@ -188,7 +192,7 @@ extern int reg_stack_offset;
 
 \f
 /* Work with core dump and executable files, for GDB. 
 
 \f
 /* Work with core dump and executable files, for GDB. 

-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */

 
 void
 core_file_command (filename, from_tty)
 
 void
 core_file_command (filename, from_tty)


@@ -227,7 +231,7 @@ core_file_command (filename, from_tty)
       make_cleanup (free, filename);
       
       if (have_inferior_p ())
       make_cleanup (free, filename);
       
       if (have_inferior_p ())

-       error ("To look at a core file, you must kill the inferior with \"kill\".");
+       error ("To look at a core file, you must kill the program with \"kill\".");

       corechan = open (filename, O_RDONLY, 0);
       if (corechan < 0)
        perror_with_name (filename);
       corechan = open (filename, O_RDONLY, 0);
       if (corechan < 0)
        perror_with_name (filename);


@@ -273,17 +277,17 @@ core_file_command (filename, from_tty)
 
            if (*(int *)buf >= 0)
                    break;
 
            if (*(int *)buf >= 0)
                    break;

-           printf ("skipping frame %0x\n", last_frame_address);
+           printf_unfiltered ("skipping frame %s\n", local_hex_string (last_frame_address));

            last_frame_offset -= CONTROL_STACK_FRAME_SIZE;
            last_frame_address -= CONTROL_STACK_FRAME_SIZE;
        }
        reg_offset = last_frame_offset;
 
 #if 1 || defined(PYRAMID_CONTROL_FRAME_DEBUGGING)
            last_frame_offset -= CONTROL_STACK_FRAME_SIZE;
            last_frame_address -= CONTROL_STACK_FRAME_SIZE;
        }
        reg_offset = last_frame_offset;
 
 #if 1 || defined(PYRAMID_CONTROL_FRAME_DEBUGGING)

-       printf ("Control stack pointer = 0x%08x\n",
-               u.u_pcb.pcb_csp);
-       printf ("offset to control stack %d outermost frame %d (%0x)\n",
-             reg_stack_offset, reg_offset, last_frame_address);
+       printf_unfiltered ("Control stack pointer = %s\n",
+               local_hex_string (u.u_pcb.pcb_csp));
+       printf_unfiltered ("offset to control stack %d outermost frame %d (%s)\n",
+             reg_stack_offset, reg_offset, local_hex_string (last_frame_address));

 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
 
 #else /* not PYRAMID_CORE */
 #endif /* PYRAMID_CONTROL_FRAME_DEBUGGING */
 
 #else /* not PYRAMID_CORE */


@@ -328,7 +332,7 @@ core_file_command (filename, from_tty)
              if (val < 0)
                perror_with_name (filename);
 #ifdef PYRAMID_CONTROL_FRAME_DEBUGGING
              if (val < 0)
                perror_with_name (filename);
 #ifdef PYRAMID_CONTROL_FRAME_DEBUGGING

-      printf ("[reg %s(%d), offset in file %s=0x%0x, addr =0x%0x, =%0x]\n",
+      printf_unfiltered ("[reg %s(%d), offset in file %s=0x%0x, addr =0x%0x, =%0x]\n",

              reg_names[regno], regno, filename,
              register_addr(regno, reg_offset),
              regno * 4 + last_frame_address,
              reg_names[regno], regno, filename,
              register_addr(regno, reg_offset),
              regno * 4 + last_frame_address,


@@ -342,12 +346,12 @@ core_file_command (filename, from_tty)
        corefile = savestring (filename, strlen (filename));
       else
        {
        corefile = savestring (filename, strlen (filename));
       else
        {

-         corefile = concat (current_directory, "/", filename);
+         corefile = concat (current_directory, "/", filename, NULL);

        }
 
 #if 1 || defined(PYRAMID_CONTROL_FRAME_DEBUGGING)
        }
 
 #if 1 || defined(PYRAMID_CONTROL_FRAME_DEBUGGING)

-      printf ("Providing CSP (%0x) as nominal address of current frame.\n",
-             last_frame_address);
+      printf_unfiltered ("Providing CSP (%s) as nominal address of current frame.\n",
+             local_hex_string(last_frame_address));

 #endif PYRAMID_CONTROL_FRAME_DEBUGGING
       /* FIXME: Which of the following is correct? */
 #if 0
 #endif PYRAMID_CONTROL_FRAME_DEBUGGING
       /* FIXME: Which of the following is correct? */
 #if 0


@@ -362,5 +366,5 @@ core_file_command (filename, from_tty)
       validate_files ();
     }
   else if (from_tty)
       validate_files ();
     }
   else if (from_tty)

-    printf ("No core file now.\n");
+    printf_unfiltered ("No core file now.\n");

 }
 }