import gdb-1999-08-30 snapshot

[thirdparty/binutils-gdb.git] / gdb / sparc-stub.c

diff --git a/gdb/sparc-stub.c b/gdb/sparc-stub.c
index 5769b25d4c8aa5d95c246c39f019113c5cf4c9fc..8e88e56bb9e93a4c55e1e84bb13c4188baad7ca8 100644 (file)
--- a/gdb/sparc-stub.c
+++ b/gdb/sparc-stub.c
@@ -286,70 +286,68 @@ hex(ch)
 
 /* scan for the sequence $<data>#<checksum>     */
 
-static void
-getpacket(buffer)
-     char *buffer;
+unsigned char *
+getpacket (buffer)
+     unsigned char *buffer;
 {
   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(getDebugChar() & 0x7f) << 4;
-         xmitcsum |= hex(getDebugChar() & 0x7f);
-#if 0
-         /* Humans shouldn't have to figure out checksums to type to it. */
-         putDebugChar ('+');
-         return;
-#endif
+         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.  */
@@ -381,7 +379,7 @@ putpacket(buffer)
       putDebugChar(hexchars[checksum & 0xf]);
 
     }
-  while ((getDebugChar() & 0x7f) != '+');
+  while (getDebugChar() != '+');
 }
 
 static char remcomInBuffer[BUFMAX];
@@ -655,8 +653,8 @@ handle_exception (registers)
     {
       remcomOutBuffer[0] = 0;
 
-      getpacket(remcomInBuffer);
-      switch (remcomInBuffer[0])
+      ptr = getpacket(remcomInBuffer);
+      switch (*ptr++)
        {
        case '?':
          remcomOutBuffer[0] = 'S';
@@ -665,8 +663,7 @@ handle_exception (registers)
          remcomOutBuffer[3] = 0;
          break;
 
-       case 'd':
-                               /* toggle debug flag */
+       case 'd':               /* toggle debug flag */
          break;
 
        case 'g':               /* return the value of the CPU registers */
@@ -688,7 +685,6 @@ handle_exception (registers)
 
            psr = registers[PSR];
 
-           ptr = &remcomInBuffer[1];
            hex2mem(ptr, (char *)registers, 16 * 4, 0); /* G & O regs */
            hex2mem(ptr + 16 * 4 * 2, sp + 0, 16 * 4, 0); /* L & I regs */
            hex2mem(ptr + 64 * 4 * 2, (char *)&registers[Y],
@@ -714,8 +710,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))
@@ -732,8 +726,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)
@@ -751,7 +743,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;
@@ -787,7 +778,6 @@ Disabled until we can unscrew this properly
            int baudrate;
            extern void set_timer_3();
 
-           ptr = &remcomInBuffer[1];
            if (!hexToInt(&ptr, &baudrate))
              {
                strcpy(remcomOutBuffer,"B01");