From 1b68cb4fb3cb7dd3585e174f53ec9d544268a3ab Mon Sep 17 00:00:00 2001
From: Steve Chamberlain <sac@cygnus>
Date: Mon, 15 Nov 1993 23:49:21 +0000
Subject: [PATCH] How many times do I have to do this...

---
 gdb/.Sanitize    |  1 +
 gdb/ChangeLog    | 11 +++++++++
 gdb/remote-sim.c | 58 +-----------------------------------------------
 gdb/sh-tdep.c    | 13 +----------
 gdb/z8k-tdep.c   |  1 +
 5 files changed, 15 insertions(+), 69 deletions(-)

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 9d486bb6011..69157ac058a 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -200,6 +200,7 @@ regex.h
 rem-multi.shar
 remote-adapt.c
 remote-bug.c
+remite-e7000.c
 remote-eb.c
 remote-es.c
 remote-hms.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01d265e5a01..4a46ce8d7e4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+Mon Nov 15 14:32:29 1993  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+    	* remote-e7000.c: New file to cope with the Hitachi E7000 ICE.
+	* remote-utils.c, remote-utils.h (gr_load_image): New function to
+	download to target.
+	* h8300-tdep.c, h8500-tdep.c, remote-z8k.c, sh-tdep.c z8k-tdep.c
+	(sim_load): delete.
+	* remote-sim.c (gr_sim_load): Use gd_load_image, rather than
+	sim_load.
+	* config/sh/sh.mt: Add remote-e7000
+
 Mon Nov 15 11:38:25 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* config/i386/linux.mh: Remove XM_CLIBS, TERMLIB, SYSV_DEFINE, and
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 7dc384b4b8a..a8fc6fa9fb8 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -138,70 +138,14 @@ gdbsim_load (prog, fromtty)
      char *prog;
      int fromtty;
 {
-  bfd	*abfd;
-
   if (sr_get_debug ())
     printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
 
   inferior_pid = 0;  
-  program_loaded = 0;
-  abfd = bfd_openr (prog, gnutarget);
-
-  if (!abfd) 
-    error ("Unable to open file %s.", prog);
-
-  if (bfd_check_format (abfd, bfd_object) == 0)
-    error ("File is not an object file.");
-
-  if (sim_load (abfd, prog) != 0)
-    return;
-
   program_loaded = 1;
-
-  sim_set_pc (abfd->start_address);
+  gr_load_image (prog, fromtty);
 }
 
-/*
- * This is a utility routine that sim_load() can call to do the work.
- * The result is 0 for success, non-zero for failure.
- *
- * Eg: int sim_load (bfd *abfd, char *prog) { return sim_load_standard (abfd); }
- */
-
-sim_load_standard (abfd)
-     bfd *abfd;
-{
-  asection *s;
-
-  s = abfd->sections;
-  while (s != (asection *)NULL) 
-  {
-    if (s->flags & SEC_LOAD) 
-    {
-      int i;
-      int delta = 4096;
-      char *buffer = xmalloc (delta);
-      printf_filtered ("%s\t: 0x%4x .. 0x%4x  ",
-		      s->name, s->vma, s->vma + s->_raw_size);
-      for (i = 0; i < s->_raw_size; i+= delta) 
-      {
-	int sub_delta = delta;
-	if (sub_delta > s->_raw_size - i)
-	  sub_delta = s->_raw_size - i ;
-
-	bfd_get_section_contents (abfd, s, buffer, i, sub_delta);
-	sim_write (s->vma + i, buffer, sub_delta);
-	printf_filtered ("*");
-	gdb_flush (gdb_stdout);
-      }
-      printf_filtered ("\n");
-      free (buffer);
-    }
-    s = s->next;
-  }
-
-  return 0;
-}
 
 /* Start an inferior process and set inferior_pid to its pid.
    EXEC_FILE is the file to run.
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 42e79cbace2..81cd7527394 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -242,18 +242,7 @@ pop_frame ()
 				       read_pc ()));
 }
 
-/* This doesn't quite fit either in the simulator or in gdb proper.
-   Perhaps the simulator could return 1 to mean it loaded it and 0 to
-   mean "you deal with it, caller".  */
-
-int 
-sim_load (abfd, prog)
-bfd *abfd;
-char *prog;
-{
-  return sim_load_standard (abfd); 
-}
-
+
 void
 _initialize_sh_tdep ()
 {
diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c
index 465b74dcdf5..dba58cf33f3 100644
--- a/gdb/z8k-tdep.c
+++ b/gdb/z8k-tdep.c
@@ -430,6 +430,7 @@ unsegmented_command (args, from_tty)
 
 }
 
+
 static void
 set_memory (args, from_tty)
      char *args;
-- 
2.30.2