2002-05-11 Daniel Jacobowitz <drow@mvista.com>

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

diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index 8d0f80265d2536d04d4cc962c4a7d1de5eb0a04c..f74ce9768e24932e85f435e33975162c053bc8c7 100644 (file)
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -1,7 +1,9 @@
 /* Remote debugging interface for Motorola's MVME187BUG monitor, an embedded
    monitor for the m88k.
 
-   Copyright 1992, 1993, 2001 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
+
    Contributed by Cygnus Support.  Written by K. Richard Pixley.
 
    This file is part of GDB.
@@ -34,11 +36,9 @@
 #include "gdbcore.h"
 #include "gdbcmd.h"
 
+#include "serial.h"
 #include "remote-utils.h"
 
-
-extern int sleep ();
-
 /* External data declarations */
 extern int stop_soon_quietly;  /* for wait_for_inferior */
 
@@ -117,7 +117,7 @@ bug_load (char *args, int fromtty)
 
   sr_check_open ();
 
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
   abfd = bfd_openr (args, 0);
   if (!abfd)
     {
@@ -141,7 +141,7 @@ bug_load (char *args, int fromtty)
 
          char *buffer = xmalloc (srec_frame);
 
-         printf_filtered ("%s\t: 0x%4x .. 0x%4x  ", s->name, s->vma, s->vma + s->_raw_size);
+         printf_filtered ("%s\t: 0x%4lx .. 0x%4lx  ", s->name, s->vma, s->vma + s->_raw_size);
          gdb_flush (gdb_stdout);
          for (i = 0; i < s->_raw_size; i += srec_frame)
            {
@@ -234,7 +234,7 @@ bug_open (char *args, int from_tty)
 /* Tell the remote machine to resume.  */
 
 void
-bug_resume (int pid, int step, enum target_signal sig)
+bug_resume (ptid_t ptid, int step, enum target_signal sig)
 {
   if (step)
     {
@@ -263,8 +263,8 @@ static char *wait_strings[] =
   NULL,
 };
 
-int
-bug_wait (int pid, struct target_waitstatus *status)
+ptid_t
+bug_wait (ptid_t ptid, struct target_waitstatus *status)
 {
   int old_timeout = sr_get_timeout ();
   int old_immediate_quit = immediate_quit;
@@ -327,7 +327,7 @@ bug_wait (int pid, struct target_waitstatus *status)
 
   sr_set_timeout (old_timeout);
   immediate_quit = old_immediate_quit;
-  return 0;
+  return inferior_ptid;
 }
 
 /* Return the name of register number REGNO
@@ -399,7 +399,7 @@ bug_srec_write_cr (char *s)
          printf ("%c", *p);
 
        do
-         SERIAL_WRITE (sr_get_desc (), p, 1);
+         serial_write (sr_get_desc (), p, 1);
        while (sr_pollchar () != *p);
       }
   else
@@ -513,9 +513,9 @@ bug_store_register (int regno)
       if (target_is_m88110 && regno == SFIP_REGNUM)
        return;
       else if (regno < XFP_REGNUM)
-       sprintf (buffer, "rs %s %08x",
+       sprintf (buffer, "rs %s %08lx",
                 regname,
-                read_register (regno));
+                (long) read_register (regno));
       else
        {
          unsigned char *fpreg_buf =
@@ -553,8 +553,7 @@ bug_store_register (int regno)
 
 int
 bug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-                struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                struct target_ops *target ATTRIBUTE_UNUSED)
+                struct mem_attrib *attrib, struct target_ops *target)
 {
   int res;
 
@@ -649,7 +648,7 @@ bug_write_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
            thisgo = srec_bytes;
 
          address = memaddr + done;
-         sprintf (buf, "S3%02X%08X", thisgo + 4 + 1, address);
+         sprintf (buf, "S3%02X%08lX", thisgo + 4 + 1, (long) address);
          buf += 12;
 
          checksum += (thisgo + 4 + 1
@@ -739,7 +738,7 @@ bug_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
   unsigned int inaddr;
   unsigned int checksum;
 
-  sprintf (request, "du 0 %x:&%d", memaddr, len);
+  sprintf (request, "du 0 %lx:&%d", (long) memaddr, len);
   sr_write_cr (request);
 
   p = buffer = alloca (len);
@@ -841,7 +840,7 @@ bug_insert_breakpoint (CORE_ADDR addr, char *save)
       char buffer[100];
 
       num_brkpts++;
-      sprintf (buffer, "br %x", addr);
+      sprintf (buffer, "br %lx", (long) addr);
       sr_write_cr (buffer);
       gr_expect_prompt ();
       return (0);
@@ -867,7 +866,7 @@ bug_remove_breakpoint (CORE_ADDR addr, char *save)
       char buffer[100];
 
       num_brkpts--;
-      sprintf (buffer, "nobr %x", addr);
+      sprintf (buffer, "nobr %lx", (long) addr);
       sr_write_cr (buffer);
       gr_expect_prompt ();
 
@@ -948,7 +947,6 @@ init_bug_ops (void)
   bug_ops.to_thread_alive = 0;
   bug_ops.to_stop = 0;
   bug_ops.to_pid_to_exec_file = NULL;
-  bug_ops.to_core_file_to_sym_file = NULL;
   bug_ops.to_stratum = process_stratum;
   bug_ops.DONT_USE = 0;
   bug_ops.to_has_all_memory = 1;