(m32r_handle_align): Declare type of fragp.

[deliverable/binutils-gdb.git] / gdb / m32r-rom.c

diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index bbcc1c0cf7b6b31d807e48e40e87360deba93b16..b2832792121960aef9b7b6771b95a6892ea31ace 100644 (file)
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -35,9 +35,10 @@
 #include <time.h>              /* for time_t */
 #include "gdb_string.h"
 #include "objfiles.h"          /* for ALL_OBJFILES etc. */
+#include "inferior.h"          /* for write_pc() */
+#include <ctype.h>
 
-
-extern void report_transfer_performance PARAMS ((unsigned long, time_t, time_t));
+extern void report_transfer_performance (unsigned long, time_t, time_t);
 
 #ifndef _MSC_VER
 /*
@@ -61,11 +62,9 @@ static char *download_path;  /* user-settable path for SREC files     */
  */
 
 static void
-m32r_load_section (abfd, s, data_count)
-     bfd *abfd;
-     asection *s;
-     unsigned int *data_count;
+m32r_load_section (bfd *abfd, asection *s, void *obj)
 {
+  unsigned int *data_count = obj;
   if (s->flags & SEC_LOAD)
     {
       bfd_size_type section_size = bfd_section_size (abfd, s);
@@ -79,7 +78,7 @@ m32r_load_section (abfd, s, data_count)
       print_address_numeric (section_base, 1, gdb_stdout);
       printf_filtered ("\n");
       gdb_flush (gdb_stdout);
-      monitor_printf ("%x mw\r", section_base);
+      monitor_printf ("%s mw\r", paddr_nz (section_base));
       for (i = 0; i < section_size; i += 4)
        {
          QUIT;
@@ -94,8 +93,7 @@ m32r_load_section (abfd, s, data_count)
 }
 
 static int
-m32r_load_1 (dummy)
-     void *dummy;
+m32r_load_1 (void *dummy)
 {
   int data_count = 0;
 
@@ -108,9 +106,7 @@ m32r_load_1 (dummy)
  */
 
 static void
-m32r_load (filename, from_tty)
-     char *filename;
-     int from_tty;
+m32r_load (char *filename, int from_tty)
 {
   extern int inferior_pid;
   bfd *abfd;
@@ -181,15 +177,13 @@ m32r_load (filename, from_tty)
 }
 
 static void
-m32r_load_gen (filename, from_tty)
-     char *filename;
-     int from_tty;
+m32r_load_gen (char *filename, int from_tty)
 {
   generic_load (filename, from_tty);
 }
 
-static void m32r_open PARAMS ((char *args, int from_tty));
-static void mon2000_open PARAMS ((char *args, int from_tty));
+static void m32r_open (char *args, int from_tty);
+static void mon2000_open (char *args, int from_tty);
 
 /* This array of registers needs to match the indexes used by GDB. The
    whole reason this exists is because the various ROM monitors use
@@ -203,11 +197,7 @@ static char *m32r_regnames[] =
 };
 
 static void
-m32r_supply_register (regname, regnamelen, val, vallen)
-     char *regname;
-     int regnamelen;
-     char *val;
-     int vallen;
+m32r_supply_register (char *regname, int regnamelen, char *val, int vallen)
 {
   int regno;
   int num_regs = sizeof (m32r_regnames) / sizeof (m32r_regnames[0]);
@@ -336,9 +326,7 @@ init_m32r_cmds (void)
 }                              /* init_m32r_cmds */
 
 static void
-m32r_open (args, from_tty)
-     char *args;
-     int from_tty;
+m32r_open (char *args, int from_tty)
 {
   monitor_open (args, &m32r_cmds, from_tty);
 }
@@ -398,9 +386,7 @@ init_mon2000_cmds (void)
 }                              /* init_mon2000_cmds */
 
 static void
-mon2000_open (args, from_tty)
-     char *args;
-     int from_tty;
+mon2000_open (char *args, int from_tty)
 {
   monitor_open (args, &mon2000_cmds, from_tty);
 }
@@ -411,9 +397,7 @@ mon2000_open (args, from_tty)
    Tell the BootOne monitor what it's ethernet IP address is. */
 
 static void
-m32r_set_board_address (args, from_tty)
-     char *args;
-     int from_tty;
+m32r_set_board_address (char *args, int from_tty)
 {
   int resp_len;
   char buf[1024];
@@ -432,9 +416,7 @@ m32r_set_board_address (args, from_tty)
    Tell the BootOne monitor what gdb's ethernet IP address is. */
 
 static void
-m32r_set_server_address (args, from_tty)
-     char *args;
-     int from_tty;
+m32r_set_server_address (char *args, int from_tty)
 {
   int resp_len;
   char buf[1024];
@@ -453,9 +435,7 @@ m32r_set_server_address (args, from_tty)
    Tell the BootOne monitor the default path for downloadable SREC files. */
 
 static void
-m32r_set_download_path (args, from_tty)
-     char *args;
-     int from_tty;
+m32r_set_download_path (char *args, int from_tty)
 {
   int resp_len;
   char buf[1024];
@@ -471,9 +451,7 @@ m32r_set_download_path (args, from_tty)
 }
 
 static void
-m32r_upload_command (args, from_tty)
-     char *args;
-     int from_tty;
+m32r_upload_command (char *args, int from_tty)
 {
   bfd *abfd;
   asection *s;
@@ -600,7 +578,7 @@ m32r_upload_command (args, from_tty)
 #endif /* ! _MSC_VER */
 
 void
-_initialize_m32r_rom ()
+_initialize_m32r_rom (void)
 {
   /* Initialize m32r RevC monitor target */
   init_m32r_cmds ();