* h8500-tdep.c (initialize_h8500_tdep, large_command):

	All references to value changed to value_ptrlage_command is now
	called big_command.
	All references to value changed to value_ptr.
	* remote-z8k.c (e7000_wait): Use target_waitstatus and SETSTOP
	* remote-hms.c (hms_wait): Timeout after five seconds.
	* ser-go32.c (dosasync_read): Poll if timeout < 0.
	* config/tm/tm-h8500.h (BEFORE_MAIN_LOOP_HOOK): Deleted.
	* config/sh/tm-sh.h (BREAKPOINT): Is now sleep opcode.

4 files changed, 22 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d64b68..7780a4a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+Fri Apr 15 11:35:19 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* h8500-tdep.c (initialize_h8500_tdep, large_command):
+	All references to value changed to value_ptrlage_command is now
+	called big_command.
+	All references to value changed to value_ptr.
+	* remote-e7000.c (e7000_wait): Use target_waitstatus and SETSTOP
+	* remote-hms.c (hms_wait): Timeout after five seconds.
+	* ser-go32.c (dosasync_read): Poll if timeout < 0.
+	* config/tm/tm-h8500.h (BEFORE_MAIN_LOOP_HOOK): Deleted.
+	* config/sh/tm-sh.h (BREAKPOINT): Is now sleep opcode.
+
 Thu Apr 14 07:01:56 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* procfs.c (procfs_wait): Protect watchpoint code with appropriate
diff --git a/gdb/h8500-tdep.c b/gdb/h8500-tdep.c
index da4ee80..3e8006e 100644
--- a/gdb/h8500-tdep.c
+++ b/gdb/h8500-tdep.c
@@ -491,7 +491,7 @@ struct cmd_list_element *setmemorylist;
 
 #define C(name,a,b,c) name () { h8500_set_pointer_size(a); code_size = b; data_size = c; }
 
-C(large_command, 32,4,4);
+C(big_command, 32,4,4);
 C(medium_command, 32, 4,2);
 C(compact_command, 32,2,4);
 C(small_command, 16,2,2);
@@ -526,7 +526,7 @@ h8500_is_trapped_internalvar (name)
     return 0;
 }
 
-value
+value_ptr
 h8500_value_of_trapped_internalvar (var)
      struct internalvar *var;
 {
@@ -577,7 +577,7 @@ void
 h8500_set_trapped_internalvar (var, newval, bitpos, bitsize, offset)
      struct internalvar *var;
      int offset, bitpos, bitsize;
-     value newval;
+     value_ptr newval;
 {
   char *page_regnum, *regnum;
   char expression[100];
@@ -636,8 +636,8 @@ _initialize_h8500_tdep ()
   add_cmd ("small", class_support, small_command,
 	   "Set small memory model. (16 bit code, 16 bit data)", &setmemorylist);
 
-  add_cmd ("large", class_support, large_command,
-	   "Set large memory model. (32 bit code, 32 bit data)", &setmemorylist);
+  add_cmd ("big", class_support, big_command,
+	   "Set big memory model. (32 bit code, 32 bit data)", &setmemorylist);
 
   add_cmd ("medium", class_support, medium_command,
 	   "Set medium memory model. (32 bit code, 16 bit data)", &setmemorylist);
diff --git a/gdb/remote-hms.c b/gdb/remote-hms.c
index d8cb674..840bf38 100644
--- a/gdb/remote-hms.c
+++ b/gdb/remote-hms.c
@@ -726,7 +726,7 @@ hms_wait (pid, status)
       return 0;
     }
 
-  timeout = -1;			/* Don't time out -- user program is running.
+  timeout = 5;			/* Don't time out for a while - user program is running.
 				 */
   immediate_quit = 1;		/* Helps ability to QUIT */
   while (1)
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index 24c55f2..cbfb27f 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -160,12 +160,14 @@ dos_async_rx ()
     }
 
   rv = *aptr (async->getp++);
+
   if (async->getp >= async->buffer_end)
     async->getp = async->buffer_start;
 
   return rv;
 }
 
+
 static int
 dosasync_read (fd, buf, len, timeout)
      int fd;
@@ -186,7 +188,7 @@ dosasync_read (fd, buf, len, timeout)
 	  while (!dos_async_ready ())
 	    {
 	      time (&now);
-	      if (now >= then)
+	      if (now >= then && timeout > 0)
 		return i;
 	    }
 	}
@@ -258,6 +260,7 @@ go32_readchar (scb, timeout)
 {
   char buf;
 
+
   /* Shortcut for polling */
   if (timeout == 0)
     {