use remote-utils facilities for baud_rate

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

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 92be34a51adea7771631f21df07600bfa2b35806..310b75d3172b8776bf6e7906e471356a24ecde3c 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -45,7 +45,7 @@ sim_write_inferior_memory (memaddr, myaddr, len)
   return  sim_write(memaddr, myaddr, len);
 }
 
-static int
+static void
 store_register(regno)
 int regno;
 {
@@ -58,7 +58,6 @@ int regno;
   {
     sim_store_register(regno, read_register(regno));
   }
-  return 0;
 }
 
 
@@ -74,7 +73,7 @@ int   fromtty;
   asection *s;
 
   inferior_pid = 0;  
-  abfd = bfd_openr(args, (char*)0);
+  abfd = bfd_openr (args, (char*)gnutarget);
 
   if (!abfd) 
   {
@@ -142,7 +141,7 @@ sim_create_inferior (execfile, args, env)
 
 
 
-static int
+static void
 sim_open (name, from_tty)
      char *name;
      int from_tty;
@@ -151,7 +150,6 @@ sim_open (name, from_tty)
   {
     name = "";
   }
-
   push_target (&sim_ops);
   target_fetch_registers(-1);
   printf_filtered("Connected to the simulator.\n");
@@ -159,7 +157,7 @@ sim_open (name, from_tty)
 
 /* Close out all files and local state before this target loses control. */
 
-static int
+static void
 sim_close (quitting)
      int quitting;
 {
@@ -168,7 +166,7 @@ sim_close (quitting)
 /* Terminate the open connection to the remote debugger.
    Use this when you want to detach and do something else
    with your gdb.  */
-int
+void
 sim_detach (args,from_tty)
      char *args;
      int from_tty;
@@ -176,7 +174,7 @@ sim_detach (args,from_tty)
   pop_target();                        /* calls sim_close to do the real work */
   if (from_tty)
    printf_filtered ("Ending remote %s debugging\n", target_shortname);
-  return 0;
+
 }
  
 /* Tell the remote machine to resume.  */
@@ -193,23 +191,22 @@ sim_wait (status)
   return 0;
 }
 
-
-
 static void
 fetch_register(regno)
-int regno;
+     int regno;
 {
   if (regno  == -1) 
-  {
-    for (regno = 0; regno < NUM_REGS; regno++)
-     fetch_register(regno);
-  }
+    {
+      for (regno = 0; regno < NUM_REGS; regno++)
+       fetch_register(regno);
+    }
   else 
-  {
-    char buf[MAX_REGISTER_RAW_SIZE];
-    sim_fetch_register(regno, buf);
-    supply_register(regno, buf);
-  }
+    {
+      char buf[MAX_REGISTER_RAW_SIZE];
+
+      sim_fetch_register(regno, buf);
+      supply_register(regno, buf);
+    }
 }
 
 
@@ -245,15 +242,14 @@ sim_before_main_loop ()
 }
 
 
-static int rem_resume(a,b)
+static void rem_resume(pid, a , b)
 {
   sim_resume(a,b);
-  return 0;
 }
 
+void
 pstore()
 {
-  return 1;
 }
 /* Define the target subroutine names */