2001-04-03 David Mosberger <davidm@hpl.hp.com>

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

diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index eb18812f6fd7d65e72d4516dd1b635496210ec84..96c24913a731cacb5a1e0be594c2cdb197c812d4 100644 (file)
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -1,7 +1,8 @@
 /* Remote debugging interface for Motorola's MVME187BUG monitor, an embedded
    monitor for the m88k.
 
-   Copyright 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by K. Richard Pixley.
 
    This file is part of GDB.
@@ -23,12 +24,10 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
-
 #include "gdb_string.h"
+#include "regcache.h"
 #include <ctype.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <setjmp.h>
 #include <errno.h>
 
@@ -38,9 +37,6 @@
 
 #include "remote-utils.h"
 
-
-extern int sleep ();
-
 /* External data declarations */
 extern int stop_soon_quietly;  /* for wait_for_inferior */
 
@@ -143,7 +139,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)
            {
@@ -156,7 +152,7 @@ bug_load (char *args, int fromtty)
              gdb_flush (gdb_stdout);
            }
          printf_filtered ("\n");
-         free (buffer);
+         xfree (buffer);
        }
       s = s->next;
     }
@@ -229,7 +225,7 @@ bug_open (char *args, int from_tty)
       target_is_m88110 = 1;
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
@@ -515,9 +511,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 =
@@ -555,7 +551,8 @@ bug_store_register (int regno)
 
 int
 bug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-                struct target_ops *target)
+                struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+                struct target_ops *target ATTRIBUTE_UNUSED)
 {
   int res;
 
@@ -650,7 +647,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
@@ -740,7 +737,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);
@@ -842,7 +839,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);
@@ -868,7 +865,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 ();