fixup position of #ifdef BFD64 for powerpc delta recently applied.

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

diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index d6b1e5cd4bd4013360265375a17915c7fdda8077..b4bfefdf2103438c399e1c4554b640a7c4b7184d 100644 (file)
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -1,6 +1,7 @@
 /* Remote debugging interface to m32r and mon2000 ROM monitors for GDB, 
    the GNU debugger.
-   Copyright 1996 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    Adapted by Michael Snyder of Cygnus Support.
 
@@ -37,10 +38,10 @@
 #include "objfiles.h"          /* for ALL_OBJFILES etc. */
 #include "inferior.h"          /* for write_pc() */
 #include <ctype.h>
+#include "regcache.h"
 
 extern void report_transfer_performance (unsigned long, time_t, time_t);
 
-#ifndef _MSC_VER
 /*
  * All this stuff just to get my host computer's IP address!
  */
@@ -50,7 +51,6 @@ extern void report_transfer_performance (unsigned long, time_t, time_t);
 #if 1
 #include <arpa/inet.h>         /* for inet_ntoa */
 #endif
-#endif
 
 static char *board_addr;       /* user-settable IP address for M32R-EVA */
 static char *server_addr;      /* user-settable IP address for gdb host */
@@ -62,8 +62,9 @@ static char *download_path;   /* user-settable path for SREC files     */
  */
 
 static void
-m32r_load_section (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);
@@ -107,7 +108,6 @@ m32r_load_1 (void *dummy)
 static void
 m32r_load (char *filename, int from_tty)
 {
-  extern int inferior_pid;
   bfd *abfd;
   asection *s;
   unsigned int i, data_count = 0;
@@ -163,7 +163,7 @@ m32r_load (char *filename, int from_tty)
   if (exec_bfd)
     write_pc (bfd_get_start_address (exec_bfd));
 
-  inferior_pid = 0;            /* No process now */
+  inferior_ptid = null_ptid;   /* No process now */
 
   /* This is necessary because many things were based on the PC at the
      time that we attached to the monitor, which is no longer valid
@@ -390,8 +390,6 @@ mon2000_open (char *args, int from_tty)
   monitor_open (args, &mon2000_cmds, from_tty);
 }
 
-#ifndef _MSC_VER
-
 /* Function: set_board_address
    Tell the BootOne monitor what it's ethernet IP address is. */
 
@@ -455,7 +453,6 @@ m32r_upload_command (char *args, int from_tty)
   bfd *abfd;
   asection *s;
   time_t start_time, end_time; /* for timing of download */
-  extern int inferior_pid;
   int resp_len, data_count = 0;
   char buf[1024];
   struct hostent *hostent;
@@ -479,7 +476,7 @@ m32r_upload_command (char *args, int from_tty)
        error ("Please use 'set board-address' to set the M32R-EVA board's IP address.");
       if (strchr (myIPaddress, '('))
        *(strchr (myIPaddress, '(')) = '\0';    /* delete trailing junk */
-      board_addr = strsave (myIPaddress);
+      board_addr = xstrdup (myIPaddress);
     }
   if (server_addr == 0)
     {
@@ -507,7 +504,7 @@ m32r_upload_command (char *args, int from_tty)
   if (args[0] != '/' && download_path == 0)
     {
       if (current_directory)
-       download_path = strsave (current_directory);
+       download_path = xstrdup (current_directory);
       else
        error ("Need to know default download path (use 'set download-path')");
     }
@@ -562,7 +559,7 @@ m32r_upload_command (char *args, int from_tty)
       report_transfer_performance (data_count, start_time, end_time);
       printf_filtered ("Start address 0x%lx\n", bfd_get_start_address (abfd));
     }
-  inferior_pid = 0;            /* No process now */
+  inferior_ptid = null_ptid;   /* No process now */
 
   /* This is necessary because many things were based on the PC at the
      time that we attached to the monitor, which is no longer valid
@@ -574,8 +571,6 @@ m32r_upload_command (char *args, int from_tty)
   clear_symtab_users ();
 }
 
-#endif /* ! _MSC_VER */
-
 void
 _initialize_m32r_rom (void)
 {
@@ -603,7 +598,6 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   mon2000_ops.to_open = mon2000_open;
   add_target (&mon2000_ops);
 
-#ifndef _MSC_VER
   add_show_from_set
     (add_set_cmd ("download-path", class_obscure, var_string,
                  (char *) &download_path,
@@ -629,5 +623,4 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
       "Upload the srec file via the monitor's Ethernet upload capability.");
 
   add_com ("tload", class_obscure, m32r_load, "test upload command.");
-#endif
 }