Thu Aug 7 13:39:31 1997 Geoffrey Noer <noer@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / sparcl-tdep.c

diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index af8bc39bcdab42e06a1d4df513028f8aa498b51f..0bcc3a4f01d80e5f43d2472fe2e50dc3544af82e 100644 (file)
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -1,5 +1,5 @@
 /* Target dependent code for the Fujitsu SPARClite for GDB, the GNU debugger.
-   Copyright 1994, 1995  Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996  Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -23,16 +23,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "target.h"
 #include "serial.h"
 #include <sys/types.h>
-#include <sys/time.h>
 
-#if defined(__GO32__) || defined(WIN32)
-#undef HAVE_SOCKETS
-#else
+#if !defined(__GO32__) && !defined(_WIN32)
 #define HAVE_SOCKETS
-#endif
-
-
-#ifdef HAVE_SOCKETS     
+#include <sys/time.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -239,17 +233,21 @@ sparclite_check_watch_resources (type, cnt, ot)
      int ot;
 {
   if (type == bp_hardware_breakpoint)
-    if (TARGET_HW_BREAK_LIMIT == 0)
-      return 0;
-    else if (cnt <= TARGET_HW_BREAK_LIMIT)
-      return 1;
+    {
+      if (TARGET_HW_BREAK_LIMIT == 0)
+       return 0;
+      else if (cnt <= TARGET_HW_BREAK_LIMIT)
+       return 1;
+    }
   else
-    if (TARGET_HW_WATCH_LIMIT == 0)
-      return 0;
-    else if (ot)
-      return -1;
-    else if (cnt <= TARGET_HW_WATCH_LIMIT)
-      return 1;
+    {
+      if (TARGET_HW_WATCH_LIMIT == 0)
+       return 0;
+      else if (ot)
+       return -1;
+      else if (cnt <= TARGET_HW_WATCH_LIMIT)
+       return 1;
+    }
   return -1;
 }
 
@@ -296,30 +294,39 @@ open_tty (name)
   return desc;
 }
 
+/* Read a single character from the remote end, masking it down to 7 bits. */
+
 static int
-send_resp (desc, c)
+readchar (desc, timeout)
      serial_t desc;
-     char c;
+     int timeout;
 {
-  int i;
-
-  SERIAL_WRITE (desc, &c, 1);
-  i = SERIAL_READCHAR (desc, 2);
+  int ch;
 
-  if (i >= 0)
-    return i;
+  ch = SERIAL_READCHAR (desc, timeout);
 
-  switch (i)
+  switch (ch)
     {
+    case SERIAL_EOF:
+      error ("SPARClite remote connection closed");
     case SERIAL_ERROR:
-      perror_with_name ("Remote communication error");
+      perror_with_name ("SPARClite communication error");
     case SERIAL_TIMEOUT:
-      error ("Remote timeout");
-    case SERIAL_EOF:
-      error ("Remote connection closed");
+      error ("SPARClite remote timeout");
+    default:
+      return ch;
     }
 }
 
+static int
+send_resp (desc, c)
+     serial_t desc;
+     char c;
+{
+  SERIAL_WRITE (desc, &c, 1);
+  return readchar (desc, 2);
+}
+
 static void
 close_tty (ignore)
      int ignore;
@@ -525,8 +532,9 @@ download (target_name, args, from_tty, write_routine, start_routine)
      char *target_name;
      char *args;
      int from_tty;
-     void (*write_routine)();
-     void (*start_routine)();
+     void (*write_routine) PARAMS ((bfd *from_bfd, asection *from_sec,
+                                   file_ptr from_addr, bfd_vma to_addr, int len));
+     void (*start_routine) PARAMS ((bfd_vma entry));
 {
   struct cleanup *old_chain;
   asection *section;
@@ -652,7 +660,7 @@ sparclite_serial_start (entry)
   store_unsigned_integer (buffer + 1, 4, entry);
 
   SERIAL_WRITE (remote_desc, buffer, 1 + 4);
-  i = SERIAL_READCHAR (remote_desc, 2);
+  i = readchar (remote_desc, 2);
   if (i != 0x55)
     error ("Can't start SparcLite.  Error code %d\n", i);
 }
@@ -684,9 +692,7 @@ sparclite_serial_write (from_bfd, from_sec, from_addr, to_addr, len)
     error ("Bad response from load command (0x%x)", i);
 
   SERIAL_WRITE (remote_desc, buffer, 4 + 4 + len);
-  i = SERIAL_READCHAR (remote_desc, 2);
-  if (i < 0)
-    error ("I/O error in serial code.  Return code %d\n", i);
+  i = readchar (remote_desc, 2);
 
   if (i != checksum)
     error ("Bad checksum from load command (0x%x)", i);
@@ -858,6 +864,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",  /* to_doc */
   0,                           /* to_mourn_inferior */
   0,                           /* to_can_run */
   0,                           /* to_notice_signals */
+  0,                           /* to_thread_alive */
   0,                           /* to_stop */
   download_stratum,            /* to_stratum */
   0,                           /* to_next */