X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparclet-stub.c;h=281ce14195f9a7259f8bed17256a81586be7345f;hb=17c579bd622026e9c05a0b8893e10a26470c3569;hp=effc67fdf264c7e994c6f46e02bc9405c8b92336;hpb=53a5351d907ef4eacd463a48a86d35b2b70b9f60;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/sparclet-stub.c b/gdb/sparclet-stub.c
index effc67fdf2..281ce14195 100644
--- a/gdb/sparclet-stub.c
+++ b/gdb/sparclet-stub.c
@@ -50,7 +50,7 @@
  *
  *    g             return the value of the CPU registers  hex data or ENN
  *    G             set the value of the CPU registers     OK or ENN
- *    P             set the value of a single CPU register OK or P01 (???)
+ *    P             set the value of a single CPU register OK or ENN
  *
  *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA      hex data or ENN
  *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA      OK or ENN
@@ -65,9 +65,6 @@
  *
  *    ?             What was the last sigval ?             SNN   (signal NN)
  *
- *    bBB..BB	    Set baud rate to BB..BB		   OK or BNN, then sets
- *							   baud rate
- *
  * All commands and responses are sent with a packet which includes a
  * checksum.  A packet consists of
  *
@@ -450,69 +447,73 @@ hex(ch)
   return -1;
 }
 
+static char remcomInBuffer[BUFMAX];
+static char remcomOutBuffer[BUFMAX];
+
 /* scan for the sequence $<data>#<checksum>     */
 
-static void
-getpacket(buffer)
-     char *buffer;
+unsigned char *
+getpacket ()
 {
+  unsigned char *buffer = &remcomInBuffer[0];
   unsigned char checksum;
   unsigned char xmitcsum;
-  int i;
   int count;
-  unsigned char ch;
+  char ch;
 
-  do
+  while (1)
     {
       /* wait around for the start character, ignore all other characters */
-      while ((ch = (getDebugChar() & 0x7f)) != '$') 
+      while ((ch = getDebugChar ()) != '$')
 	;
 
+retry:
       checksum = 0;
       xmitcsum = -1;
-
       count = 0;
 
       /* now, read until a # or end of buffer is found */
       while (count < BUFMAX)
 	{
-	  ch = getDebugChar() & 0x7f;
+	  ch = getDebugChar ();
+	  if (ch == '$')
+	    goto retry;
 	  if (ch == '#')
 	    break;
 	  checksum = checksum + ch;
 	  buffer[count] = ch;
 	  count = count + 1;
 	}
-
-      if (count >= BUFMAX)
-	continue;
-
       buffer[count] = 0;
 
       if (ch == '#')
 	{
-	  xmitcsum = hex(ch = getDebugChar() & 0x7f) << 4;
-	  xmitcsum |= hex(ch = getDebugChar() & 0x7f);
+	  ch = getDebugChar ();
+	  xmitcsum = hex (ch) << 4;
+	  ch = getDebugChar ();
+	  xmitcsum += hex (ch);
 
 	  if (checksum != xmitcsum)
-	    putDebugChar('-');	/* failed checksum */
+	    {
+	      putDebugChar ('-');	/* failed checksum */
+	    }
 	  else
 	    {
-	      putDebugChar('+'); /* successful transfer */
+	      putDebugChar ('+');	/* successful transfer */
+
 	      /* if a sequence char is present, reply the sequence ID */
 	      if (buffer[2] == ':')
 		{
-		  putDebugChar(buffer[0]);
-		  putDebugChar(buffer[1]);
-		  /* remove sequence chars from buffer */
-		  count = strlen(buffer);
-		  for (i=3; i <= count; i++)
-		    buffer[i-3] = buffer[i];
+		  putDebugChar (buffer[0]);
+		  putDebugChar (buffer[1]);
+
+		  return &buffer[3];
 		}
+
+	      return &buffer[0];
 	    }
 	}
     }
-  while (checksum != xmitcsum);
 }
 
 /* send the packet in buffer.  */
@@ -544,12 +545,9 @@ putpacket(buffer)
       putDebugChar(hexchars[checksum & 0xf]);
 
     }
-  while ((getDebugChar() & 0x7f) != '+');
+  while (getDebugChar() != '+');
 }
 
-static char remcomInBuffer[BUFMAX];
-static char remcomOutBuffer[BUFMAX];
-
 /* Indicate to caller of mem2hex or hex2mem that there has been an
    error.  */
 static volatile int mem_err = 0;
@@ -880,8 +878,8 @@ handle_exception (registers)
     {
       remcomOutBuffer[0] = 0;
 
-      getpacket(remcomInBuffer);
-      switch (remcomInBuffer[0])
+      ptr = getpacket();
+      switch (*ptr++)
 	{
 	case '?':
 	  remcomOutBuffer[0] = 'S';
@@ -928,9 +926,7 @@ handle_exception (registers)
 
 	    psr = registers[PSR];
 
-	    ptr = &remcomInBuffer[1];
-
-	    if (remcomInBuffer[0] == 'P')	/* do a single register */
+	    if (ptr[-1] == 'P')	/* do a single register */
 	      {
 		int regno;
  
@@ -942,7 +938,7 @@ handle_exception (registers)
                     hex2mem (ptr, (char *)&registers[regno], 4, 0);
                 else
                   {
-                    strcpy (remcomOutBuffer, "P01");
+                    strcpy (remcomOutBuffer, "E01");
                     break;
                   }
 	      }
@@ -981,8 +977,6 @@ handle_exception (registers)
 	case 'm':	  /* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
 	  /* Try to read %x,%x.  */
 
-	  ptr = &remcomInBuffer[1];
-
 	  if (hexToInt(&ptr, &addr)
 	      && *ptr++ == ','
 	      && hexToInt(&ptr, &length))
@@ -999,8 +993,6 @@ handle_exception (registers)
 	case 'M': /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
 	  /* Try to read '%x,%x:'.  */
 
-	  ptr = &remcomInBuffer[1];
-
 	  if (hexToInt(&ptr, &addr)
 	      && *ptr++ == ','
 	      && hexToInt(&ptr, &length)
@@ -1018,7 +1010,6 @@ handle_exception (registers)
 	case 'c':    /* cAA..AA    Continue at address AA..AA(optional) */
 	  /* try to read optional parameter, pc unchanged if no parm */
 
-	  ptr = &remcomInBuffer[1];
 	  if (hexToInt(&ptr, &addr))
 	    {
 	      registers[PC] = addr;
@@ -1045,44 +1036,6 @@ handle_exception (registers)
 	  asm ("call 0
 		nop ");
 	  break;
-
-#if 0
-Disabled until we can unscrew this properly
-
-	case 'b':	  /* bBB...  Set baud rate to BB... */
-	  {
-	    int baudrate;
-	    extern void set_timer_3();
-
-	    ptr = &remcomInBuffer[1];
-	    if (!hexToInt(&ptr, &baudrate))
-	      {
-		strcpy(remcomOutBuffer,"B01");
-		break;
-	      }
-
-	    /* Convert baud rate to uart clock divider */
-	    switch (baudrate)
-	      {
-	      case 38400:
-		baudrate = 16;
-		break;
-	      case 19200:
-		baudrate = 33;
-		break;
-	      case 9600:
-		baudrate = 65;
-		break;
-	      default:
-		strcpy(remcomOutBuffer,"B02");
-		goto x1;
-	      }
-
-	    putpacket("OK");	/* Ack before changing speed */
-	    set_timer_3(baudrate); /* Set it */
-	  }
-x1:	  break;
-#endif
 	}			/* switch */
 
       /* reply to the request */