Replace jumbo pattern match with gdb_expect_list().

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

diff --git a/gdb/sparc-stub.c b/gdb/sparc-stub.c
index 7da65c21080f63ae9dcda45b31f7fbc7edee42b2..ce2aadd67b765ac3f5f6a11c5410a0c697e66aea 100644 (file)
--- a/gdb/sparc-stub.c
+++ b/gdb/sparc-stub.c
@@ -62,9 +62,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
  *
@@ -284,72 +281,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(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,12 +379,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;
@@ -485,11 +480,6 @@ set_debug_traps()
   for (ht = hard_trap_info; ht->tt && ht->signo; ht++)
     exceptionHandler(ht->tt, trap_low);
 
-  /* In case GDB is started before us, ack any packets (presumably
-     "$?#xx") sitting there.  */
-
-  putDebugChar ('+');
-
   initialized = 1;
 }
 
@@ -660,8 +650,8 @@ handle_exception (registers)
     {
       remcomOutBuffer[0] = 0;
 
-      getpacket(remcomInBuffer);
-      switch (remcomInBuffer[0])
+      ptr = getpacket();
+      switch (*ptr++)
        {
        case '?':
          remcomOutBuffer[0] = 'S';
@@ -670,8 +660,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 */
@@ -693,7 +682,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],
@@ -719,8 +707,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))
@@ -737,8 +723,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)
@@ -756,7 +740,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;
@@ -783,44 +766,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 */