Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.c	(working copy)
@@ -141,24 +141,69 @@
   return 0;
 }
 
+static int avr_is_page_empty(unsigned int address, int page_size,
+                                const unsigned char *buf)
+{
+    int i;
+    for(i = 0; i < page_size; i++) {
+        if(buf[address + i] != 0xFF) {
+            /* Page is not empty. */
+            return(0);
+        }
+    }
 
+    /* Page is empty. */
+    return(1);
+}
+
+unsigned int avr_skip_empty_pages(unsigned int FromAddress, int page_size, unsigned int MemSize,
+                                const unsigned char *buf)
+{
+    while (FromAddress < MemSize) {
+    	if (avr_is_page_empty(FromAddress,page_size, buf) == 0) {break;}
+    	FromAddress = FromAddress + page_size;
+    }
+    return(FromAddress);
+}
+
+unsigned int avr_scan_nonempty_pages(unsigned int FromAddress, int page_size, unsigned int MemSize,
+                                const unsigned char *buf)
+{
+    while (FromAddress < MemSize) {
+    	if (avr_is_page_empty(FromAddress,page_size, buf) != 0) {break;}
+    	FromAddress = FromAddress + page_size;
+    }
+    return(FromAddress);
+}
+
 /*
  * Read the entirety of the specified memory type into the
  * corresponding buffer of the avrpart pointed to by 'p'.  If size =
  * 0, read the entire contents, otherwise, read 'size' bytes.
+ * if p <> NULL then use this as pattern to read only nonempty pages from deice
  *
  * Return the number of bytes read, or < 0 if an error occurs.  
  */
 int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size, 
-             int verbose)
+             int verbose,
+             AVRPART * v
+             )
 {
   unsigned char    rbyte;
   unsigned long    i;
   unsigned char  * buf;
+  unsigned int	ReadAdress;
+  unsigned int	NextAdress;
   AVRMEM * mem;
+  AVRMEM * vmem;
   int rc;
 
   mem = avr_locate_mem(p, memtype);
+  if (v != NULL) {
+  	vmem = avr_locate_mem(v, memtype);
+  }
+  else {vmem = NULL;}
+  
   if (mem == NULL) {
     fprintf(stderr, "No \"%s\" memory for part %s\n",
             memtype, p->desc);
@@ -175,54 +220,77 @@
    */
   memset(buf, 0xff, size);
 
-  if ((strcmp(mem->desc, "flash")==0) || (strcmp(mem->desc, "eeprom")==0)) {
-    if (pgm->paged_load != NULL) {
-      /*
-       * the programmer supports a paged mode read, perhaps more
-       * efficiently than we can read it directly, so use its routine
-       * instead
-       */
-      if (mem->paged) {
-        rc = pgm->paged_load(pgm, p, mem, mem->page_size, size);
-        if (rc < 0)
-          return rc;
-      }
-      else {
-        rc = pgm->paged_load(pgm, p, mem, pgm->page_size, size);
-        if (rc < 0)
-          return rc;
-      }
-      if (strcasecmp(mem->desc, "flash") == 0)
-        return avr_mem_hiaddr(mem);
-      else
-        return rc;
-    }
-  }
+  ReadAdress = 0;
+  fprintf(stderr, "\nload memory segment %X-%X \n", ReadAdress, ReadAdress + size);
+  rc = 0;
+  while (ReadAdress < size) {
+  
+  	if ( (vmem != NULL) &&
+	     ( (strcmp(mem->desc, "flash")==0) || (strcmp(mem->desc, "eeprom")==0) )
+	   )
+  	{
+  		/*skip empty pages*/
+	  	ReadAdress = avr_skip_empty_pages(ReadAdress, mem->page_size, size, vmem->buf);
+	  	if (ReadAdress >= size) break;
+	  	NextAdress = avr_scan_nonempty_pages(ReadAdress, mem->page_size, size, vmem->buf);
+		fprintf(stderr, "detected segment: %X-%X\n", ReadAdress, NextAdress);
+  	}
+  	else {
+  		ReadAdress = 0;
+  		NextAdress = size;
+  	}
 
-  if (strcmp(mem->desc, "signature") == 0) {
-    if (pgm->read_sig_bytes) {
-      return pgm->read_sig_bytes(pgm, p, mem);
-    }
+	  if 	(( (strcmp(mem->desc, "flash")==0) || (strcmp(mem->desc, "eeprom")==0)
+	  		 ) && (pgm->paged_load != NULL)
+	  		)
+	  {
+	      /*
+	       * the programmer supports a paged mode read, perhaps more
+	       * efficiently than we can read it directly, so use its routine
+	       * instead
+	       */
+	      if (mem->paged) {
+	        rc = pgm->paged_load(pgm, p, mem, mem->page_size, NextAdress - ReadAdress, ReadAdress);
+	        if (rc < 0)
+	          return rc;
+	      }
+	      else {
+	        rc = pgm->paged_load(pgm, p, mem, pgm->page_size, NextAdress - ReadAdress, ReadAdress);
+	        if (rc < 0)
+	          return rc;
+	      }
+		  report_progress(rc, size, NULL);
+	  }
+	  else {
+	
+		  if (strcmp(mem->desc, "signature") == 0) {
+		    if (pgm->read_sig_bytes) {
+		      return pgm->read_sig_bytes(pgm, p, mem);
+		    }
+		  }
+		
+		  for (i=0; i<size; i++) {
+		    rc = avr_read_byte(pgm, p, mem, i, &rbyte);
+		    if (rc != 0) {
+		      fprintf(stderr, "avr_read(): error reading address 0x%04lx\n", i);
+		      if (rc == -1) 
+		        fprintf(stderr, 
+		                "    read operation not supported for memory \"%s\"\n",
+		                memtype);
+		      return -2;
+		    }
+		    buf[i] = rbyte;
+		    report_progress(i, size, NULL);
+		  }/*for*/
+		  rc = i;
+	  }/*if ((strcmp(mem->desc, "flash")*/
+	  fprintf(stderr, "\nsegment %X-%X loaded with result %X\n", ReadAdress, NextAdress, rc);
+	  ReadAdress = NextAdress;
   }
-
-  for (i=0; i<size; i++) {
-    rc = avr_read_byte(pgm, p, mem, i, &rbyte);
-    if (rc != 0) {
-      fprintf(stderr, "avr_read(): error reading address 0x%04lx\n", i);
-      if (rc == -1) 
-        fprintf(stderr, 
-                "    read operation not supported for memory \"%s\"\n",
-                memtype);
-      return -2;
-    }
-    buf[i] = rbyte;
-    report_progress(i, size, NULL);
-  }
-
   if (strcasecmp(mem->desc, "flash") == 0)
     return avr_mem_hiaddr(mem);
   else
-    return i;
+    return rc;
 }
 
 
@@ -516,6 +584,19 @@
   return avr_write_byte_default(pgm, p, mem, addr, data);
 }
 
+unsigned int LastByteAddr(AVRMEM  * m,unsigned int StartAdress, unsigned int LastAdress)
+{
+	unsigned int idx;
+	
+	if (LastAdress > m->size) 
+		{LastAdress = m->size;}
+	for(idx = LastAdress; idx >= StartAdress; --idx){
+		if (m->buf[idx] != 0xff) break;
+	}
+	if (m->buf[idx] != 0xff) 
+		{return idx;}
+	else {return m->size;}
+}
 
 /*
  * Write the whole memory region of the specified memory from the
@@ -527,13 +608,17 @@
  * Return the number of bytes written, or -1 if an error occurs.
  */
 int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size, 
-              int verbose)
+              int verbose,
+              int fast)
 {
   int              rc;
   int              wsize;
   unsigned long    i;
   unsigned char    data;
   int              werror;
+  unsigned int WriteAdres;
+  unsigned int NextAdres;
+  unsigned int LastAdres;
   AVRMEM         * m;
 
   m = avr_locate_mem(p, memtype);
@@ -559,65 +644,103 @@
             progname, size, wsize,
             progbuf, wsize);
   }
-
-  if ((strcmp(m->desc, "flash")==0) || (strcmp(m->desc, "eeprom")==0)) {
-    if (pgm->paged_write != NULL) {
-      /*
-       * the programmer supports a paged mode write, perhaps more
-       * efficiently than we can read it directly, so use its routine
-       * instead
-       */
-      return pgm->paged_write(pgm, p, m, m->page_size, size);
-    }
-  }
-
+	
   if (pgm->write_setup) {
       pgm->write_setup(pgm, p, m);
   }
 
-  for (i=0; i<wsize; i++) {
-    data = m->buf[i];
-    report_progress(i, wsize, NULL);
-
-    rc = avr_write_byte(pgm, p, m, i, data);
-    if (rc) {
-      fprintf(stderr, " ***failed;  ");
-      fprintf(stderr, "\n");
-      pgm->err_led(pgm, ON);
-      werror = 1;
-    }
-
-    if (m->paged) {
-      /*
-       * check to see if it is time to flush the page with a page
-       * write
-       */
-      if (((i % m->page_size) == m->page_size-1) ||
-          (i == wsize-1)) {
-        rc = avr_write_page(pgm, p, m, i);
-        if (rc) {
-          fprintf(stderr,
-                  " *** page %ld (addresses 0x%04lx - 0x%04lx) failed "
-                  "to write\n",
-                  i % m->page_size, 
-                  i - m->page_size + 1, i);
-          fprintf(stderr, "\n");
-          pgm->err_led(pgm, ON);
-          werror = 1;
-        }
-      }
-    }
-
-    if (werror) {
-      /* 
-       * make sure the error led stay on if there was a previous write
-       * error, otherwise it gets cleared in avr_write_byte()
-       */
-      pgm->err_led(pgm, ON);
-    }
+  WriteAdres = 0;
+  NextAdres = 0;
+  rc = 0;
+  while (WriteAdres < size) {
+  
+  	if ((fast != 0) && (p->erased != 0) &&
+	    ( (strcmp(m->desc, "flash")==0) || (strcmp(m->desc, "eeprom")==0)
+	    )
+	   )
+  	{
+  		/*skip empty pages*/
+	  	WriteAdres = avr_skip_empty_pages(NextAdres, m->page_size, size, m->buf);
+	  	if (WriteAdres >= size) break;
+	  	NextAdres = avr_scan_nonempty_pages(WriteAdres, m->page_size, size, m->buf);
+		fprintf(stderr, "detected segment: %X-%X\n", WriteAdres, NextAdres);
+  	}
+  	else {
+  		WriteAdres = 0;
+  		NextAdres = size;
+  	}
+  	
+  	LastAdres =  LastByteAddr(m,WriteAdres,NextAdres);
+  	
+	if  ( ( (strcmp(m->desc, "flash")==0) || (strcmp(m->desc, "eeprom")==0)
+		  ) && (pgm->paged_write != NULL)
+		) 
+	{
+	      /*
+	       * the programmer supports a paged mode write, perhaps more
+	       * efficiently than we can read it directly, so use its routine
+	       * instead
+	       */
+	      rc = pgm->paged_write(pgm, p, m, m->page_size, NextAdres - WriteAdres, WriteAdres);
+	      if (rc < 0) {werror = 1;}
+		  report_progress(rc, wsize, NULL);
+	}
+	else {
+	
+		  for (i=WriteAdres; i<NextAdres; i++) {
+		  	
+		    data = m->buf[i];
+		    report_progress(i, wsize, NULL);
+		
+		    rc = avr_write_byte(pgm, p, m, i, data);
+		    if (rc) {
+		      fprintf(stderr, " ***failed;  ");
+		      fprintf(stderr, "\n");
+		      pgm->err_led(pgm, ON);
+		      werror = 1;
+		    }
+		
+		    if (m->paged) {
+		      /*
+		       * check to see if it is time to flush the page with a page
+		       * write
+		       */
+		      if (((i % m->page_size) == m->page_size-1) ||
+		          (i == wsize-1)) {
+		        rc = avr_write_page(pgm, p, m, i);
+		        if (rc) {
+		          fprintf(stderr,
+		                  " *** page %ld (addresses 0x%04lx - 0x%04lx) failed "
+		                  "to write\n",
+		                  i % m->page_size, 
+		                  i - m->page_size + 1, i);
+		          fprintf(stderr, "\n");
+		          pgm->err_led(pgm, ON);
+		          werror = 1;
+		        }
+		      }
+		    }
+			
+			rc = i;
+		    
+		    if (werror) {
+		      /* 
+		       * make sure the error led stay on if there was a previous write
+		       * error, otherwise it gets cleared in avr_write_byte()
+		       */
+		      pgm->err_led(pgm, ON);
+		      break;
+		    }
+		  }
+	}
+    fprintf(stderr, "\nsegment %X-%X written with result %X\n", WriteAdres, NextAdres, rc);
+	if (werror) break;
+	WriteAdres = NextAdres;
   }
-
-  return i;
+  
+  avr_read_byte(pgm, p, m, LastAdres, &data); /*enshure\flush write last page write*/
+  
+  return rc;
 }
 
 
@@ -630,7 +753,7 @@
   int rc;
 
   report_progress (0,1,"Reading");
-  rc = avr_read(pgm, p, "signature", 0, 0);
+  rc = avr_read(pgm, p, "signature", 0, 0, 0);
   if (rc < 0) {
     fprintf(stderr,
             "%s: error reading signature data for part \"%s\", rc=%d\n",
@@ -795,6 +918,7 @@
             progname, cycles);
     avr_put_cycle_count(pgm, p, cycles);
   }
+  p->erased = 1;
 
   return rc;
 }
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.h
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.h	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr.h	(working copy)
@@ -36,7 +36,8 @@
                   unsigned long addr, unsigned char * value);
 
 int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
-             int verbose);
+             int verbose,
+             AVRPART * v);
 
 int avr_write_page(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
                    unsigned long addr);
@@ -45,7 +46,8 @@
                    unsigned long addr, unsigned char data);
 
 int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
-              int verbose);
+              int verbose,
+              int fast);
 
 int avr_signature(PROGRAMMER * pgm, AVRPART * p);
 
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr910.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr910.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avr910.c	(working copy)
@@ -301,33 +301,44 @@
   avr910_vfy_cmd_sent(pgm, "set addr");
 }
 
-
 static int avr910_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
                              unsigned long addr, unsigned char value)
 {
   char cmd[2];
-
+  int  wordbytes;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  
   if (strcmp(m->desc, "flash") == 0) {
-    if (addr & 0x01) {
-      cmd[0] = 'C';             /* Write Program Mem high byte */
-    }
-    else {
-      cmd[0] = 'c';
-    }
-
-    addr >>= 1;
+  	wordbytes = take_adress(m,addr,2,&part_addr,&word_addr);
+	if (wordbytes <= 0) 
+	  	{return wordbytes;}
+  	if (wordbytes == 2) {
+		    if (addr & 0x01) {
+		      cmd[0] = 'C';             /* Write Program Mem high byte */
+		    }
+		    else {
+		      cmd[0] = 'c';
+		    }
+  	}
+  	else{
+		    cmd[0] = 'c';
+  	}
   }
   else if (strcmp(m->desc, "eeprom") == 0) {
+  	wordbytes = take_adress(m,addr,1,&part_addr,&word_addr);
     cmd[0] = 'D';
   }
   else {
     return -1;
   }
-
+  
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+  
   cmd[1] = value;
 
-  avr910_set_addr(pgm, addr);
-
+  avr910_set_addr(pgm, part_addr);
   avr910_send(pgm, cmd, sizeof(cmd));
   avr910_vfy_cmd_sent(pgm, "write byte");
 
@@ -339,32 +350,31 @@
                                   unsigned long addr, unsigned char * value)
 {
   static int cached = 0;
-  static unsigned char cvalue;
+  static unsigned char cvalue[4];
   static unsigned long caddr;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  int wordbytes;
+  
 
-  if (cached && ((caddr + 1) == addr)) {
-    *value = cvalue;
-    cached = 0;
+  wordbytes = take_adress(m,addr,2,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+  
+  if (cached && ((caddr) == part_addr)) {
+    *value = cvalue[addr - word_addr];
   }
   else {
-    char buf[2];
+    avr910_set_addr(pgm, part_addr);
 
-    avr910_set_addr(pgm, addr >> 1);
-
     avr910_send(pgm, "R", 1);
 
+    avr910_recv(pgm, cvalue, wordbytes);
+    caddr = part_addr;
+    cached = 1;
     /* Read back the program mem word (MSB first) */
-    avr910_recv(pgm, buf, sizeof(buf));
-
-    if ((addr & 0x01) == 0) {
-      *value = buf[1];
-      // cached = 1;
-      cvalue = buf[0];
-      caddr = addr;
-    }
-    else {
-      *value = buf[0];
-    }
+    swap_endian(cvalue, wordbytes);
+    *value = cvalue[addr - word_addr];
   }
 
   return 0;
@@ -398,18 +408,28 @@
 
 
 static int avr910_paged_write_flash(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                                    int page_size, int n_bytes)
+                                    int page_size, int n_bytes, unsigned long addr)
 {
   unsigned char cmd[] = {'c', 'C'};
   char buf[2];
-  unsigned int addr = 0;
-  unsigned int max_addr = n_bytes;
+  unsigned int max_addr;
+  unsigned int low_addr;
   unsigned int page_addr;
+  unsigned long part_addr;
+  unsigned long word_addr;
   int page_bytes = page_size;
   int page_wr_cmd_pending = 0;
+  int wordbytes;
 
   page_addr = addr;
-  avr910_set_addr(pgm, addr>>1);
+  low_addr = addr;
+  max_addr = addr + n_bytes;
+  
+  wordbytes = take_adress(m,addr,2,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+  
+  avr910_set_addr(pgm, part_addr);
 
   while (addr < max_addr) {
     page_wr_cmd_pending = 1;
@@ -424,31 +444,44 @@
     if (m->paged && (page_bytes == 0)) {
       /* Send the "Issue Page Write" if we have sent a whole page. */
 
-      avr910_set_addr(pgm, page_addr>>1);
+	  if (wordbytes == 2) {	part_addr = page_addr >> 1;}
+	  else {part_addr = page_addr;}
+	  
+      avr910_set_addr(pgm, part_addr);
       avr910_send(pgm, "m", 1);
       avr910_vfy_cmd_sent(pgm, "flush page");
 
       page_wr_cmd_pending = 0;
       usleep(m->max_write_delay);
-      avr910_set_addr(pgm, addr>>1);
-
+	  
       /* Set page address for next page. */
 
       page_addr = addr;
       page_bytes = page_size;
+
+	  if (wordbytes == 2) {	part_addr = page_addr >> 1; }
+	  else {part_addr = page_addr; }
+      avr910_set_addr(pgm, part_addr);
+
     }
     else if ((has_auto_incr_addr != 'Y') && ((addr & 0x01) == 0)) {
-      avr910_set_addr(pgm, addr>>1);
+	  if (wordbytes == 2) 
+	  	{	part_addr = page_addr >> 1;}
+	  else {part_addr = page_addr; }
+      avr910_set_addr(pgm, part_addr);
     }
 
-    report_progress (addr, max_addr, NULL);
-  }
+    report_progress (addr - low_addr, n_bytes, NULL);
+  }/*while*/
 
   /* If we didn't send the page wr cmd after the last byte written in the
      loop, send it now. */
 
   if (page_wr_cmd_pending) {
-    avr910_set_addr(pgm, page_addr>>1);
+	if (wordbytes == 2) {
+	  	page_addr >>= 1;
+	}
+    avr910_set_addr(pgm, page_addr);
     avr910_send(pgm, "m", 1);
     avr910_vfy_cmd_sent(pgm, "flush final page");
     usleep(m->max_write_delay);
@@ -459,13 +492,15 @@
 
 
 static int avr910_paged_write_eeprom(PROGRAMMER * pgm, AVRPART * p,
-                                     AVRMEM * m, int page_size, int n_bytes)
+                                     AVRMEM * m, int page_size, int n_bytes, unsigned long addr)
 {
   char cmd[2];
-  unsigned int addr = 0;
-  unsigned int max_addr = n_bytes;
+  unsigned int max_addr;
+  unsigned int low_addr;
 
   avr910_set_addr(pgm, addr);
+  max_addr = addr + n_bytes;
+  low_addr = addr;
 
   cmd[0] = 'D';
 
@@ -481,7 +516,7 @@
       avr910_set_addr(pgm, addr);
     }
 
-    report_progress (addr, max_addr, NULL);
+    report_progress (addr - low_addr, n_bytes, NULL);
   }
 
   return addr;
@@ -489,13 +524,13 @@
 
 
 static int avr910_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
-                              int page_size, int n_bytes)
+                              int page_size, int n_bytes, unsigned long adress)
 {
   if (strcmp(m->desc, "flash") == 0) {
-    return avr910_paged_write_flash(pgm, p, m, page_size, n_bytes);
+    return avr910_paged_write_flash(pgm, p, m, page_size, n_bytes, adress);
   }
   else if (strcmp(m->desc, "eeprom") == 0) {
-    return avr910_paged_write_eeprom(pgm, p, m, page_size, n_bytes);
+    return avr910_paged_write_eeprom(pgm, p, m, page_size, n_bytes, adress);
   }
   else {
     return -2;
@@ -504,53 +539,58 @@
 
 
 static int avr910_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                             int page_size, int n_bytes)
+                             int page_size, int n_bytes, unsigned long addr)
 {
   char cmd;
   int rd_size;
-  unsigned int addr = 0;
   unsigned int max_addr;
+  unsigned int low_addr;
+  unsigned long part_addr;
+  unsigned long word_addr;
   char buf[2];
 
+  rd_size = take_adress(m,addr,2,&part_addr,&word_addr);
+  if (rd_size <= 0) 
+  	{return rd_size;}
+  
   if (strcmp(m->desc, "flash") == 0) {
     cmd = 'R';
-    rd_size = 2;                /* read two bytes per addr */
   }
   else if (strcmp(m->desc, "eeprom") == 0) {
     cmd = 'd';
-    rd_size = 1;
   }
   else {
     return -2;
   }
 
-  max_addr = n_bytes/rd_size;
+  max_addr = addr + n_bytes;
+  low_addr = addr;
+  avr910_set_addr(pgm, part_addr);
 
-  avr910_set_addr(pgm, addr);
-
   while (addr < max_addr) {
+  	
     avr910_send(pgm, &cmd, 1);
     if (cmd == 'R') {
+      avr910_recv(pgm, &(m->buf[word_addr]), rd_size);
       /* The 'R' command returns two bytes, MSB first, we need to put the data
          into the memory buffer LSB first. */
-      avr910_recv(pgm, buf, 2);
-      m->buf[addr*2]   = buf[1];  /* LSB */
-      m->buf[addr*2+1] = buf[0];  /* MSB */
+      swap_endian(&(m->buf[word_addr]), rd_size);
     }
     else {
       avr910_recv(pgm, (char *)&m->buf[addr], 1);
     }
 
-    addr++;
+    addr += rd_size;
+    take_adress(m,addr,2,&part_addr,&word_addr);
 
     if (has_auto_incr_addr != 'Y') {
-      avr910_set_addr(pgm, addr);
+      avr910_set_addr(pgm, part_addr);
     }
 
-    report_progress (addr, max_addr, NULL);
+    report_progress (addr - low_addr, n_bytes , NULL);
   }
 
-  return addr * rd_size;
+  return addr;
 }
 
 /* Signature byte reads are always 3 bytes. */
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrdude.conf.in
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrdude.conf.in	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrdude.conf.in	(working copy)
@@ -74,6 +74,8 @@
 #           paged           = <yes/no> ;          # yes / no
 #           size            = <num> ;             # bytes
 #           page_size       = <num> ;             # bytes
+#			word_size		= <num> ;			  # bytes, size of the word 
+#													default 2 byte 4 flash and 1 byte 4 others
 #           num_pages       = <num> ;             # numeric
 #           min_write_delay = <num> ;             # micro-seconds
 #           max_write_delay = <num> ;             # micro-seconds
@@ -214,8 +216,9 @@
 #
 default_parallel   = "@DEFAULT_PAR_PORT@";
 default_serial     = "@DEFAULT_SER_PORT@";
+default_fastwrite  = 0;
+default_fastverify = 0;
 
-
 #
 # PROGRAMMER DEFINITIONS
 #
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.c	(working copy)
@@ -369,6 +369,7 @@
   p->flags = AVRPART_SERIALOK | AVRPART_PARALLELOK | AVRPART_ENABLEPAGEPROGRAMMING;
   p->config_file[0] = 0;
   p->lineno = 0;
+  p->erased = 0;
 
   p->mem = lcreat(NULL, 0);
 
@@ -535,3 +536,59 @@
   if (buf)
     free(buf);
 }
+
+int take_adress(AVRMEM * m, unsigned long addr, int max_width, unsigned long * part_addr, unsigned long  * word_addr)
+/* addr - requested to operation adress*/
+/* part_addr - adress of part memory that contains requested word*/
+/* word_addr - adress of requested word in byte organised memory m*/
+/*returns width of memory word, if error occurs - return -1*/
+{
+  	int wordsize;
+  	
+  	wordsize = m->wordsize;
+  	if (wordsize == 0) {
+  		if (strcmp(m->desc, "flash") == 0) { 		
+  			wordsize = 2;
+  		}
+  		else {wordsize = 1;}
+  	}
+  	
+  	if (wordsize > max_width) {
+  			fprintf(stderr,"try use word as %i bytes width? cant operate with this width", wordsize);
+    		return -1;
+    }
+    
+  	switch (wordsize){
+  		case 2 : {
+		    *part_addr = addr >> 1;
+		    *word_addr = *part_addr << 1;
+		    break;
+  		}
+  		case 1 : {
+		    *part_addr = addr;
+		    *word_addr = addr;
+  			break;
+  		}
+  		default : {
+  			*part_addr = addr / wordsize;
+  			*word_addr = addr % wordsize;
+  		}
+  	}/*switch*/
+  	
+  	return wordsize;
+}
+
+void swap_endian(char * buf, int wordbytes)
+// swaps bytes of word to reverse received order
+{
+	int curidx;
+	char tmp;
+	
+	if (wordbytes == 1) {return 0;}
+	for (curidx = 0; curidx < (wordbytes >> 1) ; curidx++) {
+		tmp = buf[curidx];
+		buf[curidx] = buf[wordbytes -1 - curidx];
+		buf[wordbytes -1 - curidx] = tmp;
+	}
+	
+}
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.h
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.h	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/avrpart.h	(working copy)
@@ -118,6 +118,7 @@
   LISTID        mem;                /* avr memory definitions */
   char          config_file[PATH_MAX]; /* config file where defined */
   int           lineno;                /* config file line number */
+  int			erased;				/*setup to 1 after part errasing*/
 } AVRPART;
 
 #define AVR_MEMDESCLEN 64
@@ -125,6 +126,8 @@
   char desc[AVR_MEMDESCLEN];  /* memory description ("flash", "eeprom", etc) */
   int paged;                  /* page addressed (e.g. ATmega flash) */
   int size;                   /* total memory size in bytes */
+  int wordsize;               /* sizeof memory word - memory adresses by words*/
+  							  /* by default is set on 2 bytes 4 flash and 1 byte 4 others*/
   int page_size;              /* size of memory page (if page addressed) */
   int num_pages;              /* number of pages (if page addressed) */
   int min_write_delay;        /* microseconds */
@@ -160,6 +163,15 @@
 void avr_mem_display(char * prefix, FILE * f, AVRMEM * m, int type,
                      int verbose);
 
+int take_adress(AVRMEM * m, unsigned long addr, int max_width, unsigned long * part_addr, unsigned long  * word_addr);
+/* addr - requested to operation adress*/
+/* part_addr - adress of part memory that contains requested word*/
+/* word_addr - adress of requested word in byte organised memory m*/
+/*returns width of memory word, if error occurs - return -1*/
+void swap_endian(char * buf, int wordbytes);
+/* swaps bytes of word to reverse received order*/
+
+
 /* Functions for AVRPART structures */
 AVRPART * avr_new_part(void);
 AVRPART * avr_dup_part(AVRPART * d);
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/butterfly.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/butterfly.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/butterfly.c	(working copy)
@@ -424,8 +424,15 @@
 {
   char cmd[6];
   int size;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  int wordbytes;
 
   no_show_func_info();
+  
+  wordbytes = take_adress(m,addr,2,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
 
   if ((strcmp(m->desc, "flash") == 0) || (strcmp(m->desc, "eeprom") == 0))
   {
@@ -441,7 +448,7 @@
       size = 6;
       return -1;
     }
-    butterfly_set_addr(pgm, addr);
+    butterfly_set_addr(pgm, part_addr);
   }
   else if (strcmp(m->desc, "lock") == 0)
   {
@@ -463,32 +470,28 @@
                                   unsigned long addr, unsigned char * value)
 {
   static int cached = 0;
-  static unsigned char cvalue;
+  static unsigned char cvalue[4];
   static unsigned long caddr;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  int wordbytes;
 
-  if (cached && ((caddr + 1) == addr)) {
-    *value = cvalue;
-    cached = 0;
+  wordbytes = take_adress(m,addr,4,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+
+  if (cached && (caddr == part_addr)) {
+    *value = cvalue[addr - word_addr];
   }
   else {
-    char buf[2];
+    char cmd[4] = "g\000\002F";
 
-    butterfly_set_addr(pgm, addr >> 1);
-
-    butterfly_send(pgm, "g\000\002F", 4);
-
-    /* Read back the program mem word (MSB first) */
-    butterfly_recv(pgm, buf, sizeof(buf));
-
-    if ((addr & 0x01) == 0) {
-      *value = buf[1];
-      cached = 1;
-      cvalue = buf[0];
-      caddr = addr;
-    }
-    else {
-      *value = buf[0];
-    }
+    butterfly_set_addr(pgm, part_addr);
+    cmd[2] = (char) wordbytes;
+    butterfly_send(pgm, cmd, sizeof(cmd));
+    butterfly_recv(pgm, cvalue, sizeof(cvalue));
+    cached = 1;
+    *value = cvalue[addr - word_addr];
   }
 
   return 0;
@@ -544,20 +547,29 @@
 
 
 static int butterfly_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                              int page_size, int n_bytes)
+                              int page_size, int n_bytes, unsigned long addr)
 {
-  unsigned int addr = 0;
-  unsigned int max_addr = n_bytes;
+  unsigned int max_addr;
+  unsigned int low_addr;
   char *cmd;
   unsigned int blocksize = buffersize;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  int wordbytes;
 
+  wordbytes = take_adress(m,addr,4,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+
   if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom")) 
     return -2;
 
   if (m->desc[0] == 'e')
     blocksize = 1;		/* Write to eeprom single bytes only */
 
-  butterfly_set_addr(pgm, addr);
+  butterfly_set_addr(pgm, part_addr);
+  max_addr = addr + n_bytes;
+  low_addr = addr;
 
 #if 0
   usleep(1000000);
@@ -577,13 +589,14 @@
     memcpy(&cmd[4], &m->buf[addr], blocksize);
     cmd[1] = (blocksize >> 8) & 0xff;
     cmd[2] = blocksize & 0xff;
-
+	
+//	fprintf(stderr, "sending block at adress:%X\n",addr);
     butterfly_send(pgm, cmd, 4+blocksize);
     butterfly_vfy_cmd_sent(pgm, "write block");
 
     addr += blocksize;
 
-    report_progress (addr, max_addr, NULL);
+    report_progress (addr - low_addr, n_bytes, NULL);
   } /* while */
   free(cmd);
 
@@ -593,24 +606,31 @@
 
 
 static int butterfly_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                             int page_size, int n_bytes)
+                             int page_size, int n_bytes, unsigned long addr)
 {
-  unsigned int addr = 0;
-  unsigned int max_addr = n_bytes;
-  int rd_size = 1;
+  unsigned int max_addr, low_addr;
+  unsigned long part_addr;
+  unsigned long word_addr;
+  int wordbytes;
 
+  wordbytes = take_adress(m,addr,4,&part_addr,&word_addr);
+  if (wordbytes <= 0) 
+  	{return wordbytes;}
+
   /* check parameter syntax: only "flash" or "eeprom" is allowed */
   if (strcmp(m->desc, "flash") && strcmp(m->desc, "eeprom")) 
     return -2;
 
   {		/* use buffered mode */
+  	max_addr = addr + n_bytes;
+  	low_addr = addr;
     char cmd[4];
     int blocksize = buffersize;
 
     cmd[0] = 'g';
     cmd[3] = toupper(m->desc[0]);
 
-    butterfly_set_addr(pgm, addr);
+    butterfly_set_addr(pgm, part_addr);
     while (addr < max_addr) {
       if ((max_addr - addr) < blocksize) {
         blocksize = max_addr - addr;
@@ -623,11 +643,11 @@
 
       addr += blocksize;
 
-      report_progress (addr, max_addr, NULL);
+      report_progress (addr - low_addr, n_bytes, NULL);
     } /* while */
   }
 
-  return addr * rd_size;
+  return addr;
 }
 
 
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/ChangeLog
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/ChangeLog	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/ChangeLog	(working copy)
@@ -1,3 +1,33 @@
+2006-02-08 AlexRayne <alexrainpe196@newmail.ru>
+	
+	* avr.c:
+	* avrpart.c:
+	* avrpart.h:
+	* avr910.c:
+	* butterfly.c:
+	* jtagmkII.c
+	* stk500.c
+	* stk500v2.c
+	* config.h
+	* config.c
+	* config_gram.h	
+	* config_gram.y
+	* lexer.l
+	* main.c
+	* avrdude.conf.in
+	
+	* add -f <[w|v]+> option 4 write and verify operations wich is
+	force skiping empty pages or bytes 4 writing, if part was previously
+	erased, and 4 verifying. code for avr910 and butterfly was hardly revised
+	to provide this options
+	
+	* also ones option supported by new definitions in configuration file - 
+	 default_fastwrite and default_fastverify
+	
+	* add option word_size in configuration memory definitions wich is force
+	the size of word in bytes. now memory of the part adresses by words. 
+	By default word size of FLASH memory is 2 bytes, and 1 byte 4 others
+	
 2005-09-21  Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* main.c: Add the forgotten -B option to the option string in
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.c	(working copy)
@@ -34,6 +34,9 @@
 char default_parallel[PATH_MAX];
 char default_serial[PATH_MAX];
 
+int FastWrite = -1;    /* option -f w<+|-> - perfom a write only nonempty pages of Flash or EEPROM if was errased before*/
+int FastVerify = -1;   /* option -f v<+|-> - perfom a verify only nonempty pages of Flash*/
+
 char string_buf[MAX_STR_CONST];
 char *string_buf_ptr;
 
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.h
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.h	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config.h	(working copy)
@@ -55,6 +55,8 @@
 extern char         default_parallel[];
 extern char         default_serial[];
 
+extern int			FastWrite;
+extern int			FastVerify;
 
 
 #if !defined(HAS_YYSTYPE)
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.c	(working copy)
@@ -1,103 +1,261 @@
+/* A Bison parser, made by GNU Bison 2.1.  */
 
-/*  A Bison parser, made from ../config_gram.y
-    by GNU Bison version 1.28  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-#define YYBISON 1  /* Identify Bison output.  */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-#define	K_READ	257
-#define	K_WRITE	258
-#define	K_READ_LO	259
-#define	K_READ_HI	260
-#define	K_WRITE_LO	261
-#define	K_WRITE_HI	262
-#define	K_LOADPAGE_LO	263
-#define	K_LOADPAGE_HI	264
-#define	K_WRITEPAGE	265
-#define	K_CHIP_ERASE	266
-#define	K_PGM_ENABLE	267
-#define	K_MEMORY	268
-#define	K_PAGE_SIZE	269
-#define	K_PAGED	270
-#define	K_BAUDRATE	271
-#define	K_BS2	272
-#define	K_BUFF	273
-#define	K_CHIP_ERASE_DELAY	274
-#define	K_DEDICATED	275
-#define	K_DEFAULT_PARALLEL	276
-#define	K_DEFAULT_PROGRAMMER	277
-#define	K_DEFAULT_SERIAL	278
-#define	K_DESC	279
-#define	K_DEVICECODE	280
-#define	K_STK500_DEVCODE	281
-#define	K_AVR910_DEVCODE	282
-#define	K_EEPROM	283
-#define	K_ERRLED	284
-#define	K_FLASH	285
-#define	K_ID	286
-#define	K_IO	287
-#define	K_JTAG_MKII	288
-#define	K_LOADPAGE	289
-#define	K_MAX_WRITE_DELAY	290
-#define	K_MIN_WRITE_DELAY	291
-#define	K_MISO	292
-#define	K_MOSI	293
-#define	K_NUM_PAGES	294
-#define	K_PAGEL	295
-#define	K_PAR	296
-#define	K_PARALLEL	297
-#define	K_PART	298
-#define	K_PGMLED	299
-#define	K_PROGRAMMER	300
-#define	K_PSEUDO	301
-#define	K_PWROFF_AFTER_WRITE	302
-#define	K_RDYLED	303
-#define	K_READBACK_P1	304
-#define	K_READBACK_P2	305
-#define	K_READMEM	306
-#define	K_RESET	307
-#define	K_RETRY_PULSE	308
-#define	K_SERBB	309
-#define	K_SERIAL	310
-#define	K_SCK	311
-#define	K_SIZE	312
-#define	K_STK500	313
-#define	K_STK500V2	314
-#define	K_AVR910	315
-#define	K_BUTTERFLY	316
-#define	K_TYPE	317
-#define	K_VCC	318
-#define	K_VFYLED	319
-#define	K_NO	320
-#define	K_YES	321
-#define	K_TIMEOUT	322
-#define	K_STABDELAY	323
-#define	K_CMDEXEDELAY	324
-#define	K_SYNCHLOOPS	325
-#define	K_BYTEDELAY	326
-#define	K_POLLVALUE	327
-#define	K_POLLINDEX	328
-#define	K_PREDELAY	329
-#define	K_POSTDELAY	330
-#define	K_POLLMETHOD	331
-#define	K_MODE	332
-#define	K_DELAY	333
-#define	K_BLOCKSIZE	334
-#define	K_READSIZE	335
-#define	K_ALLOWFULLPAGEBITSTREAM	336
-#define	K_ENABLEPAGEPROGRAMMING	337
-#define	K_HAS_JTAG	338
-#define	K_IDR	339
-#define	K_RAMPZ	340
-#define	K_SPMCR	341
-#define	K_EECR	342
-#define	TKN_COMMA	343
-#define	TKN_EQUAL	344
-#define	TKN_SEMI	345
-#define	TKN_TILDE	346
-#define	TKN_NUMBER	347
-#define	TKN_STRING	348
-#define	TKN_ID	349
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     K_READ = 258,
+     K_WRITE = 259,
+     K_READ_LO = 260,
+     K_READ_HI = 261,
+     K_WRITE_LO = 262,
+     K_WRITE_HI = 263,
+     K_LOADPAGE_LO = 264,
+     K_LOADPAGE_HI = 265,
+     K_WRITEPAGE = 266,
+     K_CHIP_ERASE = 267,
+     K_PGM_ENABLE = 268,
+     K_MEMORY = 269,
+     K_PAGE_SIZE = 270,
+     K_PAGED = 271,
+     K_BAUDRATE = 272,
+     K_BS2 = 273,
+     K_BUFF = 274,
+     K_CHIP_ERASE_DELAY = 275,
+     K_DEDICATED = 276,
+     K_DEFAULT_PARALLEL = 277,
+     K_DEFAULT_PROGRAMMER = 278,
+     K_DEFAULT_SERIAL = 279,
+     K_DESC = 280,
+     K_DEVICECODE = 281,
+     K_STK500_DEVCODE = 282,
+     K_AVR910_DEVCODE = 283,
+     K_EEPROM = 284,
+     K_ERRLED = 285,
+     K_FLASH = 286,
+     K_ID = 287,
+     K_IO = 288,
+     K_JTAG_MKII = 289,
+     K_LOADPAGE = 290,
+     K_MAX_WRITE_DELAY = 291,
+     K_MIN_WRITE_DELAY = 292,
+     K_MISO = 293,
+     K_MOSI = 294,
+     K_NUM_PAGES = 295,
+     K_PAGEL = 296,
+     K_PAR = 297,
+     K_PARALLEL = 298,
+     K_PART = 299,
+     K_PGMLED = 300,
+     K_PROGRAMMER = 301,
+     K_PSEUDO = 302,
+     K_PWROFF_AFTER_WRITE = 303,
+     K_RDYLED = 304,
+     K_READBACK_P1 = 305,
+     K_READBACK_P2 = 306,
+     K_READMEM = 307,
+     K_RESET = 308,
+     K_RETRY_PULSE = 309,
+     K_SERBB = 310,
+     K_SERIAL = 311,
+     K_SCK = 312,
+     K_SIZE = 313,
+     K_STK500 = 314,
+     K_STK500V2 = 315,
+     K_AVR910 = 316,
+     K_BUTTERFLY = 317,
+     K_TYPE = 318,
+     K_VCC = 319,
+     K_VFYLED = 320,
+     K_NO = 321,
+     K_YES = 322,
+     K_TIMEOUT = 323,
+     K_STABDELAY = 324,
+     K_CMDEXEDELAY = 325,
+     K_SYNCHLOOPS = 326,
+     K_BYTEDELAY = 327,
+     K_POLLVALUE = 328,
+     K_POLLINDEX = 329,
+     K_PREDELAY = 330,
+     K_POSTDELAY = 331,
+     K_POLLMETHOD = 332,
+     K_MODE = 333,
+     K_DELAY = 334,
+     K_BLOCKSIZE = 335,
+     K_READSIZE = 336,
+     K_ALLOWFULLPAGEBITSTREAM = 337,
+     K_ENABLEPAGEPROGRAMMING = 338,
+     K_HAS_JTAG = 339,
+     K_IDR = 340,
+     K_RAMPZ = 341,
+     K_SPMCR = 342,
+     K_EECR = 343,
+     TKN_COMMA = 344,
+     TKN_EQUAL = 345,
+     TKN_SEMI = 346,
+     TKN_TILDE = 347,
+     TKN_NUMBER = 348,
+     TKN_STRING = 349,
+     TKN_ID = 350,
+     K_WORD_SIZE = 351,
+     K_DEFAULT_FASTWRITE = 352,
+     K_DEFAULT_FASTVERIFY = 353
+   };
+#endif
+/* Tokens.  */
+#define K_READ 258
+#define K_WRITE 259
+#define K_READ_LO 260
+#define K_READ_HI 261
+#define K_WRITE_LO 262
+#define K_WRITE_HI 263
+#define K_LOADPAGE_LO 264
+#define K_LOADPAGE_HI 265
+#define K_WRITEPAGE 266
+#define K_CHIP_ERASE 267
+#define K_PGM_ENABLE 268
+#define K_MEMORY 269
+#define K_PAGE_SIZE 270
+#define K_PAGED 271
+#define K_BAUDRATE 272
+#define K_BS2 273
+#define K_BUFF 274
+#define K_CHIP_ERASE_DELAY 275
+#define K_DEDICATED 276
+#define K_DEFAULT_PARALLEL 277
+#define K_DEFAULT_PROGRAMMER 278
+#define K_DEFAULT_SERIAL 279
+#define K_DESC 280
+#define K_DEVICECODE 281
+#define K_STK500_DEVCODE 282
+#define K_AVR910_DEVCODE 283
+#define K_EEPROM 284
+#define K_ERRLED 285
+#define K_FLASH 286
+#define K_ID 287
+#define K_IO 288
+#define K_JTAG_MKII 289
+#define K_LOADPAGE 290
+#define K_MAX_WRITE_DELAY 291
+#define K_MIN_WRITE_DELAY 292
+#define K_MISO 293
+#define K_MOSI 294
+#define K_NUM_PAGES 295
+#define K_PAGEL 296
+#define K_PAR 297
+#define K_PARALLEL 298
+#define K_PART 299
+#define K_PGMLED 300
+#define K_PROGRAMMER 301
+#define K_PSEUDO 302
+#define K_PWROFF_AFTER_WRITE 303
+#define K_RDYLED 304
+#define K_READBACK_P1 305
+#define K_READBACK_P2 306
+#define K_READMEM 307
+#define K_RESET 308
+#define K_RETRY_PULSE 309
+#define K_SERBB 310
+#define K_SERIAL 311
+#define K_SCK 312
+#define K_SIZE 313
+#define K_STK500 314
+#define K_STK500V2 315
+#define K_AVR910 316
+#define K_BUTTERFLY 317
+#define K_TYPE 318
+#define K_VCC 319
+#define K_VFYLED 320
+#define K_NO 321
+#define K_YES 322
+#define K_TIMEOUT 323
+#define K_STABDELAY 324
+#define K_CMDEXEDELAY 325
+#define K_SYNCHLOOPS 326
+#define K_BYTEDELAY 327
+#define K_POLLVALUE 328
+#define K_POLLINDEX 329
+#define K_PREDELAY 330
+#define K_POSTDELAY 331
+#define K_POLLMETHOD 332
+#define K_MODE 333
+#define K_DELAY 334
+#define K_BLOCKSIZE 335
+#define K_READSIZE 336
+#define K_ALLOWFULLPAGEBITSTREAM 337
+#define K_ENABLEPAGEPROGRAMMING 338
+#define K_HAS_JTAG 339
+#define K_IDR 340
+#define K_RAMPZ 341
+#define K_SPMCR 342
+#define K_EECR 343
+#define TKN_COMMA 344
+#define TKN_EQUAL 345
+#define TKN_SEMI 346
+#define TKN_TILDE 347
+#define TKN_NUMBER 348
+#define TKN_STRING 349
+#define TKN_ID 350
+#define K_WORD_SIZE 351
+#define K_DEFAULT_FASTWRITE 352
+#define K_DEFAULT_FASTVERIFY 353
+
+
+
+
+/* Copy the first part of user declarations.  */
 #line 21 "../config_gram.y"
 
 
@@ -135,625 +293,1081 @@
 static int which_opcode(TOKEN * opcode);
 static int parse_cmdbits(OPCODE * op);
  
-#ifndef YYSTYPE
-#define YYSTYPE int
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
 #endif
-#include <stdio.h>
 
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
 #endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+typedef int YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 
-#define	YYFINAL		268
-#define	YYFLAG		-32768
-#define	YYNTBASE	96
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 349 ? yytranslate[x] : 117)
+/* Copy the second part of user declarations.  */
 
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    92,    93,    94,    95
-};
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     1,     3,     5,     8,    11,    14,    19,    24,    29,
-    30,    34,    35,    39,    41,    45,    47,    51,    54,    58,
-    62,    66,    70,    74,    78,    82,    86,    90,    94,    98,
-   102,   106,   110,   114,   118,   122,   126,   130,   134,   138,
-   143,   148,   153,   158,   163,   168,   173,   178,   180,   182,
-   184,   186,   188,   190,   192,   194,   196,   198,   200,   203,
-   207,   209,   211,   213,   215,   217,   219,   223,   227,   231,
-   235,   239,   243,   247,   251,   255,   259,   263,   267,   271,
-   275,   279,   283,   287,   291,   295,   299,   303,   307,   311,
-   315,   319,   323,   327,   331,   335,   336,   341,   345,   347,
-   349,   352,   356,   360,   364,   368,   372,   376,   380,   384,
-   388,   392,   396,   400,   404,   408,   412
-};
+/* Line 219 of yacc.c.  */
+#line 330 "../config_gram.c"
 
-static const short yyrhs[] = {    -1,
-    97,     0,    98,     0,    97,    98,     0,    99,    91,     0,
-   101,    91,     0,    23,    90,    94,    91,     0,    22,    90,
-    94,    91,     0,    24,    90,    94,    91,     0,     0,    46,
-   100,   105,     0,     0,    44,   102,   108,     0,    94,     0,
-   103,    89,    94,     0,    93,     0,   104,    89,    93,     0,
-   106,    91,     0,   105,   106,    91,     0,    32,    90,   103,
-     0,    63,    90,    42,     0,    63,    90,    55,     0,    63,
-    90,    59,     0,    63,    90,    60,     0,    63,    90,    61,
-     0,    63,    90,    62,     0,    63,    90,    34,     0,    25,
-    90,    94,     0,    64,    90,   104,     0,    19,    90,   104,
-     0,    17,    90,    93,     0,    53,    90,    93,     0,    57,
-    90,    93,     0,    39,    90,    93,     0,    38,    90,    93,
-     0,    30,    90,    93,     0,    49,    90,    93,     0,    45,
-    90,    93,     0,    65,    90,    93,     0,    53,    90,    92,
-    93,     0,    57,    90,    92,    93,     0,    39,    90,    92,
-    93,     0,    38,    90,    92,    93,     0,    30,    90,    92,
-    93,     0,    49,    90,    92,    93,     0,    45,    90,    92,
-    93,     0,    65,    90,    92,    93,     0,     3,     0,     4,
-     0,     5,     0,     6,     0,     7,     0,     8,     0,     9,
-     0,    10,     0,    11,     0,    12,     0,    13,     0,   112,
-    91,     0,   108,   112,    91,     0,    21,     0,    33,     0,
-   114,     0,    47,     0,    53,     0,    57,     0,    32,    90,
-    94,     0,    25,    90,    94,     0,    26,    90,    93,     0,
-    27,    90,    93,     0,    28,    90,    93,     0,    20,    90,
-    93,     0,    41,    90,    93,     0,    18,    90,    93,     0,
-    53,    90,   109,     0,    68,    90,    93,     0,    69,    90,
-    93,     0,    70,    90,    93,     0,    71,    90,    93,     0,
-    72,    90,    93,     0,    73,    90,    93,     0,    74,    90,
-    93,     0,    75,    90,    93,     0,    76,    90,    93,     0,
-    77,    90,    93,     0,    84,    90,   114,     0,    82,    90,
-   114,     0,    83,    90,   114,     0,    85,    90,    93,     0,
-    86,    90,    93,     0,    87,    90,    93,     0,    88,    90,
-    93,     0,    56,    90,   114,     0,    43,    90,   110,     0,
-    54,    90,   111,     0,     0,    14,    94,   113,   115,     0,
-   107,    90,   103,     0,    67,     0,    66,     0,   116,    91,
-     0,   115,   116,    91,     0,    16,    90,   114,     0,    58,
-    90,    93,     0,    15,    90,    93,     0,    40,    90,    93,
-     0,    37,    90,    93,     0,    36,    90,    93,     0,    48,
-    90,   114,     0,    50,    90,    93,     0,    51,    90,    93,
-     0,    78,    90,    93,     0,    79,    90,    93,     0,    80,
-    90,    93,     0,    81,    90,    93,     0,    74,    90,    93,
-     0,   107,    90,   103,     0
-};
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
 
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
 #endif
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   173,   174,   177,   178,   183,   184,   186,   192,   198,   208,
-   215,   233,   241,   295,   296,   301,   302,   307,   308,   313,
-   323,   329,   335,   341,   347,   353,   359,   365,   371,   396,
-   421,   427,   430,   432,   433,   434,   435,   436,   437,   438,
-   441,   443,   444,   445,   446,   447,   448,   453,   454,   455,
-   456,   457,   458,   459,   460,   461,   462,   463,   468,   469,
-   474,   475,   478,   479,   482,   483,   486,   492,   499,   509,
-   516,   523,   529,   535,   541,   551,   557,   563,   569,   575,
-   581,   587,   593,   599,   605,   611,   621,   631,   641,   647,
-   653,   659,   665,   675,   694,   708,   726,   729,   747,   748,
-   752,   753,   758,   763,   769,   776,   782,   788,   794,   800,
-   806,   812,   819,   825,   831,   837,   843
-};
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
+#  endif
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short int yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined (__GNUC__) && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
+
 #endif
 
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short int yysigned_char;
+#endif
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  20
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   272
 
-static const char * const yytname[] = {   "$","error","$undefined.","K_READ",
-"K_WRITE","K_READ_LO","K_READ_HI","K_WRITE_LO","K_WRITE_HI","K_LOADPAGE_LO",
-"K_LOADPAGE_HI","K_WRITEPAGE","K_CHIP_ERASE","K_PGM_ENABLE","K_MEMORY","K_PAGE_SIZE",
-"K_PAGED","K_BAUDRATE","K_BS2","K_BUFF","K_CHIP_ERASE_DELAY","K_DEDICATED","K_DEFAULT_PARALLEL",
-"K_DEFAULT_PROGRAMMER","K_DEFAULT_SERIAL","K_DESC","K_DEVICECODE","K_STK500_DEVCODE",
-"K_AVR910_DEVCODE","K_EEPROM","K_ERRLED","K_FLASH","K_ID","K_IO","K_JTAG_MKII",
-"K_LOADPAGE","K_MAX_WRITE_DELAY","K_MIN_WRITE_DELAY","K_MISO","K_MOSI","K_NUM_PAGES",
-"K_PAGEL","K_PAR","K_PARALLEL","K_PART","K_PGMLED","K_PROGRAMMER","K_PSEUDO",
-"K_PWROFF_AFTER_WRITE","K_RDYLED","K_READBACK_P1","K_READBACK_P2","K_READMEM",
-"K_RESET","K_RETRY_PULSE","K_SERBB","K_SERIAL","K_SCK","K_SIZE","K_STK500","K_STK500V2",
-"K_AVR910","K_BUTTERFLY","K_TYPE","K_VCC","K_VFYLED","K_NO","K_YES","K_TIMEOUT",
-"K_STABDELAY","K_CMDEXEDELAY","K_SYNCHLOOPS","K_BYTEDELAY","K_POLLVALUE","K_POLLINDEX",
-"K_PREDELAY","K_POSTDELAY","K_POLLMETHOD","K_MODE","K_DELAY","K_BLOCKSIZE","K_READSIZE",
-"K_ALLOWFULLPAGEBITSTREAM","K_ENABLEPAGEPROGRAMMING","K_HAS_JTAG","K_IDR","K_RAMPZ",
-"K_SPMCR","K_EECR","TKN_COMMA","TKN_EQUAL","TKN_SEMI","TKN_TILDE","TKN_NUMBER",
-"TKN_STRING","TKN_ID","configuration","config","def","prog_def","@1","part_def",
-"@2","string_list","num_list","prog_parms","prog_parm","opcode","part_parms",
-"reset_disposition","parallel_modes","retry_lines","part_parm","@3","yesno",
-"mem_specs","mem_spec", NULL
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  99
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  22
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  121
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  279
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   353
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98
 };
-#endif
 
-static const short yyr1[] = {     0,
-    96,    96,    97,    97,    98,    98,    98,    98,    98,   100,
-    99,   102,   101,   103,   103,   104,   104,   105,   105,   106,
-   106,   106,   106,   106,   106,   106,   106,   106,   106,   106,
-   106,   106,   106,   106,   106,   106,   106,   106,   106,   106,
-   106,   106,   106,   106,   106,   106,   106,   107,   107,   107,
-   107,   107,   107,   107,   107,   107,   107,   107,   108,   108,
-   109,   109,   110,   110,   111,   111,   112,   112,   112,   112,
-   112,   112,   112,   112,   112,   112,   112,   112,   112,   112,
-   112,   112,   112,   112,   112,   112,   112,   112,   112,   112,
-   112,   112,   112,   112,   112,   113,   112,   112,   114,   114,
-   115,   115,   116,   116,   116,   116,   116,   116,   116,   116,
-   116,   116,   116,   116,   116,   116,   116
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short int yyprhs[] =
+{
+       0,     0,     3,     4,     6,     8,    11,    14,    17,    22,
+      27,    32,    37,    42,    43,    47,    48,    52,    54,    58,
+      60,    64,    67,    71,    75,    79,    83,    87,    91,    95,
+      99,   103,   107,   111,   115,   119,   123,   127,   131,   135,
+     139,   143,   147,   151,   156,   161,   166,   171,   176,   181,
+     186,   191,   193,   195,   197,   199,   201,   203,   205,   207,
+     209,   211,   213,   216,   220,   222,   224,   226,   228,   230,
+     232,   236,   240,   244,   248,   252,   256,   260,   264,   268,
+     272,   276,   280,   284,   288,   292,   296,   300,   304,   308,
+     312,   316,   320,   324,   328,   332,   336,   340,   344,   348,
+     349,   354,   358,   360,   362,   365,   369,   373,   377,   381,
+     385,   389,   393,   397,   401,   405,   409,   413,   417,   421,
+     425,   429
 };
 
-static const short yyr2[] = {     0,
-     0,     1,     1,     2,     2,     2,     4,     4,     4,     0,
-     3,     0,     3,     1,     3,     1,     3,     2,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     3,     3,     4,
-     4,     4,     4,     4,     4,     4,     4,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
-     1,     1,     1,     1,     1,     1,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     0,     4,     3,     1,     1,
-     2,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+     100,     0,    -1,    -1,   101,    -1,   102,    -1,   101,   102,
+      -1,   103,    91,    -1,   105,    91,    -1,    23,    90,    94,
+      91,    -1,    22,    90,    94,    91,    -1,    24,    90,    94,
+      91,    -1,    97,    90,    93,    91,    -1,    98,    90,    93,
+      91,    -1,    -1,    46,   104,   109,    -1,    -1,    44,   106,
+     112,    -1,    94,    -1,   107,    89,    94,    -1,    93,    -1,
+     108,    89,    93,    -1,   110,    91,    -1,   109,   110,    91,
+      -1,    32,    90,   107,    -1,    63,    90,    42,    -1,    63,
+      90,    55,    -1,    63,    90,    59,    -1,    63,    90,    60,
+      -1,    63,    90,    61,    -1,    63,    90,    62,    -1,    63,
+      90,    34,    -1,    25,    90,    94,    -1,    64,    90,   108,
+      -1,    19,    90,   108,    -1,    17,    90,    93,    -1,    53,
+      90,    93,    -1,    57,    90,    93,    -1,    39,    90,    93,
+      -1,    38,    90,    93,    -1,    30,    90,    93,    -1,    49,
+      90,    93,    -1,    45,    90,    93,    -1,    65,    90,    93,
+      -1,    53,    90,    92,    93,    -1,    57,    90,    92,    93,
+      -1,    39,    90,    92,    93,    -1,    38,    90,    92,    93,
+      -1,    30,    90,    92,    93,    -1,    49,    90,    92,    93,
+      -1,    45,    90,    92,    93,    -1,    65,    90,    92,    93,
+      -1,     3,    -1,     4,    -1,     5,    -1,     6,    -1,     7,
+      -1,     8,    -1,     9,    -1,    10,    -1,    11,    -1,    12,
+      -1,    13,    -1,   116,    91,    -1,   112,   116,    91,    -1,
+      21,    -1,    33,    -1,   118,    -1,    47,    -1,    53,    -1,
+      57,    -1,    32,    90,    94,    -1,    25,    90,    94,    -1,
+      26,    90,    93,    -1,    27,    90,    93,    -1,    28,    90,
+      93,    -1,    20,    90,    93,    -1,    41,    90,    93,    -1,
+      18,    90,    93,    -1,    53,    90,   113,    -1,    68,    90,
+      93,    -1,    69,    90,    93,    -1,    70,    90,    93,    -1,
+      71,    90,    93,    -1,    72,    90,    93,    -1,    73,    90,
+      93,    -1,    74,    90,    93,    -1,    75,    90,    93,    -1,
+      76,    90,    93,    -1,    77,    90,    93,    -1,    84,    90,
+     118,    -1,    82,    90,   118,    -1,    83,    90,   118,    -1,
+      85,    90,    93,    -1,    86,    90,    93,    -1,    87,    90,
+      93,    -1,    88,    90,    93,    -1,    56,    90,   118,    -1,
+      43,    90,   114,    -1,    54,    90,   115,    -1,    -1,    14,
+      94,   117,   119,    -1,   111,    90,   107,    -1,    67,    -1,
+      66,    -1,   120,    91,    -1,   119,   120,    91,    -1,    16,
+      90,   118,    -1,    58,    90,    93,    -1,    96,    90,    93,
+      -1,    15,    90,    93,    -1,    40,    90,    93,    -1,    37,
+      90,    93,    -1,    36,    90,    93,    -1,    48,    90,   118,
+      -1,    50,    90,    93,    -1,    51,    90,    93,    -1,    78,
+      90,    93,    -1,    79,    90,    93,    -1,    80,    90,    93,
+      -1,    81,    90,    93,    -1,    74,    90,    93,    -1,   111,
+      90,   107,    -1
 };
 
-static const short yydefact[] = {     1,
-     0,     0,     0,    12,    10,     2,     3,     0,     0,     0,
-     0,     0,     0,     0,     4,     5,     6,     0,     0,     0,
-    48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    58,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    13,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    11,     0,
-     8,     7,     9,    96,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    59,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    18,     0,    74,    72,    68,    69,    70,    71,    67,
-    73,    64,   100,    99,    94,    63,    61,    62,    75,    65,
-    66,    95,    93,    76,    77,    78,    79,    80,    81,    82,
-    83,    84,    85,    87,    88,    86,    89,    90,    91,    92,
-    14,    98,    60,    31,    16,    30,    28,     0,    36,    20,
-     0,    35,     0,    34,     0,    38,     0,    37,     0,    32,
-     0,    33,    27,    21,    22,    23,    24,    25,    26,    29,
-     0,    39,    19,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    97,     0,
-     0,     0,    44,    43,    42,    46,    45,    40,    41,    47,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   101,    15,    17,   105,
-   103,   108,   107,   106,   109,   110,   111,   104,   116,   112,
-   113,   114,   115,   117,   102,     0,     0,     0
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short int yyrline[] =
+{
+       0,   176,   176,   177,   181,   182,   187,   189,   191,   197,
+     203,   208,   216,   228,   227,   253,   252,   314,   315,   320,
+     321,   326,   327,   332,   343,   349,   355,   361,   367,   373,
+     379,   385,   391,   416,   441,   447,   449,   451,   452,   453,
+     454,   455,   456,   458,   460,   462,   463,   464,   465,   466,
+     467,   472,   473,   474,   475,   476,   477,   478,   479,   480,
+     481,   482,   487,   488,   493,   493,   497,   497,   501,   501,
+     505,   512,   519,   529,   536,   543,   549,   555,   561,   571,
+     577,   583,   589,   595,   601,   607,   613,   619,   625,   631,
+     641,   651,   661,   667,   673,   679,   685,   695,   714,   738,
+     737,   749,   766,   766,   771,   772,   777,   783,   789,   795,
+     801,   807,   813,   819,   825,   831,   838,   844,   850,   856,
+     862,   869
 };
+#endif
 
-static const short yydefgoto[] = {   266,
-     6,     7,     8,    14,     9,    13,   172,   176,    79,    80,
-    62,    63,   149,   145,   152,    64,   133,   146,   219,   220
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "K_READ", "K_WRITE", "K_READ_LO",
+  "K_READ_HI", "K_WRITE_LO", "K_WRITE_HI", "K_LOADPAGE_LO",
+  "K_LOADPAGE_HI", "K_WRITEPAGE", "K_CHIP_ERASE", "K_PGM_ENABLE",
+  "K_MEMORY", "K_PAGE_SIZE", "K_PAGED", "K_BAUDRATE", "K_BS2", "K_BUFF",
+  "K_CHIP_ERASE_DELAY", "K_DEDICATED", "K_DEFAULT_PARALLEL",
+  "K_DEFAULT_PROGRAMMER", "K_DEFAULT_SERIAL", "K_DESC", "K_DEVICECODE",
+  "K_STK500_DEVCODE", "K_AVR910_DEVCODE", "K_EEPROM", "K_ERRLED",
+  "K_FLASH", "K_ID", "K_IO", "K_JTAG_MKII", "K_LOADPAGE",
+  "K_MAX_WRITE_DELAY", "K_MIN_WRITE_DELAY", "K_MISO", "K_MOSI",
+  "K_NUM_PAGES", "K_PAGEL", "K_PAR", "K_PARALLEL", "K_PART", "K_PGMLED",
+  "K_PROGRAMMER", "K_PSEUDO", "K_PWROFF_AFTER_WRITE", "K_RDYLED",
+  "K_READBACK_P1", "K_READBACK_P2", "K_READMEM", "K_RESET",
+  "K_RETRY_PULSE", "K_SERBB", "K_SERIAL", "K_SCK", "K_SIZE", "K_STK500",
+  "K_STK500V2", "K_AVR910", "K_BUTTERFLY", "K_TYPE", "K_VCC", "K_VFYLED",
+  "K_NO", "K_YES", "K_TIMEOUT", "K_STABDELAY", "K_CMDEXEDELAY",
+  "K_SYNCHLOOPS", "K_BYTEDELAY", "K_POLLVALUE", "K_POLLINDEX",
+  "K_PREDELAY", "K_POSTDELAY", "K_POLLMETHOD", "K_MODE", "K_DELAY",
+  "K_BLOCKSIZE", "K_READSIZE", "K_ALLOWFULLPAGEBITSTREAM",
+  "K_ENABLEPAGEPROGRAMMING", "K_HAS_JTAG", "K_IDR", "K_RAMPZ", "K_SPMCR",
+  "K_EECR", "TKN_COMMA", "TKN_EQUAL", "TKN_SEMI", "TKN_TILDE",
+  "TKN_NUMBER", "TKN_STRING", "TKN_ID", "K_WORD_SIZE",
+  "K_DEFAULT_FASTWRITE", "K_DEFAULT_FASTVERIFY", "$accept",
+  "configuration", "config", "def", "prog_def", "@1", "part_def", "@2",
+  "string_list", "num_list", "prog_parms", "prog_parm", "opcode",
+  "part_parms", "reset_disposition", "parallel_modes", "retry_lines",
+  "part_parm", "@3", "yesno", "mem_specs", "mem_spec", 0
 };
+#endif
 
-static const short yypact[] = {    -8,
-   -53,   -50,   -47,-32768,-32768,    -8,-32768,   -31,   -30,   -29,
-   -28,   -23,    21,   144,-32768,-32768,-32768,   -19,   -18,   -15,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   -14,   -12,   -11,    -9,    -7,    -6,    -5,    -4,    -3,
-     9,    10,    11,    12,    31,    34,    36,    37,    38,    39,
-    40,    41,    42,    43,    44,    45,    47,    48,    49,    51,
-    52,    55,    21,    57,    56,    59,    60,    61,    62,    63,
-    64,    66,    69,    70,    72,    74,    76,    77,   144,    79,
--32768,-32768,-32768,-32768,    75,    78,    81,    80,    84,    85,
-    86,    91,   -44,   -16,   -49,   -60,    97,    98,    99,   101,
-   102,   103,   105,   106,   109,   110,   -60,   -60,   -60,   111,
-   112,   113,   117,   118,    88,-32768,   120,   121,   122,   -83,
-   118,   -74,   -72,   -48,   -41,   -38,   -36,     8,   121,   -34,
-   124,-32768,   107,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,    83,-32768,-32768,-32768,   128,-32768,   125,-32768,    83,
-   126,-32768,   127,-32768,   129,-32768,   130,-32768,   131,-32768,
-   132,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   128,
-   133,-32768,-32768,   137,   138,   139,   140,   141,   142,   143,
-   145,   146,   147,   148,   149,   150,   151,   152,   107,   153,
-   154,   156,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-   157,   -60,   158,   159,   160,   -60,   161,   162,   163,   164,
-   165,   166,   167,   168,   118,   155,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,    83,-32768,    82,   200,-32768
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short int yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353
 };
+# endif
 
-static const short yypgoto[] = {-32768,
--32768,   205,-32768,-32768,-32768,-32768,  -120,    92,-32768,   183,
-  -131,-32768,-32768,-32768,-32768,   171,-32768,   -96,-32768,    24
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,    99,   100,   100,   101,   101,   102,   102,   102,   102,
+     102,   102,   102,   104,   103,   106,   105,   107,   107,   108,
+     108,   109,   109,   110,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     110,   111,   111,   111,   111,   111,   111,   111,   111,   111,
+     111,   111,   112,   112,   113,   113,   114,   114,   115,   115,
+     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
+     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
+     116,   116,   116,   116,   116,   116,   116,   116,   116,   117,
+     116,   116,   118,   118,   119,   119,   120,   120,   120,   120,
+     120,   120,   120,   120,   120,   120,   120,   120,   120,   120,
+     120,   120
 };
 
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     0,     1,     1,     2,     2,     2,     4,     4,
+       4,     4,     4,     0,     3,     0,     3,     1,     3,     1,
+       3,     2,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     4,     4,     4,     4,     4,     4,     4,
+       4,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     3,     1,     1,     1,     1,     1,     1,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     0,
+       4,     3,     1,     1,     2,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3
+};
 
-#define	YYLAST		262
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned char yydefact[] =
+{
+       2,     0,     0,     0,    15,    13,     0,     0,     0,     3,
+       4,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       1,     5,     6,     7,     0,     0,     0,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    16,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    14,     0,     0,     0,     9,
+       8,    10,    99,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    62,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      21,    11,    12,     0,    77,    75,    71,    72,    73,    74,
+      70,    76,    67,   103,   102,    97,    66,    64,    65,    78,
+      68,    69,    98,    96,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    90,    91,    89,    92,    93,    94,
+      95,    17,   101,    63,    34,    19,    33,    31,     0,    39,
+      23,     0,    38,     0,    37,     0,    41,     0,    40,     0,
+      35,     0,    36,    30,    24,    25,    26,    27,    28,    29,
+      32,     0,    42,    22,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     100,     0,     0,     0,    47,    46,    45,    49,    48,    43,
+      44,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   104,
+      18,    20,   109,   106,   112,   111,   110,   113,   114,   115,
+     107,   120,   116,   117,   118,   119,   108,   121,   105
+};
 
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short int yydefgoto[] =
+{
+      -1,     8,     9,    10,    11,    17,    12,    16,   182,   186,
+      85,    86,    68,    69,   159,   155,   162,    70,   143,   156,
+     230,   231
+};
 
-static const short yytable[] = {   153,
-   180,   218,   142,   150,   147,   143,   144,   151,   178,   179,
-   164,   165,   166,     1,     2,     3,   148,   181,   182,   183,
-   184,   143,   144,    21,    22,    23,    24,    25,    26,    27,
-    28,    29,    30,    31,    32,     4,    10,     5,    33,    11,
-    34,   193,    12,   185,   186,    35,    36,    37,    38,   194,
-   187,   188,    39,   189,   190,   191,   192,   201,   202,    16,
-    17,    40,   195,    41,    18,    19,   196,   197,   198,   199,
-    20,    81,    82,    42,    43,    83,    44,    85,    86,    84,
-    87,   267,    88,    89,    90,    91,    92,   218,    45,    46,
-    47,    48,    49,    50,    51,    52,    53,    54,    93,    94,
-    95,    96,    55,    56,    57,    58,    59,    60,    61,    21,
-    22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-    97,   204,   205,    98,   264,    99,   100,   101,   102,   103,
-   104,   105,   106,   107,   108,   251,   109,   110,   111,   255,
-   112,   113,   206,   207,   114,   117,   208,   116,   118,   119,
-   120,   121,   122,   123,   209,   124,   210,   211,   125,   126,
-    65,   127,    66,   128,   212,   129,   130,   134,    67,   132,
-   135,   221,   137,    68,   136,    69,   138,   139,   173,   140,
-   213,    70,    71,   141,   214,   215,   216,   217,    72,   154,
-   155,   156,    73,   157,   158,   159,    74,   160,   161,   268,
-    75,   162,   163,   167,   168,   169,    76,    77,    78,   170,
-    15,   171,   174,   175,   203,   177,   222,   223,   224,   225,
-   200,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-   235,   236,   237,   115,   238,   239,   240,   241,   242,   243,
-   244,   245,   246,   247,     0,   265,     0,   248,   249,   250,
-   252,   253,   254,   256,   257,   258,   259,   260,   261,   262,
-   263,   131
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -138
+static const short int yypact[] =
+{
+     -15,   -80,   -47,   -44,  -138,  -138,   -40,   -38,    32,   -15,
+    -138,   -31,   -21,   -23,   -19,   -18,    91,   163,   -16,   -14,
+    -138,  -138,  -138,  -138,   -17,   -13,   -11,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,   -10,    -9,
+      -4,    -3,    -2,    16,    18,    20,    22,    23,    24,    25,
+      30,    31,    34,    35,    36,    37,    38,    40,    41,    43,
+      45,    46,    47,    48,    50,    51,    52,    56,    58,    91,
+      59,    61,    62,    63,    64,    65,    66,    67,    68,    79,
+      80,    81,    82,    93,    94,   163,    90,    95,    96,  -138,
+    -138,  -138,  -138,    29,    92,    55,    97,    98,    99,   100,
+     103,   -22,     9,   -20,   -64,   104,   105,   106,   107,   110,
+     111,   112,   113,   114,   116,   -64,   -64,   -64,   117,   118,
+     120,   121,   123,   124,  -138,   125,   126,   127,   -88,   123,
+     -58,   -54,   -52,   -35,   -29,   -27,    -6,   126,   -25,   131,
+    -138,  -138,  -138,    11,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,   134,  -138,  -138,  -138,   135,  -138,   132,  -138,
+     134,   136,  -138,   137,  -138,   138,  -138,   139,  -138,   140,
+    -138,   141,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+     135,   142,  -138,  -138,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+      11,   162,   164,   166,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,   167,   -64,   168,   169,   170,   -64,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   123,   165,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,   134,  -138
 };
 
-static const short yycheck[] = {    96,
-   121,   133,    47,    53,    21,    66,    67,    57,    92,    93,
-   107,   108,   109,    22,    23,    24,    33,    92,    93,    92,
-    93,    66,    67,     3,     4,     5,     6,     7,     8,     9,
-    10,    11,    12,    13,    14,    44,    90,    46,    18,    90,
-    20,    34,    90,    92,    93,    25,    26,    27,    28,    42,
-    92,    93,    32,    92,    93,    92,    93,    92,    93,    91,
-    91,    41,    55,    43,    94,    94,    59,    60,    61,    62,
-    94,    91,    91,    53,    54,    91,    56,    90,    90,    94,
-    90,     0,    90,    90,    90,    90,    90,   219,    68,    69,
-    70,    71,    72,    73,    74,    75,    76,    77,    90,    90,
-    90,    90,    82,    83,    84,    85,    86,    87,    88,     3,
-     4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-    90,    15,    16,    90,   245,    90,    90,    90,    90,    90,
-    90,    90,    90,    90,    90,   232,    90,    90,    90,   236,
-    90,    90,    36,    37,    90,    90,    40,    91,    90,    90,
-    90,    90,    90,    90,    48,    90,    50,    51,    90,    90,
-    17,    90,    19,    90,    58,    90,    90,    93,    25,    91,
-    93,    89,    93,    30,    94,    32,    93,    93,    91,    94,
-    74,    38,    39,    93,    78,    79,    80,    81,    45,    93,
-    93,    93,    49,    93,    93,    93,    53,    93,    93,     0,
-    57,    93,    93,    93,    93,    93,    63,    64,    65,    93,
-     6,    94,    93,    93,    91,    94,    89,    93,    93,    93,
-   129,    93,    93,    93,    93,    93,    90,    90,    90,    90,
-    90,    90,    90,    63,    90,    90,    90,    90,    90,    90,
-    90,    90,   219,    91,    -1,    91,    -1,    94,    93,    93,
-    93,    93,    93,    93,    93,    93,    93,    93,    93,    93,
-    93,    79
+/* YYPGOTO[NTERM-NUM].  */
+static const short int yypgoto[] =
+{
+    -138,  -138,  -138,   180,  -138,  -138,  -138,  -138,  -128,   -65,
+    -138,   -12,  -137,  -138,  -138,  -138,  -138,   183,  -138,  -104,
+    -138,    27
 };
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
-/* This file comes from bison-1.28.  */
 
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const unsigned short int yytable[] =
+{
+     163,   190,   153,   154,   188,   189,   229,     1,     2,     3,
+      13,   174,   175,   176,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,   152,   214,   215,   203,     4,
+     157,     5,    20,   160,   191,   192,   204,   161,   193,   194,
+     195,   196,   158,    14,   153,   154,    15,   216,   217,   205,
+      18,   218,    19,   206,   207,   208,   209,   197,   198,   219,
+      22,   220,   221,   199,   200,   201,   202,   211,   212,   222,
+      23,    24,   210,   139,    89,    25,    26,    87,    90,    88,
+      91,    93,     6,     7,    92,   223,    94,    95,    96,   224,
+     225,   226,   227,   229,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    97,   228,    98,    39,
+      99,    40,   100,   101,   102,   103,    41,    42,    43,    44,
+     104,   105,   144,    45,   106,   107,   108,   109,   110,   277,
+     111,   112,    46,   113,    47,   114,   115,   116,   117,   263,
+     118,   119,   120,   267,    48,    49,   121,    50,   122,   146,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,   133,
+     134,   135,   136,    61,    62,    63,    64,    65,    66,    67,
+      71,   140,    72,   137,   138,   145,   141,   142,    73,    21,
+     147,   148,   149,    74,   150,    75,   151,   164,   165,   166,
+     167,    76,    77,   168,   169,   170,   171,   172,    78,   173,
+     177,   178,    79,   179,   180,   183,    80,   181,   184,   185,
+      81,   187,   213,   232,   233,   234,    82,    83,    84,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   123,   259,     0,     0,   278,   258,   260,   261,
+     262,   264,   265,   266,   268,   269,   270,   271,   272,   273,
+     274,   275,   276
+};
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+static const short int yycheck[] =
+{
+     104,   129,    66,    67,    92,    93,   143,    22,    23,    24,
+      90,   115,   116,   117,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    47,    15,    16,    34,    44,
+      21,    46,     0,    53,    92,    93,    42,    57,    92,    93,
+      92,    93,    33,    90,    66,    67,    90,    36,    37,    55,
+      90,    40,    90,    59,    60,    61,    62,    92,    93,    48,
+      91,    50,    51,    92,    93,    92,    93,    92,    93,    58,
+      91,    94,   137,    85,    91,    94,    94,    93,    91,    93,
+      91,    90,    97,    98,    94,    74,    90,    90,    90,    78,
+      79,    80,    81,   230,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    90,    96,    90,    18,
+      90,    20,    90,    90,    90,    90,    25,    26,    27,    28,
+      90,    90,    93,    32,    90,    90,    90,    90,    90,   257,
+      90,    90,    41,    90,    43,    90,    90,    90,    90,   243,
+      90,    90,    90,   247,    53,    54,    90,    56,    90,    94,
+      91,    90,    90,    90,    90,    90,    90,    90,    90,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    90,
+      90,    90,    90,    82,    83,    84,    85,    86,    87,    88,
+      17,    91,    19,    90,    90,    93,    91,    91,    25,     9,
+      93,    93,    93,    30,    94,    32,    93,    93,    93,    93,
+      93,    38,    39,    93,    93,    93,    93,    93,    45,    93,
+      93,    93,    49,    93,    93,    91,    53,    94,    93,    93,
+      57,    94,    91,    89,    89,    93,    63,    64,    65,    93,
+      93,    93,    93,    93,    93,    93,    90,    90,    90,    90,
+      90,    90,    90,    90,    90,    90,    90,    90,    90,    90,
+      90,    90,    69,    91,    -1,    -1,    91,   230,    94,    93,
+      93,    93,    93,    93,    93,    93,    93,    93,    93,    93,
+      93,    93,    93
+};
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,    22,    23,    24,    44,    46,    97,    98,   100,   101,
+     102,   103,   105,    90,    90,    90,   106,   104,    90,    90,
+       0,   102,    91,    91,    94,    94,    94,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    18,
+      20,    25,    26,    27,    28,    32,    41,    43,    53,    54,
+      56,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    82,    83,    84,    85,    86,    87,    88,   111,   112,
+     116,    17,    19,    25,    30,    32,    38,    39,    45,    49,
+      53,    57,    63,    64,    65,   109,   110,    93,    93,    91,
+      91,    91,    94,    90,    90,    90,    90,    90,    90,    90,
+      90,    90,    90,    90,    90,    90,    90,    90,    90,    90,
+      90,    90,    90,    90,    90,    90,    90,    90,    90,    90,
+      90,    90,    90,   116,    91,    90,    90,    90,    90,    90,
+      90,    90,    90,    90,    90,    90,    90,    90,    90,   110,
+      91,    91,    91,   117,    93,    93,    94,    93,    93,    93,
+      94,    93,    47,    66,    67,   114,   118,    21,    33,   113,
+      53,    57,   115,   118,    93,    93,    93,    93,    93,    93,
+      93,    93,    93,    93,   118,   118,   118,    93,    93,    93,
+      93,    94,   107,    91,    93,    93,   108,    94,    92,    93,
+     107,    92,    93,    92,    93,    92,    93,    92,    93,    92,
+      93,    92,    93,    34,    42,    55,    59,    60,    61,    62,
+     108,    92,    93,    91,    15,    16,    36,    37,    40,    48,
+      50,    51,    58,    74,    78,    79,    80,    81,    96,   111,
+     119,   120,    89,    89,    93,    93,    93,    93,    93,    93,
+      93,    93,    90,    90,    90,    90,    90,    90,    90,    90,
+      90,    90,    90,    90,    90,    90,    90,    90,   120,    91,
+      94,    93,    93,   118,    93,    93,    93,   118,    93,    93,
+      93,    93,    93,    93,    93,    93,    93,   107,    91
+};
 
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (N)								\
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (0)
 #endif
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+              (Loc).first_line, (Loc).first_column,	\
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
-#else /* not YYLSP_NEEDED */
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYLEX		yylex(&yylval)
+# define YYLEX yylex ()
 #endif
-#endif /* not YYLSP_NEEDED */
-#endif
 
-/* If nonreentrant, generate the variables here */
+/* Enable debugging if requested.  */
+#if YYDEBUG
 
-#ifndef YYPURE
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr,					\
+                  Type, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short int *bottom, short int *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short int *bottom;
+    short int *top;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
 
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (0)
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
 #endif
+{
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
+}
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (Rule);		\
+} while (0)
 
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
 
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
+
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
 
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
+#if YYERROR_VERBOSE
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  const char *yys = yystr;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  while (*yys++ != '\0')
+    continue;
+
+  return yys - yystr - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+#endif /* YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
 static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
 }
 
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
-#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
 
-#line 217 "/usr/share/bison.simple"
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
 #ifdef YYPARSE_PARAM
-int yyparse (void *);
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
 #else
-int yyparse (void);
+int
+yyparse ()
+    ;
 #endif
 #endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
 
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
+  /* The state stack.  */
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -765,278 +1379,254 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+  goto yysetstate;
 
-  *++yyssp = yystate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-  if (yyssp >= yyss + yystacksize - 1)
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
     {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short int *yyss1 = yyss;
 
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+	short int *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
 
-      if (yyssp >= yyss + yystacksize - 1)
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
 
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
 
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
 yydefault:
-
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-      int i;
+        case 8:
+#line 191 "../config_gram.y"
+    {
+    strncpy(default_programmer, (yyvsp[-1])->value.string, MAX_STR_CONST);
+    default_programmer[MAX_STR_CONST-1] = 0;
+    free_token((yyvsp[-1]));
+  }
+    break;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+  case 9:
+#line 197 "../config_gram.y"
+    {
+    strncpy(default_parallel, (yyvsp[-1])->value.string, PATH_MAX);
+    default_parallel[PATH_MAX-1] = 0;
+    free_token((yyvsp[-1]));
+  }
+    break;
 
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
+  case 10:
+#line 203 "../config_gram.y"
+    {
+    strncpy(default_serial, (yyvsp[-1])->value.string, PATH_MAX);
+    default_serial[PATH_MAX-1] = 0;
+    free_token((yyvsp[-1]));
+  }
+    break;
 
+  case 11:
+#line 208 "../config_gram.y"
+    {
+  	FastWrite = (yyvsp[-1])->value.number;
+  	if (FastWrite != 0) {
+  		fprintf(stderr,"use fast write by default\n");
+  	}
+    free_token((yyvsp[-1]));
+  }
+    break;
 
-  switch (yyn) {
+  case 12:
+#line 216 "../config_gram.y"
+    {
+  	FastVerify = (yyvsp[-1])->value.number;
+  	if (FastVerify != 0) {
+  		fprintf(stderr,"use fast verify by default\n");
+  	}
+    free_token((yyvsp[-1]));
+  }
+    break;
 
-case 7:
-#line 188 "../config_gram.y"
-{
-    strncpy(default_programmer, yyvsp[-1]->value.string, MAX_STR_CONST);
-    default_programmer[MAX_STR_CONST-1] = 0;
-    free_token(yyvsp[-1]);
-  ;
-    break;}
-case 8:
-#line 194 "../config_gram.y"
-{
-    strncpy(default_parallel, yyvsp[-1]->value.string, PATH_MAX);
-    default_parallel[PATH_MAX-1] = 0;
-    free_token(yyvsp[-1]);
-  ;
-    break;}
-case 9:
-#line 200 "../config_gram.y"
-{
-    strncpy(default_serial, yyvsp[-1]->value.string, PATH_MAX);
-    default_serial[PATH_MAX-1] = 0;
-    free_token(yyvsp[-1]);
-  ;
-    break;}
-case 10:
-#line 210 "../config_gram.y"
-{ current_prog = pgm_new();
+  case 13:
+#line 228 "../config_gram.y"
+    { current_prog = pgm_new();
       strcpy(current_prog->config_file, infile);
       current_prog->lineno = lineno;
-    ;
-    break;}
-case 11:
-#line 215 "../config_gram.y"
-{ 
+    }
+    break;
+
+  case 14:
+#line 233 "../config_gram.y"
+    { 
       if (lsize(current_prog->id) == 0) {
         fprintf(stderr,
                 "%s: error at %s:%d: required parameter id not specified\n",
@@ -1050,19 +1640,21 @@
       }
       PUSH(programmers, current_prog); 
       current_prog = NULL; 
-    ;
-    break;}
-case 12:
-#line 235 "../config_gram.y"
-{
+    }
+    break;
+
+  case 15:
+#line 253 "../config_gram.y"
+    {
       current_part = avr_new_part();
       strcpy(current_part->config_file, infile);
       current_part->lineno = lineno;
-    ;
-    break;}
-case 13:
-#line 241 "../config_gram.y"
-{ 
+    }
+    break;
+
+  case 16:
+#line 259 "../config_gram.y"
+    { 
       LNODEID ln;
       AVRMEM * m;
 
@@ -1112,27 +1704,32 @@
 
       PUSH(part_list, current_part); 
       current_part = NULL; 
-    ;
-    break;}
-case 14:
-#line 296 "../config_gram.y"
-{ ladd(string_list, yyvsp[0]); ;
-    break;}
-case 15:
-#line 297 "../config_gram.y"
-{ ladd(string_list, yyvsp[0]); ;
-    break;}
-case 16:
-#line 302 "../config_gram.y"
-{ ladd(number_list, yyvsp[0]); ;
-    break;}
-case 17:
-#line 303 "../config_gram.y"
-{ ladd(number_list, yyvsp[0]); ;
-    break;}
-case 20:
+    }
+    break;
+
+  case 17:
 #line 314 "../config_gram.y"
-{
+    { ladd(string_list, (yyvsp[0])); }
+    break;
+
+  case 18:
+#line 315 "../config_gram.y"
+    { ladd(string_list, (yyvsp[0])); }
+    break;
+
+  case 19:
+#line 320 "../config_gram.y"
+    { ladd(number_list, (yyvsp[0])); }
+    break;
+
+  case 20:
+#line 321 "../config_gram.y"
+    { ladd(number_list, (yyvsp[0])); }
+    break;
+
+  case 23:
+#line 332 "../config_gram.y"
+    {
     { 
       TOKEN * t;
       while (lsize(string_list)) {
@@ -1141,75 +1738,84 @@
         free_token(t);
       }
     }
-  ;
-    break;}
-case 21:
-#line 325 "../config_gram.y"
-{
+  }
+    break;
+
+  case 24:
+#line 343 "../config_gram.y"
+    {
     { 
       par_initpgm(current_prog);
     }
-  ;
-    break;}
-case 22:
-#line 331 "../config_gram.y"
-{
+  }
+    break;
+
+  case 25:
+#line 349 "../config_gram.y"
     {
+    {
       serbb_initpgm(current_prog);
     }
-  ;
-    break;}
-case 23:
-#line 337 "../config_gram.y"
-{
+  }
+    break;
+
+  case 26:
+#line 355 "../config_gram.y"
+    {
     { 
       stk500_initpgm(current_prog);
     }
-  ;
-    break;}
-case 24:
-#line 343 "../config_gram.y"
-{
+  }
+    break;
+
+  case 27:
+#line 361 "../config_gram.y"
     {
+    {
       stk500v2_initpgm(current_prog);
     }
-  ;
-    break;}
-case 25:
-#line 349 "../config_gram.y"
-{
+  }
+    break;
+
+  case 28:
+#line 367 "../config_gram.y"
+    {
     { 
       avr910_initpgm(current_prog);
     }
-  ;
-    break;}
-case 26:
-#line 355 "../config_gram.y"
-{
+  }
+    break;
+
+  case 29:
+#line 373 "../config_gram.y"
+    {
     { 
       butterfly_initpgm(current_prog);
     }
-  ;
-    break;}
-case 27:
-#line 361 "../config_gram.y"
-{
+  }
+    break;
+
+  case 30:
+#line 379 "../config_gram.y"
     {
+    {
       jtagmkII_initpgm(current_prog);
     }
-  ;
-    break;}
-case 28:
-#line 367 "../config_gram.y"
-{
-    strncpy(current_prog->desc, yyvsp[0]->value.string, PGM_DESCLEN);
+  }
+    break;
+
+  case 31:
+#line 385 "../config_gram.y"
+    {
+    strncpy(current_prog->desc, (yyvsp[0])->value.string, PGM_DESCLEN);
     current_prog->desc[PGM_DESCLEN-1] = 0;
-    free_token(yyvsp[0]);
-  ;
-    break;}
-case 29:
-#line 373 "../config_gram.y"
-{
+    free_token((yyvsp[0]));
+  }
+    break;
+
+  case 32:
+#line 391 "../config_gram.y"
+    {
     { 
       TOKEN * t;
       int pin;
@@ -1232,11 +1838,12 @@
         free_token(t);
       }
     }
-  ;
-    break;}
-case 30:
-#line 398 "../config_gram.y"
-{
+  }
+    break;
+
+  case 33:
+#line 416 "../config_gram.y"
+    {
     { 
       TOKEN * t;
       int pin;
@@ -1259,328 +1866,374 @@
         free_token(t);
       }
     }
-  ;
-    break;}
-case 31:
-#line 423 "../config_gram.y"
-{
+  }
+    break;
+
+  case 34:
+#line 441 "../config_gram.y"
     {
-      current_prog->baudrate = yyvsp[0]->value.number;
+    {
+      current_prog->baudrate = (yyvsp[0])->value.number;
     }
-  ;
-    break;}
-case 32:
-#line 429 "../config_gram.y"
-{ free_token(yyvsp[-2]); 
-                                  assign_pin(PIN_AVR_RESET, yyvsp[0], 0); ;
-    break;}
-case 33:
-#line 431 "../config_gram.y"
-{ free_token(yyvsp[-2]); 
-                                  assign_pin(PIN_AVR_SCK, yyvsp[0], 0); ;
-    break;}
-case 34:
-#line 433 "../config_gram.y"
-{ assign_pin(PIN_AVR_MOSI, yyvsp[0], 0); ;
-    break;}
-case 35:
-#line 434 "../config_gram.y"
-{ assign_pin(PIN_AVR_MISO, yyvsp[0], 0); ;
-    break;}
-case 36:
-#line 435 "../config_gram.y"
-{ assign_pin(PIN_LED_ERR, yyvsp[0], 0); ;
-    break;}
-case 37:
-#line 436 "../config_gram.y"
-{ assign_pin(PIN_LED_RDY, yyvsp[0], 0); ;
-    break;}
-case 38:
-#line 437 "../config_gram.y"
-{ assign_pin(PIN_LED_PGM, yyvsp[0], 0); ;
-    break;}
-case 39:
-#line 438 "../config_gram.y"
-{ assign_pin(PIN_LED_VFY, yyvsp[0], 0); ;
-    break;}
-case 40:
-#line 440 "../config_gram.y"
-{ free_token(yyvsp[-3]); 
-                                  assign_pin(PIN_AVR_RESET, yyvsp[0], 1); ;
-    break;}
-case 41:
-#line 442 "../config_gram.y"
-{ free_token(yyvsp[-3]); 
-                                  assign_pin(PIN_AVR_SCK, yyvsp[0], 1); ;
-    break;}
-case 42:
-#line 444 "../config_gram.y"
-{ assign_pin(PIN_AVR_MOSI, yyvsp[0], 1); ;
-    break;}
-case 43:
-#line 445 "../config_gram.y"
-{ assign_pin(PIN_AVR_MISO, yyvsp[0], 1); ;
-    break;}
-case 44:
-#line 446 "../config_gram.y"
-{ assign_pin(PIN_LED_ERR, yyvsp[0], 1); ;
-    break;}
-case 45:
+  }
+    break;
+
+  case 35:
 #line 447 "../config_gram.y"
-{ assign_pin(PIN_LED_RDY, yyvsp[0], 1); ;
-    break;}
-case 46:
-#line 448 "../config_gram.y"
-{ assign_pin(PIN_LED_PGM, yyvsp[0], 1); ;
-    break;}
-case 47:
+    { free_token((yyvsp[-2])); 
+                                  assign_pin(PIN_AVR_RESET, (yyvsp[0]), 0); }
+    break;
+
+  case 36:
 #line 449 "../config_gram.y"
-{ assign_pin(PIN_LED_VFY, yyvsp[0], 1); ;
-    break;}
-case 67:
-#line 488 "../config_gram.y"
-{
-      strncpy(current_part->id, yyvsp[0]->value.string, AVR_IDLEN);
+    { free_token((yyvsp[-2])); 
+                                  assign_pin(PIN_AVR_SCK, (yyvsp[0]), 0); }
+    break;
+
+  case 37:
+#line 451 "../config_gram.y"
+    { assign_pin(PIN_AVR_MOSI, (yyvsp[0]), 0); }
+    break;
+
+  case 38:
+#line 452 "../config_gram.y"
+    { assign_pin(PIN_AVR_MISO, (yyvsp[0]), 0); }
+    break;
+
+  case 39:
+#line 453 "../config_gram.y"
+    { assign_pin(PIN_LED_ERR, (yyvsp[0]), 0); }
+    break;
+
+  case 40:
+#line 454 "../config_gram.y"
+    { assign_pin(PIN_LED_RDY, (yyvsp[0]), 0); }
+    break;
+
+  case 41:
+#line 455 "../config_gram.y"
+    { assign_pin(PIN_LED_PGM, (yyvsp[0]), 0); }
+    break;
+
+  case 42:
+#line 456 "../config_gram.y"
+    { assign_pin(PIN_LED_VFY, (yyvsp[0]), 0); }
+    break;
+
+  case 43:
+#line 458 "../config_gram.y"
+    { free_token((yyvsp[-3])); 
+                                  assign_pin(PIN_AVR_RESET, (yyvsp[0]), 1); }
+    break;
+
+  case 44:
+#line 460 "../config_gram.y"
+    { free_token((yyvsp[-3])); 
+                                  assign_pin(PIN_AVR_SCK, (yyvsp[0]), 1); }
+    break;
+
+  case 45:
+#line 462 "../config_gram.y"
+    { assign_pin(PIN_AVR_MOSI, (yyvsp[0]), 1); }
+    break;
+
+  case 46:
+#line 463 "../config_gram.y"
+    { assign_pin(PIN_AVR_MISO, (yyvsp[0]), 1); }
+    break;
+
+  case 47:
+#line 464 "../config_gram.y"
+    { assign_pin(PIN_LED_ERR, (yyvsp[0]), 1); }
+    break;
+
+  case 48:
+#line 465 "../config_gram.y"
+    { assign_pin(PIN_LED_RDY, (yyvsp[0]), 1); }
+    break;
+
+  case 49:
+#line 466 "../config_gram.y"
+    { assign_pin(PIN_LED_PGM, (yyvsp[0]), 1); }
+    break;
+
+  case 50:
+#line 467 "../config_gram.y"
+    { assign_pin(PIN_LED_VFY, (yyvsp[0]), 1); }
+    break;
+
+  case 70:
+#line 506 "../config_gram.y"
+    {
+      strncpy(current_part->id, (yyvsp[0])->value.string, AVR_IDLEN);
       current_part->id[AVR_IDLEN-1] = 0;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 68:
-#line 495 "../config_gram.y"
-{
-      strncpy(current_part->desc, yyvsp[0]->value.string, AVR_DESCLEN);
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 71:
+#line 513 "../config_gram.y"
+    {
+      strncpy(current_part->desc, (yyvsp[0])->value.string, AVR_DESCLEN);
       current_part->desc[AVR_DESCLEN-1] = 0;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 69:
-#line 501 "../config_gram.y"
-{
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 72:
+#line 519 "../config_gram.y"
     {
+    {
       fprintf(stderr, 
               "%s: error at %s:%d: devicecode is deprecated, use "
               "stk500_devcode instead\n",
               progname, infile, lineno);
       exit(1);
     }
-  ;
-    break;}
-case 70:
-#line 511 "../config_gram.y"
-{
+  }
+    break;
+
+  case 73:
+#line 529 "../config_gram.y"
     {
-      current_part->stk500_devcode = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
+    {
+      current_part->stk500_devcode = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
     }
-  ;
-    break;}
-case 71:
-#line 518 "../config_gram.y"
-{
+  }
+    break;
+
+  case 74:
+#line 536 "../config_gram.y"
     {
-      current_part->avr910_devcode = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
+    {
+      current_part->avr910_devcode = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
     }
-  ;
-    break;}
-case 72:
-#line 526 "../config_gram.y"
-{
-      current_part->chip_erase_delay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 73:
-#line 532 "../config_gram.y"
-{
-      current_part->pagel = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 74:
-#line 538 "../config_gram.y"
-{
-      current_part->bs2 = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 75:
+  }
+    break;
+
+  case 75:
 #line 544 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_DEDICATED)
+    {
+      current_part->chip_erase_delay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 76:
+#line 550 "../config_gram.y"
+    {
+      current_part->pagel = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 77:
+#line 556 "../config_gram.y"
+    {
+      current_part->bs2 = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 78:
+#line 562 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_DEDICATED)
         current_part->reset_disposition = RESET_DEDICATED;
-      else if (yyvsp[0]->primary == K_IO)
+      else if ((yyvsp[0])->primary == K_IO)
         current_part->reset_disposition = RESET_IO;
 
-      free_tokens(2, yyvsp[-2], yyvsp[0]);
-    ;
-    break;}
-case 76:
-#line 554 "../config_gram.y"
-{
-      current_part->timeout = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 77:
-#line 560 "../config_gram.y"
-{
-      current_part->stabdelay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 78:
-#line 566 "../config_gram.y"
-{
-      current_part->cmdexedelay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 79:
+      free_tokens(2, (yyvsp[-2]), (yyvsp[0]));
+    }
+    break;
+
+  case 79:
 #line 572 "../config_gram.y"
-{
-      current_part->synchloops = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 80:
+    {
+      current_part->timeout = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 80:
 #line 578 "../config_gram.y"
-{
-      current_part->bytedelay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 81:
+    {
+      current_part->stabdelay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 81:
 #line 584 "../config_gram.y"
-{
-      current_part->pollvalue = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 82:
+    {
+      current_part->cmdexedelay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 82:
 #line 590 "../config_gram.y"
-{
-      current_part->pollindex = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 83:
+    {
+      current_part->synchloops = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 83:
 #line 596 "../config_gram.y"
-{
-      current_part->predelay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 84:
+    {
+      current_part->bytedelay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 84:
 #line 602 "../config_gram.y"
-{
-      current_part->postdelay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 85:
+    {
+      current_part->pollvalue = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 85:
 #line 608 "../config_gram.y"
-{
-      current_part->pollmethod = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 86:
+    {
+      current_part->pollindex = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 86:
 #line 614 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_YES)
+    {
+      current_part->predelay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 87:
+#line 620 "../config_gram.y"
+    {
+      current_part->postdelay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 88:
+#line 626 "../config_gram.y"
+    {
+      current_part->pollmethod = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 89:
+#line 632 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_YES)
         current_part->flags |= AVRPART_HAS_JTAG;
-      else if (yyvsp[0]->primary == K_NO)
+      else if ((yyvsp[0])->primary == K_NO)
         current_part->flags &= ~AVRPART_HAS_JTAG;
 
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 87:
-#line 624 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_YES)
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 90:
+#line 642 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_YES)
         current_part->flags |= AVRPART_ALLOWFULLPAGEBITSTREAM;
-      else if (yyvsp[0]->primary == K_NO)
+      else if ((yyvsp[0])->primary == K_NO)
         current_part->flags &= ~AVRPART_ALLOWFULLPAGEBITSTREAM;
 
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 88:
-#line 634 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_YES)
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 91:
+#line 652 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_YES)
         current_part->flags |= AVRPART_ENABLEPAGEPROGRAMMING;
-      else if (yyvsp[0]->primary == K_NO)
+      else if ((yyvsp[0])->primary == K_NO)
         current_part->flags &= ~AVRPART_ENABLEPAGEPROGRAMMING;
 
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 89:
-#line 644 "../config_gram.y"
-{
-      current_part->idr = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 90:
-#line 650 "../config_gram.y"
-{
-      current_part->rampz = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 91:
-#line 656 "../config_gram.y"
-{
-      current_part->spmcr = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 92:
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 92:
 #line 662 "../config_gram.y"
-{
-      current_part->eecr = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 93:
+    {
+      current_part->idr = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 93:
 #line 668 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_YES)
+    {
+      current_part->rampz = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 94:
+#line 674 "../config_gram.y"
+    {
+      current_part->spmcr = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 95:
+#line 680 "../config_gram.y"
+    {
+      current_part->eecr = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 96:
+#line 686 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_YES)
         current_part->flags |= AVRPART_SERIALOK;
-      else if (yyvsp[0]->primary == K_NO)
+      else if ((yyvsp[0])->primary == K_NO)
         current_part->flags &= ~AVRPART_SERIALOK;
 
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 94:
-#line 678 "../config_gram.y"
-{
-      if (yyvsp[0]->primary == K_YES) {
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 97:
+#line 696 "../config_gram.y"
+    {
+      if ((yyvsp[0])->primary == K_YES) {
         current_part->flags |= AVRPART_PARALLELOK;
         current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
       }
-      else if (yyvsp[0]->primary == K_NO) {
+      else if ((yyvsp[0])->primary == K_NO) {
         current_part->flags &= ~AVRPART_PARALLELOK;
         current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
       }
-      else if (yyvsp[0]->primary == K_PSEUDO) {
+      else if ((yyvsp[0])->primary == K_PSEUDO) {
         current_part->flags |= AVRPART_PARALLELOK;
         current_part->flags |= AVRPART_PSEUDOPARALLEL;
       }
 
 
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 95:
-#line 697 "../config_gram.y"
-{
-      switch (yyvsp[0]->primary) {
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 98:
+#line 715 "../config_gram.y"
+    {
+      switch ((yyvsp[0])->primary) {
         case K_RESET :
           current_part->retry_pulse = PIN_AVR_RESET;
           break;
@@ -1589,379 +2242,457 @@
           break;
       }
 
-      free_token(yyvsp[-2]);
-    ;
-    break;}
-case 96:
-#line 720 "../config_gram.y"
-{ 
+      free_token((yyvsp[-2]));
+    }
+    break;
+
+  case 99:
+#line 738 "../config_gram.y"
+    { 
       current_mem = avr_new_memtype(); 
-      strcpy(current_mem->desc, strdup(yyvsp[0]->value.string)); 
-      free_token(yyvsp[0]); 
-    ;
-    break;}
-case 97:
-#line 726 "../config_gram.y"
-{ 
+      strcpy(current_mem->desc, strdup((yyvsp[0])->value.string)); 
+      free_token((yyvsp[0])); 
+    }
+    break;
+
+  case 100:
+#line 744 "../config_gram.y"
+    { 
       ladd(current_part->mem, current_mem); 
       current_mem = NULL; 
-    ;
-    break;}
-case 98:
-#line 731 "../config_gram.y"
-{
+    }
+    break;
+
+  case 101:
+#line 749 "../config_gram.y"
+    {
     { 
       int opnum;
       OPCODE * op;
 
-      opnum = which_opcode(yyvsp[-2]);
+      opnum = which_opcode((yyvsp[-2]));
       op = avr_new_opcode();
       parse_cmdbits(op);
       current_part->op[opnum] = op;
 
-      free_token(yyvsp[-2]);
+      free_token((yyvsp[-2]));
     }
-  ;
-    break;}
-case 103:
-#line 760 "../config_gram.y"
-{
-      current_mem->paged = yyvsp[0]->primary == K_YES ? 1 : 0;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 104:
-#line 766 "../config_gram.y"
-{
-      current_mem->size = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 105:
-#line 773 "../config_gram.y"
-{
-      current_mem->page_size = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 106:
-#line 779 "../config_gram.y"
-{
-      current_mem->num_pages = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 107:
-#line 785 "../config_gram.y"
-{
-      current_mem->min_write_delay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 108:
-#line 791 "../config_gram.y"
-{
-      current_mem->max_write_delay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 109:
-#line 797 "../config_gram.y"
-{
-      current_mem->pwroff_after_write = yyvsp[0]->primary == K_YES ? 1 : 0;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 110:
-#line 803 "../config_gram.y"
-{
-      current_mem->readback[0] = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 111:
-#line 809 "../config_gram.y"
-{
-      current_mem->readback[1] = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 112:
-#line 816 "../config_gram.y"
-{
-      current_mem->mode = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 113:
-#line 822 "../config_gram.y"
-{
-      current_mem->delay = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 114:
-#line 828 "../config_gram.y"
-{
-      current_mem->blocksize = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 115:
-#line 834 "../config_gram.y"
-{
-      current_mem->readsize = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 116:
-#line 840 "../config_gram.y"
-{
-      current_mem->pollindex = yyvsp[0]->value.number;
-      free_token(yyvsp[0]);
-    ;
-    break;}
-case 117:
-#line 846 "../config_gram.y"
-{
+  }
+    break;
+
+  case 106:
+#line 778 "../config_gram.y"
+    {
+      current_mem->paged = (yyvsp[0])->primary == K_YES ? 1 : 0;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 107:
+#line 784 "../config_gram.y"
+    {
+      current_mem->size = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 108:
+#line 790 "../config_gram.y"
+    {
+      current_mem->wordsize = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 109:
+#line 796 "../config_gram.y"
+    {
+      current_mem->page_size = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 110:
+#line 802 "../config_gram.y"
+    {
+      current_mem->num_pages = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 111:
+#line 808 "../config_gram.y"
+    {
+      current_mem->min_write_delay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 112:
+#line 814 "../config_gram.y"
+    {
+      current_mem->max_write_delay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 113:
+#line 820 "../config_gram.y"
+    {
+      current_mem->pwroff_after_write = (yyvsp[0])->primary == K_YES ? 1 : 0;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 114:
+#line 826 "../config_gram.y"
+    {
+      current_mem->readback[0] = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 115:
+#line 832 "../config_gram.y"
+    {
+      current_mem->readback[1] = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 116:
+#line 839 "../config_gram.y"
+    {
+      current_mem->mode = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 117:
+#line 845 "../config_gram.y"
+    {
+      current_mem->delay = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 118:
+#line 851 "../config_gram.y"
+    {
+      current_mem->blocksize = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 119:
+#line 857 "../config_gram.y"
+    {
+      current_mem->readsize = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 120:
+#line 863 "../config_gram.y"
+    {
+      current_mem->pollindex = (yyvsp[0])->value.number;
+      free_token((yyvsp[0]));
+    }
+    break;
+
+  case 121:
+#line 869 "../config_gram.y"
+    {
     { 
       int opnum;
       OPCODE * op;
 
-      opnum = which_opcode(yyvsp[-2]);
+      opnum = which_opcode((yyvsp[-2]));
       op = avr_new_opcode();
       parse_cmdbits(op);
       current_mem->op[opnum] = op;
 
-      free_token(yyvsp[-2]);
+      free_token((yyvsp[-2]));
     }
-  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+  }
+    break;
+
+
+      default: break;
+    }
+
+/* Line 1126 of yacc.c.  */
+#line 2426 "../config_gram.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
 
+  YY_STACK_PRINT (yyss, yyssp);
+
   *++yyvsp = yyval;
 
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
+	  int yytype = YYTRANSLATE (yychar);
+	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+	  YYSIZE_T yysize = yysize0;
+	  YYSIZE_T yysize1;
+	  int yysize_overflow = 0;
+	  char *yymsg = 0;
+#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+	  int yyx;
 
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
+#if 0
+	  /* This is so xgettext sees the translatable formats that are
+	     constructed on the fly.  */
+	  YY_("syntax error, unexpected %s");
+	  YY_("syntax error, unexpected %s, expecting %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+	  char *yyfmt;
+	  char const *yyf;
+	  static char const yyunexpected[] = "syntax error, unexpected %s";
+	  static char const yyexpecting[] = ", expecting %s";
+	  static char const yyor[] = " or %s";
+	  char yyformat[sizeof yyunexpected
+			+ sizeof yyexpecting - 1
+			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+			   * (sizeof yyor - 1))];
+	  char const *yyprefix = yyexpecting;
+
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 1;
+
+	  yyarg[0] = yytname[yytype];
+	  yyfmt = yystpcpy (yyformat, yyunexpected);
+
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      {
+		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+		  {
+		    yycount = 1;
+		    yysize = yysize0;
+		    yyformat[sizeof yyunexpected - 1] = '\0';
+		    break;
+		  }
+		yyarg[yycount++] = yytname[yyx];
+		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+		yysize_overflow |= yysize1 < yysize;
+		yysize = yysize1;
+		yyfmt = yystpcpy (yyfmt, yyprefix);
+		yyprefix = yyor;
+	      }
+
+	  yyf = YY_(yyformat);
+	  yysize1 = yysize + yystrlen (yyf);
+	  yysize_overflow |= yysize1 < yysize;
+	  yysize = yysize1;
+
+	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+	    yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg)
 	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
+	      /* Avoid sprintf, as that infringes on the user's name space.
+		 Don't have undefined behavior even if the translation
+		 produced a string with the wrong number of "%s"s.  */
+	      char *yyp = yymsg;
+	      int yyi = 0;
+	      while ((*yyp = *yyf))
 		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+	yyerror (YY_("syntax error"));
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
 
+
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+        {
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+        }
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-  goto yyerrhandle;
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (0)
+     goto yyerrorlab;
 
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  for (;;)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-yyerrhandle:
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
+
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  while (yyssp != yyss)
     {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK;
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 862 "../config_gram.y"
 
 
+#line 885 "../config_gram.y"
+
+
 #if 0
 static char * vtypestr(int type)
 {
@@ -2130,3 +2861,4 @@
 }
 
 
+
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.h
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.h	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.h	(working copy)
@@ -1,99 +1,241 @@
-#ifndef YYSTYPE
-#define YYSTYPE int
+/* A Bison parser, made by GNU Bison 2.1.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     K_READ = 258,
+     K_WRITE = 259,
+     K_READ_LO = 260,
+     K_READ_HI = 261,
+     K_WRITE_LO = 262,
+     K_WRITE_HI = 263,
+     K_LOADPAGE_LO = 264,
+     K_LOADPAGE_HI = 265,
+     K_WRITEPAGE = 266,
+     K_CHIP_ERASE = 267,
+     K_PGM_ENABLE = 268,
+     K_MEMORY = 269,
+     K_PAGE_SIZE = 270,
+     K_PAGED = 271,
+     K_BAUDRATE = 272,
+     K_BS2 = 273,
+     K_BUFF = 274,
+     K_CHIP_ERASE_DELAY = 275,
+     K_DEDICATED = 276,
+     K_DEFAULT_PARALLEL = 277,
+     K_DEFAULT_PROGRAMMER = 278,
+     K_DEFAULT_SERIAL = 279,
+     K_DESC = 280,
+     K_DEVICECODE = 281,
+     K_STK500_DEVCODE = 282,
+     K_AVR910_DEVCODE = 283,
+     K_EEPROM = 284,
+     K_ERRLED = 285,
+     K_FLASH = 286,
+     K_ID = 287,
+     K_IO = 288,
+     K_JTAG_MKII = 289,
+     K_LOADPAGE = 290,
+     K_MAX_WRITE_DELAY = 291,
+     K_MIN_WRITE_DELAY = 292,
+     K_MISO = 293,
+     K_MOSI = 294,
+     K_NUM_PAGES = 295,
+     K_PAGEL = 296,
+     K_PAR = 297,
+     K_PARALLEL = 298,
+     K_PART = 299,
+     K_PGMLED = 300,
+     K_PROGRAMMER = 301,
+     K_PSEUDO = 302,
+     K_PWROFF_AFTER_WRITE = 303,
+     K_RDYLED = 304,
+     K_READBACK_P1 = 305,
+     K_READBACK_P2 = 306,
+     K_READMEM = 307,
+     K_RESET = 308,
+     K_RETRY_PULSE = 309,
+     K_SERBB = 310,
+     K_SERIAL = 311,
+     K_SCK = 312,
+     K_SIZE = 313,
+     K_STK500 = 314,
+     K_STK500V2 = 315,
+     K_AVR910 = 316,
+     K_BUTTERFLY = 317,
+     K_TYPE = 318,
+     K_VCC = 319,
+     K_VFYLED = 320,
+     K_NO = 321,
+     K_YES = 322,
+     K_TIMEOUT = 323,
+     K_STABDELAY = 324,
+     K_CMDEXEDELAY = 325,
+     K_SYNCHLOOPS = 326,
+     K_BYTEDELAY = 327,
+     K_POLLVALUE = 328,
+     K_POLLINDEX = 329,
+     K_PREDELAY = 330,
+     K_POSTDELAY = 331,
+     K_POLLMETHOD = 332,
+     K_MODE = 333,
+     K_DELAY = 334,
+     K_BLOCKSIZE = 335,
+     K_READSIZE = 336,
+     K_ALLOWFULLPAGEBITSTREAM = 337,
+     K_ENABLEPAGEPROGRAMMING = 338,
+     K_HAS_JTAG = 339,
+     K_IDR = 340,
+     K_RAMPZ = 341,
+     K_SPMCR = 342,
+     K_EECR = 343,
+     TKN_COMMA = 344,
+     TKN_EQUAL = 345,
+     TKN_SEMI = 346,
+     TKN_TILDE = 347,
+     TKN_NUMBER = 348,
+     TKN_STRING = 349,
+     TKN_ID = 350,
+     K_WORD_SIZE = 351,
+     K_DEFAULT_FASTWRITE = 352,
+     K_DEFAULT_FASTVERIFY = 353
+   };
 #endif
-#define	K_READ	257
-#define	K_WRITE	258
-#define	K_READ_LO	259
-#define	K_READ_HI	260
-#define	K_WRITE_LO	261
-#define	K_WRITE_HI	262
-#define	K_LOADPAGE_LO	263
-#define	K_LOADPAGE_HI	264
-#define	K_WRITEPAGE	265
-#define	K_CHIP_ERASE	266
-#define	K_PGM_ENABLE	267
-#define	K_MEMORY	268
-#define	K_PAGE_SIZE	269
-#define	K_PAGED	270
-#define	K_BAUDRATE	271
-#define	K_BS2	272
-#define	K_BUFF	273
-#define	K_CHIP_ERASE_DELAY	274
-#define	K_DEDICATED	275
-#define	K_DEFAULT_PARALLEL	276
-#define	K_DEFAULT_PROGRAMMER	277
-#define	K_DEFAULT_SERIAL	278
-#define	K_DESC	279
-#define	K_DEVICECODE	280
-#define	K_STK500_DEVCODE	281
-#define	K_AVR910_DEVCODE	282
-#define	K_EEPROM	283
-#define	K_ERRLED	284
-#define	K_FLASH	285
-#define	K_ID	286
-#define	K_IO	287
-#define	K_JTAG_MKII	288
-#define	K_LOADPAGE	289
-#define	K_MAX_WRITE_DELAY	290
-#define	K_MIN_WRITE_DELAY	291
-#define	K_MISO	292
-#define	K_MOSI	293
-#define	K_NUM_PAGES	294
-#define	K_PAGEL	295
-#define	K_PAR	296
-#define	K_PARALLEL	297
-#define	K_PART	298
-#define	K_PGMLED	299
-#define	K_PROGRAMMER	300
-#define	K_PSEUDO	301
-#define	K_PWROFF_AFTER_WRITE	302
-#define	K_RDYLED	303
-#define	K_READBACK_P1	304
-#define	K_READBACK_P2	305
-#define	K_READMEM	306
-#define	K_RESET	307
-#define	K_RETRY_PULSE	308
-#define	K_SERBB	309
-#define	K_SERIAL	310
-#define	K_SCK	311
-#define	K_SIZE	312
-#define	K_STK500	313
-#define	K_STK500V2	314
-#define	K_AVR910	315
-#define	K_BUTTERFLY	316
-#define	K_TYPE	317
-#define	K_VCC	318
-#define	K_VFYLED	319
-#define	K_NO	320
-#define	K_YES	321
-#define	K_TIMEOUT	322
-#define	K_STABDELAY	323
-#define	K_CMDEXEDELAY	324
-#define	K_SYNCHLOOPS	325
-#define	K_BYTEDELAY	326
-#define	K_POLLVALUE	327
-#define	K_POLLINDEX	328
-#define	K_PREDELAY	329
-#define	K_POSTDELAY	330
-#define	K_POLLMETHOD	331
-#define	K_MODE	332
-#define	K_DELAY	333
-#define	K_BLOCKSIZE	334
-#define	K_READSIZE	335
-#define	K_ALLOWFULLPAGEBITSTREAM	336
-#define	K_ENABLEPAGEPROGRAMMING	337
-#define	K_HAS_JTAG	338
-#define	K_IDR	339
-#define	K_RAMPZ	340
-#define	K_SPMCR	341
-#define	K_EECR	342
-#define	TKN_COMMA	343
-#define	TKN_EQUAL	344
-#define	TKN_SEMI	345
-#define	TKN_TILDE	346
-#define	TKN_NUMBER	347
-#define	TKN_STRING	348
-#define	TKN_ID	349
+/* Tokens.  */
+#define K_READ 258
+#define K_WRITE 259
+#define K_READ_LO 260
+#define K_READ_HI 261
+#define K_WRITE_LO 262
+#define K_WRITE_HI 263
+#define K_LOADPAGE_LO 264
+#define K_LOADPAGE_HI 265
+#define K_WRITEPAGE 266
+#define K_CHIP_ERASE 267
+#define K_PGM_ENABLE 268
+#define K_MEMORY 269
+#define K_PAGE_SIZE 270
+#define K_PAGED 271
+#define K_BAUDRATE 272
+#define K_BS2 273
+#define K_BUFF 274
+#define K_CHIP_ERASE_DELAY 275
+#define K_DEDICATED 276
+#define K_DEFAULT_PARALLEL 277
+#define K_DEFAULT_PROGRAMMER 278
+#define K_DEFAULT_SERIAL 279
+#define K_DESC 280
+#define K_DEVICECODE 281
+#define K_STK500_DEVCODE 282
+#define K_AVR910_DEVCODE 283
+#define K_EEPROM 284
+#define K_ERRLED 285
+#define K_FLASH 286
+#define K_ID 287
+#define K_IO 288
+#define K_JTAG_MKII 289
+#define K_LOADPAGE 290
+#define K_MAX_WRITE_DELAY 291
+#define K_MIN_WRITE_DELAY 292
+#define K_MISO 293
+#define K_MOSI 294
+#define K_NUM_PAGES 295
+#define K_PAGEL 296
+#define K_PAR 297
+#define K_PARALLEL 298
+#define K_PART 299
+#define K_PGMLED 300
+#define K_PROGRAMMER 301
+#define K_PSEUDO 302
+#define K_PWROFF_AFTER_WRITE 303
+#define K_RDYLED 304
+#define K_READBACK_P1 305
+#define K_READBACK_P2 306
+#define K_READMEM 307
+#define K_RESET 308
+#define K_RETRY_PULSE 309
+#define K_SERBB 310
+#define K_SERIAL 311
+#define K_SCK 312
+#define K_SIZE 313
+#define K_STK500 314
+#define K_STK500V2 315
+#define K_AVR910 316
+#define K_BUTTERFLY 317
+#define K_TYPE 318
+#define K_VCC 319
+#define K_VFYLED 320
+#define K_NO 321
+#define K_YES 322
+#define K_TIMEOUT 323
+#define K_STABDELAY 324
+#define K_CMDEXEDELAY 325
+#define K_SYNCHLOOPS 326
+#define K_BYTEDELAY 327
+#define K_POLLVALUE 328
+#define K_POLLINDEX 329
+#define K_PREDELAY 330
+#define K_POSTDELAY 331
+#define K_POLLMETHOD 332
+#define K_MODE 333
+#define K_DELAY 334
+#define K_BLOCKSIZE 335
+#define K_READSIZE 336
+#define K_ALLOWFULLPAGEBITSTREAM 337
+#define K_ENABLEPAGEPROGRAMMING 338
+#define K_HAS_JTAG 339
+#define K_IDR 340
+#define K_RAMPZ 341
+#define K_SPMCR 342
+#define K_EECR 343
+#define TKN_COMMA 344
+#define TKN_EQUAL 345
+#define TKN_SEMI 346
+#define TKN_TILDE 347
+#define TKN_NUMBER 348
+#define TKN_STRING 349
+#define TKN_ID 350
+#define K_WORD_SIZE 351
+#define K_DEFAULT_FASTWRITE 352
+#define K_DEFAULT_FASTVERIFY 353
 
 
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+typedef int YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
 extern YYSTYPE yylval;
+
+
+
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.y
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.y	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/config_gram.y	(working copy)
@@ -165,6 +165,9 @@
 %token TKN_NUMBER
 %token TKN_STRING
 %token TKN_ID
+%token K_WORD_SIZE
+%token K_DEFAULT_FASTWRITE
+%token K_DEFAULT_FASTVERIFY
 
 %start configuration
 
@@ -201,6 +204,21 @@
     strncpy(default_serial, $3->value.string, PATH_MAX);
     default_serial[PATH_MAX-1] = 0;
     free_token($3);
+  } |
+  K_DEFAULT_FASTWRITE TKN_EQUAL TKN_NUMBER TKN_SEMI {
+  	FastWrite = $3->value.number;
+  	if (FastWrite != 0) {
+  		fprintf(stderr,"use fast write by default\n");
+  	}
+    free_token($3);
+  } |
+
+  K_DEFAULT_FASTVERIFY TKN_EQUAL TKN_NUMBER TKN_SEMI {
+  	FastVerify = $3->value.number;
+  	if (FastVerify != 0) {
+  		fprintf(stderr,"use fast verify by default\n");
+  	}
+    free_token($3);
   }
 ;
 
@@ -768,6 +786,11 @@
       free_token($3);
     } |
 
+  K_WORD_SIZE            TKN_EQUAL TKN_NUMBER
+    {
+      current_mem->wordsize = $3->value.number;
+      free_token($3);
+    } |
 
   K_PAGE_SIZE       TKN_EQUAL TKN_NUMBER
     {
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/jtagmkII.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/jtagmkII.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/jtagmkII.c	(working copy)
@@ -1150,14 +1150,16 @@
 
 
 static int jtagmkII_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
-				int page_size, int n_bytes)
+				int page_size, int n_bytes, unsigned long addr)
 {
-  int addr, block_size;
+  int block_size;
   unsigned char *cmd;
   unsigned char *resp;
   int status, tries;
   long otimeout = serial_recv_timeout;
-
+  unsigned long max_addr;
+  unsigned long low_addr;
+  
   if (verbose >= 2)
     fprintf(stderr, "%s: jtagmkII_paged_write(.., %s, %d, %d)\n",
 	    progname, m->desc, page_size, n_bytes);
@@ -1185,11 +1187,14 @@
   if (page_size == 0) page_size = 256;
 
   serial_recv_timeout = 100;
-  for (addr = 0; addr < n_bytes; addr += page_size) {
-    report_progress(addr, n_bytes,NULL);
 
-    if ((n_bytes-addr) < page_size)
-      block_size = n_bytes - addr;
+  max_addr = addr + n_bytes;
+  low_addr = addr;
+  for (addr = addr; addr < max_addr; addr += page_size) {
+    report_progress(addr - low_addr, n_bytes,NULL);
+
+    if ((max_addr-addr) < page_size)
+      block_size = max_addr - addr;
     else
       block_size = page_size;
     if (verbose >= 3)
@@ -1265,13 +1270,15 @@
 }
 
 static int jtagmkII_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
-			       int page_size, int n_bytes)
+			       int page_size, int n_bytes, unsigned long addr)
 {
-  int addr, block_size;
+  int block_size;
   unsigned char cmd[10];
   unsigned char *resp;
   int status, tries;
   long otimeout = serial_recv_timeout;
+  unsigned long max_addr;
+  unsigned long low_addr;
 
   if (verbose >= 2)
     fprintf(stderr, "%s: jtagmkII_paged_load(.., %s, %d, %d)\n",
@@ -1290,11 +1297,13 @@
   }
 
   serial_recv_timeout = 100;
-  for (addr = 0; addr < n_bytes; addr += page_size) {
-    report_progress(addr, n_bytes,NULL);
+  max_addr = addr + n_bytes;
+  low_addr = addr;
+  for (addr = addr; addr < max_addr; addr += page_size) {
+    report_progress(addr-low_addr, n_bytes ,NULL);
 
-    if ((n_bytes-addr) < page_size)
-      block_size = n_bytes - addr;
+    if ((max_addr-addr) < page_size)
+      block_size = max_addr - addr;
     else
       block_size = page_size;
     if (verbose >= 3)
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.c	(working copy)
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  */
 
 #define FLEX_SCANNER
@@ -282,71 +282,73 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 114
-#define YY_END_OF_BUFFER 115
-static yyconst short int yy_accept[552] =
+#define YY_NUM_RULES 117
+#define YY_END_OF_BUFFER 118
+static yyconst short int yy_accept[575] =
     {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,  115,  113,
-      111,  110,    4,    6,  113,  106,    3,  113,    1,    1,
-      108,  107,  113,  113,  113,  113,  113,  113,  113,  113,
-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
-      113,  109,   17,   18,   10,  114,  114,    7,    8,  111,
+        0,    0,    0,    0,    0,    0,    0,    0,  118,  116,
+      114,  113,    4,    6,  116,  109,    3,  116,    1,    1,
+      111,  110,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  112,   17,   18,   10,  117,  117,    7,    8,  114,
         0,    3,    1,    3,    9,    2,    0,    0,    0,    0,
-        0,    0,    0,    0,  112,    0,    0,    0,    0,    0,
-        0,    0,    0,   40,   89,    0,    0,    0,    0,    0,
-        0,  104,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  115,    0,    0,    0,    0,    0,
+        0,    0,    0,   42,   92,    0,    0,    0,    0,    0,
+        0,  107,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,   17,   16,   14,   15,   11,   13,
-       12,    2,    5,    0,    0,    0,    0,    0,   25,    0,
+        0,    0,    0,    0,    0,   17,   16,   14,   15,   11,
+       13,   12,    2,    5,    0,    0,    0,    0,    0,   25,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   41,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   53,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   92,
-        0,    0,    0,    0,    0,    0,    0,    0,   72,    0,
-        0,  105,    0,    0,    0,    0,    0,   26,    0,    0,
-        0,    0,    0,    0,    0,   29,    0,   34,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   46,   84,
+        0,    0,    0,    0,    0,    0,   43,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   56,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       95,    0,    0,    0,    0,    0,    0,    0,    0,   75,
+        0,    0,    0,  108,    0,    0,    0,    0,    0,   26,
+        0,    0,    0,    0,    0,    0,    0,   29,    0,   36,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-       47,    0,    0,    0,   55,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   93,    0,    0,    0,    0,
-       66,    0,    0,    0,    0,    0,   71,    0,    0,    0,
+       48,   87,   49,    0,    0,    0,   58,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   96,    0,    0,
+        0,    0,   69,    0,    0,    0,    0,    0,   74,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   85,    0,    0,    0,    0,   38,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   51,   52,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   59,
-        0,    0,    0,    0,   91,    0,   64,    0,   67,    0,
-        0,    0,    0,    0,   94,    0,   20,    0,   23,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   35,    0,
+        0,    0,    0,    0,   88,    0,    0,    0,    0,   40,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
+       55,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   62,    0,    0,    0,    0,   94,    0,   67,
+        0,   70,    0,    0,    0,    0,    0,    0,   97,    0,
+       20,    0,   23,    0,    0,    0,    0,    0,    0,    0,
 
-       37,    0,    0,    0,    0,   44,    0,    0,    0,    0,
-        0,    0,   56,    0,    0,    0,    0,    0,    0,   90,
-        0,   60,    0,    0,    0,    0,    0,   65,    0,   68,
-        0,    0,   73,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   37,    0,   39,    0,    0,    0,    0,   46,
+        0,    0,    0,    0,    0,    0,   59,    0,    0,    0,
+        0,    0,    0,   93,    0,   63,    0,    0,    0,    0,
+        0,   68,    0,   71,    0,    0,   76,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   96,   95,    0,    0,    0,
-        0,    0,    0,    0,   74,    0,    0,    0,    0,    0,
-        0,   24,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   39,   42,    0,    0,    0,    0,    0,    0,   54,
-
-        0,    0,    0,    0,    0,   81,    0,    0,    0,   87,
-        0,    0,    0,   69,    0,   98,   97,    0,    0,    0,
-       22,   86,   27,   78,    0,    0,   88,    0,    0,    0,
-        0,    0,    0,    0,   48,   49,   50,    0,   80,    0,
-       79,   82,    0,    0,    0,    0,   75,    0,    0,  101,
-        0,    0,  102,    0,    0,    0,    0,   33,    0,    0,
-        0,    0,    0,  103,   83,   57,    0,    0,    0,    0,
-       77,    0,    0,    0,   76,    0,    0,    0,    0,  100,
-       99,    0,    0,    0,   61,   62,   63,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       99,   98,    0,    0,    0,    0,    0,    0,    0,   77,
+        0,    0,    0,    0,    0,    0,    0,   24,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   41,   44,    0,
 
+        0,    0,    0,    0,    0,   57,    0,    0,    0,    0,
+        0,   84,    0,    0,    0,   90,    0,    0,    0,   72,
+        0,    0,  101,  100,    0,    0,    0,   22,   89,   27,
+       81,    0,    0,   91,    0,    0,    0,    0,    0,    0,
+        0,    0,   50,   51,   52,    0,   83,    0,   82,   85,
+        0,    0,    0,    0,   78,    0,    0,   53,  104,    0,
+        0,  105,    0,    0,    0,    0,    0,   35,    0,    0,
+        0,    0,    0,  106,   86,   60,    0,    0,    0,    0,
+       80,    0,    0,    0,   79,    0,    0,    0,    0,    0,
+      103,  102,    0,    0,    0,   64,   65,   66,    0,    0,
+
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   21,    0,    0,    0,   32,    0,    0,    0,    0,
-       70,    0,    0,    0,    0,    0,   43,   45,    0,    0,
-       28,   30,    0,    0,    0,    0,    0,    0,    0,    0,
-       31,    0,   58,    0,    0,    0,    0,    0,   36,   19,
-        0
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   21,    0,    0,    0,    0,
+        0,   32,    0,    0,    0,    0,   73,    0,    0,    0,
+        0,    0,    0,    0,   45,   47,    0,    0,   28,    0,
+        0,   30,    0,    0,    0,    0,    0,   33,    0,    0,
+        0,    0,   34,   31,    0,   61,    0,    0,    0,    0,
+        0,   38,   19,    0
     } ;
 
 static yyconst int yy_ec[256] =
@@ -390,137 +392,143 @@
         1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst short int yy_base[559] =
+static yyconst short int yy_base[582] =
     {   0,
-        0,    0,   46,   48,    0,    0,  625,  624,  626,  629,
-      623,  629,  629,  629,   46,  629,   45,  618,   55,   59,
-      629,  629,   20,   42,   60,  596,   53,  588,  598,   57,
-      579,  582,   70,   44,   73,   82,   89,   60,   90,  579,
-      590,  629,    0,  629,  629,   95,  629,  629,  629,  614,
-       78,  126,  134,  140,  629,  146,    0,  581,  575,   62,
-      576,  599,   38,  570,  629,  579,  583,  137,   86,  585,
-      568,  583,  565,  565,  629,  580,  579,  556,  565,   63,
-      138,  629,  564,   93,  563,  132,  142,  570,  557,  560,
-      548,  144,  560,  553,  544,  555,  150,  553,  553,  549,
+        0,    0,   46,   48,    0,    0,  648,  647,  649,  652,
+      646,  652,  652,  652,   46,  652,   45,  641,   55,   59,
+      652,  652,   20,   42,   60,  619,   53,  611,  621,   57,
+      602,  605,   70,   44,   73,   82,   89,   60,   90,   48,
+      614,  652,    0,  652,  652,   95,  652,  652,  652,  638,
+      115,  126,  134,  140,  652,  146,    0,  605,  599,   62,
+      600,  623,   38,  594,  652,  603,  607,  137,  141,  609,
+      592,  607,  589,  589,  652,  604,  603,  580,  589,   63,
+       85,  652,  588,  135,  587,   92,  141,  594,  581,  584,
+      572,  144,  584,  577,  568,  579,  149,  577,  577,  573,
 
-      561,  539,  553,  543,    0,  629,  629,  629,  629,  629,
-      629,  175,    0,  545,  565,  547,  553,  553,  629,  549,
-      535,  548,  536,  546,  541,  548,  547,  544,  537,  528,
-      527,  541,  530,  523,  540,  629,  532,  534,  537,  521,
-      535,  519,  528,  523,  531,  525,  103,   99,  517,  509,
-      523,  519,  505,  509,  507,  510,  517,  515,  502,  629,
-      144,  513,  514,  514,  522,  511,  508,  507,  629,  499,
-      491,  629,  487,  518,  154,  490,  495,  629,  500,  500,
-      503,  479,  498,  480,  475,  629,  495,  629,  482,  484,
-      490,  486,  483,  479,  475,  468,  472,  466,  629,  629,
+      585,  563,  569,  576,  566,    0,  652,  652,  652,  652,
+      652,  652,  175,    0,  568,  588,  570,  576,  576,  652,
+      572,  558,  571,  559,  569,  564,  571,  570,  567,  560,
+      551,  550,  564,  553,  546,  563,  652,  555,  557,  560,
+      544,  558,  542,  551,  546,  554,  548,  152,   99,  540,
+      532,  546,  542,  528,  532,  530,  533,  540,  538,  525,
+      652,  145,  536,  537,  537,  545,  534,  531,  530,  652,
+      522,  529,  513,  652,  509,  540,  170,  512,  517,  652,
+      522,  522,  525,  501,  520,  502,  497,  652,  517,  652,
+      504,  506,  512,  508,  505,  501,  497,  490,  494,  488,
 
-      629,  158,  171,  475,  629,  481,  480,  163,  480,  478,
-      465,  477,  474,  454,  473,  177,  458,  452,  473,  473,
-      629,  456,  468,  482,  462,  454,  629,  463,  462,  460,
-      476,  446,  459,  461,  443,  443,  454,  453,  452,  455,
-      443,  629,  449,  440,  447,  447,  629,  431,  438,  447,
-      430,  422,  428,  443,  442,  424,  629,  629,  429,  426,
-      435,  424,  432,  435,  430,  422,  432,  417,  425,  629,
-      426,   95,  428,  419,  629,  427,  629,  414,  629,  420,
-      435,  411,  402,  417,  170,  400,  419,  409,  629,  398,
-      407,  409,  402,  396,  408,  392,  391,  406,  629,  392,
+      652,  652,  652,  157,  172,  497,  652,  503,  502,  165,
+      502,  500,  487,  499,  496,  476,  495,  177,  480,  474,
+      495,  495,  652,  478,  490,  504,  484,  476,  652,  485,
+      489,  483,  481,  497,  467,  480,  482,  464,  464,  475,
+      474,  473,  476,  464,  652,  470,  461,  468,  468,  652,
+      452,  459,  468,  451,  443,  449,  464,  463,  445,  652,
+      652,  450,  447,  456,  445,  453,  456,  451,  443,  453,
+      438,  446,  652,  447,  173,  449,  440,  652,  448,  652,
+      435,  652,  441,  456,  432,  423,  438,  423,  106,  420,
+      439,  429,  652,  418,  427,  429,  422,  416,  428,  412,
 
-      629,  406,  397,  398,  395,  629,  394,  388,  394,  391,
-      394,  397,  629,  393,  377,  383,  382,  392,  379,  629,
-      391,  629,  381,  374,  385,  362,  370,  629,  373,  152,
-      369,  364,  629,  170,  381,  369,  376,  354,  373,  352,
-      364,  374,  373,  368,  367,  371,  355,  368,  361,  358,
-      361,  346,  345,  352,  357,  336,  348,  357,  353,  349,
-      336,  354,  330,  340,  351,  629,  629,  340,  345,  329,
-      347,  343,  355,  330,  629,  335,  328,  335,  329,  335,
-      334,  629,  333,  313,  312,  317,  322,  329,  169,  328,
-      324,  629,  629,  330,  324,  323,  309,  308,  320,  629,
+      411,  426,  652,  412,  652,  426,  417,  418,  415,  652,
+      414,  408,  414,  411,  414,  417,  652,  413,  397,  403,
+      402,  412,  399,  652,  411,  652,  401,  394,  405,  382,
+      390,  652,  393,  161,  389,  384,  652,  393,  175,  400,
+      388,  395,  373,  392,  371,  383,  393,  392,  387,  386,
+      390,  374,  387,  380,  377,  380,  365,  364,  371,  376,
+      355,  367,  376,  372,  368,  355,  373,  349,  359,  370,
+      652,  652,  359,  364,  348,  366,  362,  374,  349,  652,
+      338,  353,  346,  353,  347,  353,  352,  652,  351,  331,
+      330,  335,  340,  347,  174,  346,  342,  652,  652,  348,
 
-      312,  300,  307,  316,  296,  629,  314,  312,  317,  629,
-      304,  291,  309,  629,  297,  629,  629,  307,  295,  289,
-      629,  629,  629,  629,  304,  307,  629,  179,  302,  301,
-      300,  180,  304,  303,  629,  629,  629,  297,  629,  297,
-      629,  629,  283,  280,  282,  279,  629,  275,  277,  629,
-      293,  290,  292,  267,  273,  274,  271,  629,  271,  277,
-      270,  280,  279,  629,  629,  629,  277,  199,  276,  277,
-      629,  272,  263,  273,  629,  275,  268,  265,  256,  629,
-      629,  267,  266,  253,  629,  629,  629,  254,  263,  263,
-      261,  253,  247,  262,  247,  249,  248,  259,  254,  255,
+      342,  341,  327,  326,  338,  652,  330,  318,  325,  334,
+      314,  652,  332,  330,  335,  652,  322,  309,  327,  652,
+      315,  325,  652,  652,  324,  312,  306,  652,  652,  652,
+      652,  321,  324,  652,  323,  187,  318,  317,  316,  181,
+      320,  319,  652,  652,  652,  313,  652,  313,  652,  652,
+      299,  296,  298,  295,  652,  291,  293,  652,  652,  309,
+      306,  308,  283,  288,  288,  289,  286,  652,  286,  292,
+      285,  295,  294,  652,  652,  652,  292,  206,  291,  292,
+      652,  287,  278,  288,  652,  272,  289,  282,  279,  270,
+      652,  652,  281,  280,  267,  652,  652,  652,  268,  277,
 
-      251,  243,  242,  252,  240,  244,  249,  248,  226,  242,
-      237,  629,  244,  239,  230,  629,  225,  217,  216,  222,
-      629,  219,  213,  224,  222,  233,  629,  629,  224,  214,
-      629,  629,  226,  217,  210,  209,  210,  213,  210,  177,
-      629,  184,  629,  186,  167,  147,   99,   43,  629,  629,
-      629,  218,  223,  228,  231,  235,  240,  242
+      277,  275,  177,  267,  261,  276,  261,  263,  262,  273,
+      268,  269,  265,  257,  263,  250,  254,  264,  252,  256,
+      261,  260,  238,  254,  249,  652,  256,  239,  246,  249,
+      240,  652,  235,  227,  226,  232,  652,  229,  223,  237,
+      226,  232,  230,  241,  652,  652,  232,  222,  652,  233,
+      233,  652,  232,  223,  216,  215,  199,  652,  186,  189,
+      196,  183,  652,  652,  185,  652,  186,  137,  147,  100,
+       43,  652,  652,  652,  226,  231,  236,  239,  243,  248,
+      250
     } ;
 
-static yyconst short int yy_def[559] =
+static yyconst short int yy_def[582] =
     {   0,
-      551,    1,  552,  552,  553,  553,  554,  554,  551,  551,
-      551,  551,  551,  551,  555,  551,  551,  551,  555,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  556,  551,  551,  557,  551,  551,  551,  551,
-      555,  551,  551,  551,  551,  551,  558,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      574,    1,  575,  575,  576,  576,  577,  577,  574,  574,
+      574,  574,  574,  574,  578,  574,  574,  574,  578,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  579,  574,  574,  580,  574,  574,  574,  574,
+      578,  574,  574,  574,  574,  574,  581,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
 
-      551,  551,  551,  551,  556,  551,  551,  551,  551,  551,
-      551,  551,  558,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      574,  574,  574,  574,  574,  579,  574,  574,  574,  574,
+      574,  574,  574,  581,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-        0,  551,  551,  551,  551,  551,  551,  551
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,    0,  574,  574,  574,  574,  574,  574,
+      574
     } ;
 
-static yyconst short int yy_nxt[678] =
+static yyconst short int yy_nxt[701] =
     {   0,
        10,   11,   12,   13,   14,   10,   15,   16,   17,   18,
        19,   20,   20,   20,   20,   20,   10,   21,   22,   10,
@@ -528,77 +536,80 @@
        30,   31,   10,   32,   33,   34,   10,   35,   36,   37,
        38,   10,   39,   40,   10,   41,   10,   42,   44,   45,
        44,   45,   51,   58,   52,   54,   54,   54,   54,   54,
-       54,  551,   59,   56,   60,  120,   46,   56,   46,   53,
-       53,   53,   53,   53,   53,   61,   65,  550,  121,   69,
-       82,   62,   74,   63,   51,   83,   52,   64,   70,   66,
-       99,   71,   78,   75,   67,   84,   79,  116,  141,   57,
+       54,  574,   59,   56,   60,  121,   46,   56,   46,   53,
+       53,   53,   53,   53,   53,   61,   65,  573,  122,   69,
+       82,   62,   74,   63,  103,   83,  104,   64,   70,   66,
+       99,   71,   78,   75,   67,   84,   79,  117,  142,   57,
 
-       80,   85,  142,  117,   90,  100,   81,   91,   92,   86,
-      130,   87,   88,   93,  101,   94,   89,  102,  107,   95,
-      206,  146,  108,  131,  323,  204,   96,  549,  324,   97,
-      109,  147,  207,  110,   98,  111,   54,   54,   54,   54,
-       54,   54,   56,  205,   53,   53,   53,   53,   53,   53,
-       54,   54,   54,   54,   54,   54,  112,  112,  112,  112,
-      112,  112,  125,  143,  126,  149,  157,  219,  151,  548,
-      127,  150,  164,  372,  220,  232,  128,  144,  152,  129,
-      233,  254,  165,  158,  159,  112,  112,  112,  112,  112,
-      112,  334,  256,  262,  373,  255,  257,  263,  272,  376,
+       80,   85,  143,  118,   90,  100,   81,   91,   92,   86,
+      144,   87,   88,   93,  101,   94,   89,  102,  108,   95,
+      208,   51,  109,   52,  145,  150,   96,  339,  572,   97,
+      110,  151,  209,  111,   98,  112,   54,   54,   54,   54,
+       54,   54,   56,  340,   53,   53,   53,   53,   53,   53,
+       54,   54,   54,   54,   54,   54,  113,  113,  113,  113,
+      113,  113,  126,  147,  127,  131,  158,  152,  221,  571,
+      128,  165,  570,  148,  206,  222,  129,  153,  132,  130,
+      257,  166,  377,  159,  160,  113,  113,  113,  113,  113,
+      113,  235,  207,  259,  258,  265,  236,  260,  275,  266,
 
-      273,  455,  547,  377,  258,  264,  428,  335,  429,  460,
-      485,  486,  546,  461,  545,  544,  274,  456,   43,   43,
-       43,   43,   43,   47,   47,   47,   47,   47,   48,   48,
-       48,   48,   48,   53,   53,  105,  543,  105,  105,  105,
-      106,  106,  106,  106,  106,  113,  113,  542,  541,  540,
-      539,  538,  537,  536,  535,  534,  533,  532,  531,  530,
-      529,  528,  527,  526,  525,  524,  523,  522,  521,  520,
-      519,  518,  517,  516,  515,  514,  513,  512,  511,  510,
-      509,  508,  507,  506,  505,  504,  503,  502,  501,  500,
-      499,  498,  497,  496,  495,  494,  493,  492,  491,  490,
+      276,  435,  327,  378,  382,  261,  328,  267,  383,  465,
+      470,  436,  569,  437,  471,  568,  277,  496,  497,  515,
+      516,  567,  566,  565,  564,  466,   43,   43,   43,   43,
+       43,   47,   47,   47,   47,   47,   48,   48,   48,   48,
+       48,   53,   53,  106,  563,  106,  106,  106,  107,  107,
+      107,  107,  107,  114,  114,  562,  561,  560,  559,  558,
+      557,  556,  555,  554,  553,  552,  551,  550,  549,  548,
+      547,  546,  545,  544,  543,  542,  541,  540,  539,  538,
+      537,  536,  535,  534,  533,  532,  531,  530,  529,  528,
+      527,  526,  525,  524,  523,  522,  521,  520,  519,  518,
 
-      489,  488,  487,  484,  483,  482,  481,  480,  479,  478,
-      477,  476,  475,  474,  473,  472,  471,  470,  469,  468,
-      467,  466,  465,  464,  463,  462,  459,  458,  457,  454,
-      453,  452,  451,  450,  449,  448,  447,  446,  445,  444,
-      443,  442,  441,  440,  439,  438,  437,  436,  435,  434,
-      433,  432,  431,  430,  427,  426,  425,  424,  423,  422,
-      421,  420,  419,  418,  417,  416,  415,  414,  413,  412,
-      411,  410,  409,  408,  407,  406,  405,  404,  403,  402,
-      401,  400,  399,  398,  397,  396,  395,  394,  393,  392,
-      391,  390,  389,  388,  387,  386,  385,  384,  383,  382,
+      517,  514,  513,  512,  511,  510,  509,  508,  507,  506,
+      505,  504,  503,  502,  501,  500,  499,  498,  495,  494,
+      493,  492,  491,  490,  489,  488,  487,  486,  485,  484,
+      483,  482,  481,  480,  479,  478,  477,  476,  475,  474,
+      473,  472,  469,  468,  467,  464,  463,  462,  461,  460,
+      459,  458,  457,  456,  455,  454,  453,  452,  451,  450,
+      449,  448,  447,  446,  445,  444,  443,  442,  441,  440,
+      439,  438,  434,  433,  432,  431,  430,  429,  428,  427,
+      426,  425,  424,  423,  422,  421,  420,  419,  418,  417,
+      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
 
-      381,  380,  379,  378,  375,  374,  371,  370,  369,  368,
-      367,  366,  365,  364,  363,  362,  361,  360,  359,  358,
-      357,  356,  355,  354,  353,  352,  351,  350,  349,  348,
-      347,  346,  345,  344,  343,  342,  341,  340,  339,  338,
-      337,  336,  333,  332,  331,  330,  329,  328,  327,  326,
-      325,  322,  321,  320,  319,  318,  317,  316,  315,  314,
-      313,  312,  311,  310,  309,  308,  307,  306,  305,  304,
-      303,  302,  301,  300,  299,  298,  297,  296,  295,  294,
-      293,  292,  291,  290,  289,  288,  287,  286,  285,  284,
-      283,  282,  281,  280,  279,  278,  277,  276,  275,  271,
+      406,  405,  404,  403,  402,  401,  400,  399,  398,  397,
+      396,  395,  394,  393,  392,  391,  390,  389,  388,  387,
+      386,  385,  384,  381,  380,  379,  376,  375,  374,  373,
+      372,  371,  370,  369,  368,  367,  366,  365,  364,  363,
+      362,  361,  360,  359,  358,  357,  356,  355,  354,  353,
+      352,  351,  350,  349,  348,  347,  346,  345,  344,  343,
+      342,  341,  338,  337,  336,  335,  334,  333,  332,  331,
+      330,  329,  326,  325,  324,  323,  322,  321,  320,  319,
+      318,  317,  316,  315,  314,  313,  312,  311,  310,  309,
+      308,  307,  306,  305,  304,  303,  302,  301,  300,  299,
 
-      270,  269,  268,  267,  266,  265,  261,  260,  259,  253,
-      252,  251,  250,  249,  248,  247,  246,  245,  244,  243,
-      242,  241,  240,  239,  238,  237,  236,  235,  234,  231,
-      230,  229,  228,  227,  226,  225,  224,  223,  222,  221,
-      218,  217,  216,  215,  214,  213,  212,  211,  210,  209,
-      208,  203,  202,  201,  200,  199,  198,  197,  196,  195,
-      194,  193,  192,  191,  190,  189,  188,  187,  186,  185,
-      184,  183,  182,  181,  180,  179,  178,  177,  176,  175,
-      174,  173,  172,  171,  170,  169,  168,  167,  166,  163,
-      162,  161,  160,  156,  155,  154,  153,  148,  145,  140,
+      298,  297,  296,  295,  294,  293,  292,  291,  290,  289,
+      288,  287,  286,  285,  284,  283,  282,  281,  280,  279,
+      278,  274,  273,  272,  271,  270,  269,  268,  264,  263,
+      262,  256,  255,  254,  253,  252,  251,  250,  249,  248,
+      247,  246,  245,  244,  243,  242,  241,  240,  239,  238,
+      237,  234,  233,  232,  231,  230,  229,  228,  227,  226,
+      225,  224,  223,  220,  219,  218,  217,  216,  215,  214,
+      213,  212,  211,  210,  205,  204,  203,  202,  201,  200,
+      199,  198,  197,  196,  195,  194,  193,  192,  191,  190,
+      189,  188,  187,  186,  185,  184,  183,  182,  181,  180,
 
-      139,  138,  137,  136,  135,  134,  133,  132,  124,  123,
-      122,  119,  118,  115,  114,   50,  104,  103,   77,   76,
-       73,   72,   68,   55,   50,  551,   49,   49,    9,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551
+      179,  178,  177,  176,  175,  174,  173,  172,  171,  170,
+      169,  168,  167,  164,  163,  162,  161,  157,  156,  155,
+      154,  149,  146,  141,  140,  139,  138,  137,  136,  135,
+      134,  133,  125,  124,  123,  120,  119,  116,  115,   50,
+      105,   77,   76,   73,   72,   68,   55,   50,  574,   49,
+       49,    9,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574
+
     } ;
 
-static yyconst short int yy_chk[678] =
+static yyconst short int yy_chk[701] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -607,73 +618,76 @@
         1,    1,    1,    1,    1,    1,    1,    1,    3,    3,
         4,    4,   15,   23,   15,   17,   17,   17,   17,   17,
        17,   19,   23,   19,   24,   63,    3,   20,    4,   20,
-       20,   20,   20,   20,   20,   24,   25,  548,   63,   27,
-       34,   24,   30,   24,   51,   34,   51,   24,   27,   25,
+       20,   20,   20,   20,   20,   24,   25,  571,   63,   27,
+       34,   24,   30,   24,   40,   34,   40,   24,   27,   25,
        38,   27,   33,   30,   25,   35,   33,   60,   80,   19,
 
        33,   35,   80,   60,   36,   38,   33,   36,   36,   35,
-       69,   35,   35,   37,   39,   37,   35,   39,   46,   37,
-      148,   84,   46,   69,  272,  147,   37,  547,  272,   37,
-       46,   84,  148,   46,   37,   46,   52,   52,   52,   52,
-       52,   52,   53,  147,   53,   53,   53,   53,   53,   53,
+       81,   35,   35,   37,   39,   37,   35,   39,   46,   37,
+      149,   51,   46,   51,   81,   86,   37,  289,  570,   37,
+       46,   86,  149,   46,   37,   46,   52,   52,   52,   52,
+       52,   52,   53,  289,   53,   53,   53,   53,   53,   53,
        54,   54,   54,   54,   54,   54,   56,   56,   56,   56,
-       56,   56,   68,   81,   68,   86,   92,  161,   87,  546,
-       68,   86,   97,  330,  161,  175,   68,   81,   87,   68,
-      175,  202,   97,   92,   92,  112,  112,  112,  112,  112,
-      112,  285,  203,  208,  330,  202,  203,  208,  216,  334,
+       56,   56,   68,   84,   68,   69,   92,   87,  162,  569,
+       68,   97,  568,   84,  148,  162,   68,   87,   69,   68,
+      204,   97,  334,   92,   92,  113,  113,  113,  113,  113,
+      113,  177,  148,  205,  204,  210,  177,  205,  218,  210,
 
-      216,  428,  545,  334,  203,  208,  389,  285,  389,  432,
-      468,  468,  544,  432,  542,  540,  216,  428,  552,  552,
-      552,  552,  552,  553,  553,  553,  553,  553,  554,  554,
-      554,  554,  554,  555,  555,  556,  539,  556,  556,  556,
-      557,  557,  557,  557,  557,  558,  558,  538,  537,  536,
-      535,  534,  533,  530,  529,  526,  525,  524,  523,  522,
-      520,  519,  518,  517,  515,  514,  513,  511,  510,  509,
-      508,  507,  506,  505,  504,  503,  502,  501,  500,  499,
-      498,  497,  496,  495,  494,  493,  492,  491,  490,  489,
-      488,  484,  483,  482,  479,  478,  477,  476,  474,  473,
+      218,  395,  275,  334,  339,  205,  275,  210,  339,  436,
+      440,  395,  567,  395,  440,  565,  218,  478,  478,  503,
+      503,  562,  561,  560,  559,  436,  575,  575,  575,  575,
+      575,  576,  576,  576,  576,  576,  577,  577,  577,  577,
+      577,  578,  578,  579,  557,  579,  579,  579,  580,  580,
+      580,  580,  580,  581,  581,  556,  555,  554,  553,  551,
+      550,  548,  547,  544,  543,  542,  541,  540,  539,  538,
+      536,  535,  534,  533,  531,  530,  529,  528,  527,  525,
+      524,  523,  522,  521,  520,  519,  518,  517,  516,  515,
+      514,  513,  512,  511,  510,  509,  508,  507,  506,  505,
 
-      472,  470,  469,  467,  463,  462,  461,  460,  459,  457,
-      456,  455,  454,  453,  452,  451,  449,  448,  446,  445,
-      444,  443,  440,  438,  434,  433,  431,  430,  429,  426,
-      425,  420,  419,  418,  415,  413,  412,  411,  409,  408,
-      407,  405,  404,  403,  402,  401,  399,  398,  397,  396,
-      395,  394,  391,  390,  388,  387,  386,  385,  384,  383,
-      381,  380,  379,  378,  377,  376,  374,  373,  372,  371,
-      370,  369,  368,  365,  364,  363,  362,  361,  360,  359,
-      358,  357,  356,  355,  354,  353,  352,  351,  350,  349,
-      348,  347,  346,  345,  344,  343,  342,  341,  340,  339,
+      504,  502,  501,  500,  499,  495,  494,  493,  490,  489,
+      488,  487,  486,  484,  483,  482,  480,  479,  477,  473,
+      472,  471,  470,  469,  467,  466,  465,  464,  463,  462,
+      461,  460,  457,  456,  454,  453,  452,  451,  448,  446,
+      442,  441,  439,  438,  437,  435,  433,  432,  427,  426,
+      425,  422,  421,  419,  418,  417,  415,  414,  413,  411,
+      410,  409,  408,  407,  405,  404,  403,  402,  401,  400,
+      397,  396,  394,  393,  392,  391,  390,  389,  387,  386,
+      385,  384,  383,  382,  381,  379,  378,  377,  376,  375,
+      374,  373,  370,  369,  368,  367,  366,  365,  364,  363,
 
-      338,  337,  336,  335,  332,  331,  329,  327,  326,  325,
-      324,  323,  321,  319,  318,  317,  316,  315,  314,  312,
-      311,  310,  309,  308,  307,  305,  304,  303,  302,  300,
-      298,  297,  296,  295,  294,  293,  292,  291,  290,  288,
-      287,  286,  284,  283,  282,  281,  280,  278,  276,  274,
-      273,  271,  269,  268,  267,  266,  265,  264,  263,  262,
-      261,  260,  259,  256,  255,  254,  253,  252,  251,  250,
-      249,  248,  246,  245,  244,  243,  241,  240,  239,  238,
-      237,  236,  235,  234,  233,  232,  231,  230,  229,  228,
-      226,  225,  224,  223,  222,  220,  219,  218,  217,  215,
+      362,  361,  360,  359,  358,  357,  356,  355,  354,  353,
+      352,  351,  350,  349,  348,  347,  346,  345,  344,  343,
+      342,  341,  340,  338,  336,  335,  333,  331,  330,  329,
+      328,  327,  325,  323,  322,  321,  320,  319,  318,  316,
+      315,  314,  313,  312,  311,  309,  308,  307,  306,  304,
+      302,  301,  300,  299,  298,  297,  296,  295,  294,  292,
+      291,  290,  288,  287,  286,  285,  284,  283,  281,  279,
+      277,  276,  274,  272,  271,  270,  269,  268,  267,  266,
+      265,  264,  263,  262,  259,  258,  257,  256,  255,  254,
+      253,  252,  251,  249,  248,  247,  246,  244,  243,  242,
 
-      214,  213,  212,  211,  210,  209,  207,  206,  204,  198,
-      197,  196,  195,  194,  193,  192,  191,  190,  189,  187,
-      185,  184,  183,  182,  181,  180,  179,  177,  176,  174,
-      173,  171,  170,  168,  167,  166,  165,  164,  163,  162,
-      159,  158,  157,  156,  155,  154,  153,  152,  151,  150,
-      149,  146,  145,  144,  143,  142,  141,  140,  139,  138,
-      137,  135,  134,  133,  132,  131,  130,  129,  128,  127,
-      126,  125,  124,  123,  122,  121,  120,  118,  117,  116,
-      115,  114,  104,  103,  102,  101,  100,   99,   98,   96,
-       95,   94,   93,   91,   90,   89,   88,   85,   83,   79,
+      241,  240,  239,  238,  237,  236,  235,  234,  233,  232,
+      231,  230,  228,  227,  226,  225,  224,  222,  221,  220,
+      219,  217,  216,  215,  214,  213,  212,  211,  209,  208,
+      206,  200,  199,  198,  197,  196,  195,  194,  193,  192,
+      191,  189,  187,  186,  185,  184,  183,  182,  181,  179,
+      178,  176,  175,  173,  172,  171,  169,  168,  167,  166,
+      165,  164,  163,  160,  159,  158,  157,  156,  155,  154,
+      153,  152,  151,  150,  147,  146,  145,  144,  143,  142,
+      141,  140,  139,  138,  136,  135,  134,  133,  132,  131,
+      130,  129,  128,  127,  126,  125,  124,  123,  122,  121,
 
-       78,   77,   76,   74,   73,   72,   71,   70,   67,   66,
-       64,   62,   61,   59,   58,   50,   41,   40,   32,   31,
-       29,   28,   26,   18,   11,    9,    8,    7,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551
+      119,  118,  117,  116,  115,  105,  104,  103,  102,  101,
+      100,   99,   98,   96,   95,   94,   93,   91,   90,   89,
+       88,   85,   83,   79,   78,   77,   76,   74,   73,   72,
+       71,   70,   67,   66,   64,   62,   61,   59,   58,   50,
+       41,   32,   31,   29,   28,   26,   18,   11,    9,    8,
+        7,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574
+
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -734,7 +748,7 @@
 
 #define comment 3
 
-#line 738 "lexer.c"
+#line 752 "../lexer.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -888,7 +902,7 @@
 #line 53 "../lexer.l"
 
 
-#line 892 "lexer.c"
+#line 906 "../lexer.c"
 
 	if ( yy_init )
 		{
@@ -939,13 +953,13 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 552 )
+				if ( yy_current_state >= 575 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 629 );
+		while ( yy_base[yy_current_state] != 652 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1169,419 +1183,434 @@
 case 33:
 YY_RULE_SETUP
 #line 132 "../lexer.l"
-{ yylval=NULL; return K_DEVICECODE; }
+{ yylval=NULL; return K_DEFAULT_FASTWRITE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 133 "../lexer.l"
-{ yylval=NULL; return K_EECR; }
+{ yylval=NULL; return K_DEFAULT_FASTVERIFY; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 134 "../lexer.l"
-{ yylval=NULL; return K_EEPROM; }
+{ yylval=NULL; return K_DEVICECODE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 135 "../lexer.l"
-{ yylval=NULL; return K_ENABLEPAGEPROGRAMMING; }
+{ yylval=NULL; return K_EECR; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 136 "../lexer.l"
-{ yylval=NULL; return K_ERRLED; }
+{ yylval=NULL; return K_EEPROM; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 137 "../lexer.l"
-{ yylval=NULL; return K_FLASH; }
+{ yylval=NULL; return K_ENABLEPAGEPROGRAMMING; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 138 "../lexer.l"
-{ yylval=NULL; return K_HAS_JTAG; }
+{ yylval=NULL; return K_ERRLED; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 139 "../lexer.l"
-{ yylval=NULL; return K_ID; }
+{ yylval=NULL; return K_FLASH; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 140 "../lexer.l"
-{ yylval=NULL; return K_IDR; }
+{ yylval=NULL; return K_HAS_JTAG; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 141 "../lexer.l"
-{ yylval=NULL; return K_JTAG_MKII; }
+{ yylval=NULL; return K_ID; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 142 "../lexer.l"
-{ yylval=NULL; return K_MAX_WRITE_DELAY; }
+{ yylval=NULL; return K_IDR; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 143 "../lexer.l"
-{ yylval=NULL; return K_MEMORY; }
+{ yylval=NULL; return K_JTAG_MKII; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 144 "../lexer.l"
-{ yylval=NULL; return K_MIN_WRITE_DELAY; }
+{ yylval=NULL; return K_MAX_WRITE_DELAY; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 145 "../lexer.l"
-{ yylval=NULL; return K_MISO; }
+{ yylval=NULL; return K_MEMORY; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 146 "../lexer.l"
-{ yylval=NULL; return K_MOSI; }
+{ yylval=NULL; return K_MIN_WRITE_DELAY; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 147 "../lexer.l"
-{ yylval=NULL; return K_NUM_PAGES; }
+{ yylval=NULL; return K_MISO; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 148 "../lexer.l"
-{ yylval=NULL; return K_NUM_PAGES; }
+{ yylval=NULL; return K_MOSI; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 149 "../lexer.l"
-{ yylval=NULL; return K_PAGE_SIZE; }
+{ yylval=NULL; return K_NUM_PAGES; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 150 "../lexer.l"
-{ yylval=NULL; return K_PAGED; }
+{ yylval=NULL; return K_NUM_PAGES; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 151 "../lexer.l"
-{ yylval=NULL; return K_PAGEL; }
+{ yylval=NULL; return K_PAGE_SIZE; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 152 "../lexer.l"
-{ yylval=NULL; return K_PAR; }
+{ yylval=NULL; return K_WORD_SIZE; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 153 "../lexer.l"
-{ yylval=NULL; return K_PARALLEL; }
+{ yylval=NULL; return K_PAGED; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 154 "../lexer.l"
-{ yylval=NULL; return K_PART; }
+{ yylval=NULL; return K_PAGEL; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 155 "../lexer.l"
-{ yylval=NULL; return K_PGMLED; }
+{ yylval=NULL; return K_PAR; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 156 "../lexer.l"
-{ yylval=NULL; return K_PROGRAMMER; }
+{ yylval=NULL; return K_PARALLEL; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 157 "../lexer.l"
-{ yylval=NULL; return K_PWROFF_AFTER_WRITE; }
+{ yylval=NULL; return K_PART; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 158 "../lexer.l"
-{ yylval=NULL; return K_RAMPZ; }
+{ yylval=NULL; return K_PGMLED; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 159 "../lexer.l"
-{ yylval=NULL; return K_RDYLED; }
+{ yylval=NULL; return K_PROGRAMMER; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 160 "../lexer.l"
-{ yylval=NULL; return K_READBACK_P1; }
+{ yylval=NULL; return K_PWROFF_AFTER_WRITE; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 161 "../lexer.l"
-{ yylval=NULL; return K_READBACK_P2; }
+{ yylval=NULL; return K_RAMPZ; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 162 "../lexer.l"
-{ yylval=NULL; return K_RETRY_PULSE; }
+{ yylval=NULL; return K_RDYLED; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 163 "../lexer.l"
-{ yylval=NULL; return K_SERBB; }
+{ yylval=NULL; return K_READBACK_P1; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 164 "../lexer.l"
-{ yylval=NULL; return K_SERIAL; }
+{ yylval=NULL; return K_READBACK_P2; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 165 "../lexer.l"
-{ yylval=NULL; return K_SIZE; }
+{ yylval=NULL; return K_RETRY_PULSE; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 166 "../lexer.l"
-{ yylval=NULL; return K_SPMCR; }
+{ yylval=NULL; return K_SERBB; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 167 "../lexer.l"
-{ yylval=NULL; return K_STK500; }
+{ yylval=NULL; return K_SERIAL; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 168 "../lexer.l"
-{ yylval=NULL; return K_STK500V2; }
+{ yylval=NULL; return K_SIZE; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 169 "../lexer.l"
-{ yylval=NULL; return K_STK500_DEVCODE; }
+{ yylval=NULL; return K_SPMCR; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 170 "../lexer.l"
-{ yylval=NULL; return K_TYPE; }
+{ yylval=NULL; return K_STK500; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 171 "../lexer.l"
-{ yylval=NULL; return K_VCC; }
+{ yylval=NULL; return K_STK500V2; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 172 "../lexer.l"
-{ yylval=NULL; return K_VFYLED; }
+{ yylval=NULL; return K_STK500_DEVCODE; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 174 "../lexer.l"
-{ yylval=NULL; return K_TIMEOUT; }
+#line 173 "../lexer.l"
+{ yylval=NULL; return K_TYPE; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 175 "../lexer.l"
-{ yylval=NULL; return K_STABDELAY; }
+#line 174 "../lexer.l"
+{ yylval=NULL; return K_VCC; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 176 "../lexer.l"
-{ yylval=NULL; return K_CMDEXEDELAY; }
+#line 175 "../lexer.l"
+{ yylval=NULL; return K_VFYLED; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 177 "../lexer.l"
-{ yylval=NULL; return K_SYNCHLOOPS; }
+{ yylval=NULL; return K_TIMEOUT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 178 "../lexer.l"
-{ yylval=NULL; return K_BYTEDELAY; }
+{ yylval=NULL; return K_STABDELAY; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 179 "../lexer.l"
-{ yylval=NULL; return K_POLLVALUE; }
+{ yylval=NULL; return K_CMDEXEDELAY; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 180 "../lexer.l"
-{ yylval=NULL; return K_POLLINDEX; }
+{ yylval=NULL; return K_SYNCHLOOPS; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 181 "../lexer.l"
-{ yylval=NULL; return K_PREDELAY; }
+{ yylval=NULL; return K_BYTEDELAY; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 182 "../lexer.l"
-{ yylval=NULL; return K_POSTDELAY; }
+{ yylval=NULL; return K_POLLVALUE; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 183 "../lexer.l"
-{ yylval=NULL; return K_POLLMETHOD; }
+{ yylval=NULL; return K_POLLINDEX; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 184 "../lexer.l"
-{ yylval=NULL; return K_MODE; }
+{ yylval=NULL; return K_PREDELAY; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 185 "../lexer.l"
-{ yylval=NULL; return K_DELAY; }
+{ yylval=NULL; return K_POSTDELAY; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 186 "../lexer.l"
-{ yylval=NULL; return K_BLOCKSIZE; }
+{ yylval=NULL; return K_POLLMETHOD; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 187 "../lexer.l"
-{ yylval=NULL; return K_READSIZE; }
+{ yylval=NULL; return K_MODE; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 191 "../lexer.l"
-{ yylval=new_token(K_DEDICATED); return K_DEDICATED; }
+#line 188 "../lexer.l"
+{ yylval=NULL; return K_DELAY; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 192 "../lexer.l"
-{ yylval=new_token(K_IO); return K_IO; }
+#line 189 "../lexer.l"
+{ yylval=NULL; return K_BLOCKSIZE; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
+#line 190 "../lexer.l"
+{ yylval=NULL; return K_READSIZE; }
+	YY_BREAK
+case 91:
+YY_RULE_SETUP
 #line 193 "../lexer.l"
+{ yylval=new_token(K_DEDICATED); return K_DEDICATED; }
+	YY_BREAK
+case 92:
+YY_RULE_SETUP
+#line 194 "../lexer.l"
+{ yylval=new_token(K_IO); return K_IO; }
+	YY_BREAK
+case 93:
+YY_RULE_SETUP
+#line 195 "../lexer.l"
 { yylval=new_token(K_PSEUDO); return K_PSEUDO; }
 	YY_BREAK
-case 91:
+case 94:
 YY_RULE_SETUP
-#line 195 "../lexer.l"
+#line 197 "../lexer.l"
 { yylval=new_token(K_RESET); return K_RESET; }
 	YY_BREAK
-case 92:
+case 95:
 YY_RULE_SETUP
-#line 196 "../lexer.l"
+#line 198 "../lexer.l"
 { yylval=new_token(K_SCK); return K_SCK; }
 	YY_BREAK
-case 93:
+case 96:
 YY_RULE_SETUP
-#line 198 "../lexer.l"
+#line 200 "../lexer.l"
 { yylval=new_token(K_READ); return K_READ; }
 	YY_BREAK
-case 94:
+case 97:
 YY_RULE_SETUP
-#line 199 "../lexer.l"
+#line 201 "../lexer.l"
 { yylval=new_token(K_WRITE); return K_WRITE; }
 	YY_BREAK
-case 95:
+case 98:
 YY_RULE_SETUP
-#line 200 "../lexer.l"
+#line 202 "../lexer.l"
 { yylval=new_token(K_READ_LO); return K_READ_LO; }
 	YY_BREAK
-case 96:
+case 99:
 YY_RULE_SETUP
-#line 201 "../lexer.l"
+#line 203 "../lexer.l"
 { yylval=new_token(K_READ_HI); return K_READ_HI; }
 	YY_BREAK
-case 97:
+case 100:
 YY_RULE_SETUP
-#line 202 "../lexer.l"
+#line 204 "../lexer.l"
 { yylval=new_token(K_WRITE_LO); return K_WRITE_LO; }
 	YY_BREAK
-case 98:
+case 101:
 YY_RULE_SETUP
-#line 203 "../lexer.l"
+#line 205 "../lexer.l"
 { yylval=new_token(K_WRITE_HI); return K_WRITE_HI; }
 	YY_BREAK
-case 99:
+case 102:
 YY_RULE_SETUP
-#line 204 "../lexer.l"
+#line 206 "../lexer.l"
 { yylval=new_token(K_LOADPAGE_LO); return K_LOADPAGE_LO; }
 	YY_BREAK
-case 100:
+case 103:
 YY_RULE_SETUP
-#line 205 "../lexer.l"
+#line 207 "../lexer.l"
 { yylval=new_token(K_LOADPAGE_HI); return K_LOADPAGE_HI; }
 	YY_BREAK
-case 101:
+case 104:
 YY_RULE_SETUP
-#line 206 "../lexer.l"
+#line 208 "../lexer.l"
 { yylval=new_token(K_WRITEPAGE); return K_WRITEPAGE; }
 	YY_BREAK
-case 102:
+case 105:
 YY_RULE_SETUP
-#line 207 "../lexer.l"
+#line 209 "../lexer.l"
 { yylval=new_token(K_CHIP_ERASE); return K_CHIP_ERASE; }
 	YY_BREAK
-case 103:
+case 106:
 YY_RULE_SETUP
-#line 208 "../lexer.l"
+#line 210 "../lexer.l"
 { yylval=new_token(K_PGM_ENABLE); return K_PGM_ENABLE; }
 	YY_BREAK
-case 104:
+case 107:
 YY_RULE_SETUP
-#line 210 "../lexer.l"
+#line 212 "../lexer.l"
 { yylval=new_token(K_NO); return K_NO; }
 	YY_BREAK
-case 105:
+case 108:
 YY_RULE_SETUP
-#line 211 "../lexer.l"
+#line 213 "../lexer.l"
 { yylval=new_token(K_YES); return K_YES; }
 	YY_BREAK
-case 106:
+case 109:
 YY_RULE_SETUP
-#line 213 "../lexer.l"
+#line 215 "../lexer.l"
 { yylval = NULL; pyytext(); return TKN_COMMA; }
 	YY_BREAK
-case 107:
+case 110:
 YY_RULE_SETUP
-#line 214 "../lexer.l"
+#line 216 "../lexer.l"
 { yylval = NULL; pyytext(); return TKN_EQUAL; }
 	YY_BREAK
-case 108:
+case 111:
 YY_RULE_SETUP
-#line 215 "../lexer.l"
+#line 217 "../lexer.l"
 { yylval = NULL; pyytext(); return TKN_SEMI; }
 	YY_BREAK
-case 109:
+case 112:
 YY_RULE_SETUP
-#line 216 "../lexer.l"
+#line 218 "../lexer.l"
 { yylval = NULL; pyytext(); return TKN_TILDE; }
 	YY_BREAK
-case 110:
+case 113:
 YY_RULE_SETUP
-#line 218 "../lexer.l"
+#line 220 "../lexer.l"
 { lineno++; }
 	YY_BREAK
-case 111:
+case 114:
 YY_RULE_SETUP
-#line 219 "../lexer.l"
+#line 221 "../lexer.l"
 /* ignore whitespace */
 	YY_BREAK
-case 112:
+case 115:
 YY_RULE_SETUP
-#line 221 "../lexer.l"
+#line 223 "../lexer.l"
 { fprintf(stderr, "error at %s:%d: possible old-style config file entry\n",
              infile, lineno);
      fprintf(stderr, "  Update your config file (see %s%s for a sample)\n",
              CONFIG_DIR, "/avrdude.conf.sample");
      exit(1); }
 	YY_BREAK
-case 113:
+case 116:
 YY_RULE_SETUP
-#line 227 "../lexer.l"
+#line 229 "../lexer.l"
 { fprintf(stderr, "error at %s:%d unrecognized character: \"%s\"\n", 
             infile, lineno, yytext); exit(1); }
 	YY_BREAK
-case 114:
+case 117:
 YY_RULE_SETUP
-#line 230 "../lexer.l"
+#line 232 "../lexer.l"
 ECHO;
 	YY_BREAK
-#line 1585 "lexer.c"
+#line 1614 "../lexer.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(str):
 case YY_STATE_EOF(incl):
@@ -1876,7 +1905,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 552 )
+			if ( yy_current_state >= 575 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1911,11 +1940,11 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 552 )
+		if ( yy_current_state >= 575 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 551);
+	yy_is_jam = (yy_current_state == 574);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
@@ -2470,6 +2499,6 @@
 	return 0;
 	}
 #endif
-#line 230 "../lexer.l"
+#line 232 "../lexer.l"
 
 
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.l
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.l	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/lexer.l	(working copy)
@@ -129,6 +129,8 @@
 default_parallel { yylval=NULL; return K_DEFAULT_PARALLEL; }
 default_programmer { yylval=NULL; return K_DEFAULT_PROGRAMMER; }
 default_serial   { yylval=NULL; return K_DEFAULT_SERIAL; }
+default_fastwrite { yylval=NULL; return K_DEFAULT_FASTWRITE; }
+default_fastverify { yylval=NULL; return K_DEFAULT_FASTVERIFY; }
 devicecode       { yylval=NULL; return K_DEVICECODE; }
 eecr             { yylval=NULL; return K_EECR; }
 eeprom           { yylval=NULL; return K_EEPROM; }
@@ -147,6 +149,7 @@
 num_banks        { yylval=NULL; return K_NUM_PAGES; }
 num_pages        { yylval=NULL; return K_NUM_PAGES; }
 page_size        { yylval=NULL; return K_PAGE_SIZE; }
+word_size        { yylval=NULL; return K_WORD_SIZE; }
 paged            { yylval=NULL; return K_PAGED; }
 pagel            { yylval=NULL; return K_PAGEL; }
 par              { yylval=NULL; return K_PAR; }
@@ -187,7 +190,6 @@
 readsize        { yylval=NULL; return K_READSIZE; }
 
 
-
 dedicated        { yylval=new_token(K_DEDICATED); return K_DEDICATED; }
 io               { yylval=new_token(K_IO); return K_IO; }
 pseudo           { yylval=new_token(K_PSEUDO); return K_PSEUDO; }
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/main.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/main.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/main.c	(working copy)
@@ -65,6 +65,7 @@
 typedef struct update_t {
   char * memtype;
   int    op;
+  int    fast;
   char * filename;
   int    format;
 } UPDATE;
@@ -90,7 +91,6 @@
  */
 int do_cycles;   /* track erase-rewrite cycles */
 
-
 /*
  * usage message
  */
@@ -113,6 +113,9 @@
  "                             Multiple -U options are allowed, each request\n"
  "                             is performed in the order specified.\n"
  "  -n                         Do not write anything to the device.\n"
+ "  -f <w+|->                  Write only noempty pages 2 Flash or EEPROM "
+ "                             if errased before"
+ "     <v+|->                  Only verify noempty pages of Flash"
  "  -V                         Do not verify.\n"
  "  -u                         Disable safemode, default when running from a script.\n"
  "  -s                         Silent safemode operation, will not ask you if\n"
@@ -293,9 +296,9 @@
   if (percent > 100)
     percent = 100;
 
-  if (percent > last) {
+  if (percent != last) {
     last = percent;
-    update_progress (percent, t - start_time, hdr);
+  	update_progress (percent, t - start_time, hdr);
   }
 
   if (percent == 100)
@@ -322,7 +325,7 @@
     header = hdr;
   }
 
-  if (last == 0) {
+  if ((last == 0) || (percent < 100)) {
     fprintf(stderr, "\r%s | %s | %d%% %0.2fs", 
             header, hashes, percent, etime);
   }
@@ -401,9 +404,11 @@
   }
   else if (*p == 'w') {
     upd->op = DEVICE_WRITE;
+    upd->fast = FastWrite;
   }
   else if (*p == 'v') {
     upd->op = DEVICE_VERIFY;
+    upd->fast = FastVerify;
   }
   else {
     fprintf(stderr, "%s: invalid I/O mode '%c' in update specification\n",
@@ -474,7 +479,7 @@
   }
   memcpy(upd->filename, cp, fnlen);
   upd->filename[fnlen] = 0;
-
+  
   return upd;
 }
 
@@ -543,7 +548,7 @@
             progname, mem->desc);
 	  }
     report_progress(0,1,"Reading");
-    rc = avr_read(pgm, p, upd->memtype, 0, 1);
+    rc = avr_read(pgm, p, upd->memtype, 0, 1, 0);
     if (rc < 0) {
       fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n", 
               progname, mem->desc, rc);
@@ -593,8 +598,9 @@
 	  }
 
     if (!nowrite) {
+      if (upd->fast < 0) {upd->fast = FastWrite;}
       report_progress(0,1,"Writing");
-      rc = avr_write(pgm, p, upd->memtype, size, 1);
+      rc = avr_write(pgm, p, upd->memtype, size, 1, upd->fast);
       report_progress(1,1,NULL);
     }
     else {
@@ -651,7 +657,11 @@
     }
 
     report_progress (0,1,"Reading");
-    rc = avr_read(pgm, v, upd->memtype, size, 1);
+    if (upd->fast < 0) {upd->fast = FastVerify;}
+    if (upd->fast != 0)
+    	{ rc = avr_read(pgm, v, upd->memtype, size, 1, p); }
+    else
+    	{ rc = avr_read(pgm, v, upd->memtype, size, 1, NULL); }
     if (rc < 0) {
       fprintf(stderr, "%s: failed to read all of %s memory, rc=%d\n", 
               progname, mem->desc, rc);
@@ -773,7 +783,9 @@
   ovsigck       = 0;
   terminal      = 0;
   nowrite       = 0;
+  FastWrite     = -1;
   verify        = 1;        /* on by default */
+  FastVerify    = -1;
   quell_progress = 0;
   ppisetbits    = 0;
   ppiclrbits    = 0;
@@ -835,7 +847,7 @@
   /*
    * process command line arguments
    */
-  while ((ch = getopt(argc,argv,"?b:B:c:C:DeE:Fnp:P:qstU:uvVyY:")) != -1) {
+  while ((ch = getopt(argc,argv,"?b:B:c:C:DeE:Fnp:P:qstU:uvVyY:f:")) != -1) {
 
     switch (ch) {
       case 'b': /* override default programmer baud rate */
@@ -933,6 +945,33 @@
       case 'V':
         verify = 0;
         break;
+      
+      case 'f':
+      	if (strlen(optarg) > 1) {
+      		if (optarg[0] == 'w') {
+      			if (optarg[1] == '+') {FastWrite = 1;}
+      			else { if (optarg[1] == '-') {FastWrite = 0;};}
+      		}
+      		else {
+      			if (optarg[0] =='v') {
+	      			if (optarg[1] == '+') {FastVerify = 1;}
+	      			else { if (optarg[1] == '-') {FastVerify = 0;}};
+	      		};
+      		};
+      	}
+      	if (strlen(optarg) > 2) {
+      		if (optarg[2] =='w') {
+      			if (optarg[3] == '+') {FastWrite = 1;}
+      			else { if (optarg[1] == '-') {FastWrite = 0;};}
+      		}
+      		else {
+      			if (optarg[2] =='v') {
+	      			if (optarg[3] == '+') {FastVerify = 1;}
+	      			else { if (optarg[1] == '-') {FastVerify = 0;}}
+	      		};
+      		};
+      	}
+      	break;
 
       case 'y':
         do_cycles = 1;
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/pgm.h
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/pgm.h	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/pgm.h	(working copy)
@@ -67,9 +67,9 @@
   int  (*open)           (struct programmer_t * pgm, char * port);
   void (*close)          (struct programmer_t * pgm);
   int  (*paged_write)    (struct programmer_t * pgm, AVRPART * p, AVRMEM * m, 
-                          int page_size, int n_bytes);
+                          int page_size, int n_bytes, unsigned long Adress);
   int  (*paged_load)     (struct programmer_t * pgm, AVRPART * p, AVRMEM * m,
-                          int page_size, int n_bytes);
+                          int page_size, int n_bytes, unsigned long Adress);
   void (*write_setup)    (struct programmer_t * pgm, AVRPART * p, AVRMEM * m);
   int  (*write_byte)     (struct programmer_t * pgm, AVRPART * p, AVRMEM * m,
                           unsigned long addr, unsigned char value);
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500.c	(working copy)
@@ -623,15 +623,15 @@
 
 
 static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                              int page_size, int n_bytes)
+                              int page_size, int n_bytes, unsigned long addr)
 {
   unsigned char buf[16];
   int memtype;
-  unsigned int addr;
   int a_div;
   int block_size;
   int tries;
   unsigned int n;
+  unsigned int max_addr, low_addr;
   int flash;
 
   if (page_size == 0) {
@@ -677,10 +677,12 @@
           n_bytes, n, a_div, page_size);
 #endif     
 
-  for (addr = 0; addr < n; addr += page_size) {
-    report_progress (addr, n_bytes, NULL);
+  low_addr = addr;
+  max_addr = addr + n;
+  for (addr = addr; addr < max_addr; addr += page_size) {
+    report_progress (addr - low_addr, n_bytes, NULL);
     
-	if (addr + page_size > n_bytes) {
+	if (addr + page_size > max_addr) {
 	   block_size = n_bytes % page_size;
 	}
 	else {
@@ -736,7 +738,7 @@
     }
   }
 
-  return n_bytes;
+  return addr;
 }
 
 static int stk500_is_page_empty(unsigned int address, int page_size, 
@@ -755,14 +757,14 @@
 }
 
 static int stk500_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                             int page_size, int n_bytes)
+                             int page_size, int n_bytes, unsigned long addr)
 {
   unsigned char buf[16];
   int memtype;
-  unsigned int addr;
   int a_div;
   int tries;
   unsigned int n;
+  unsigned int max_addr, low_addr;
   int block_size;
 
   if (strcmp(m->desc, "flash") == 0) {
@@ -793,10 +795,12 @@
     }
   }
 
-  for (addr = 0; addr < n; addr += page_size) {
-    report_progress (addr, n_bytes, NULL);
+  low_addr = addr;
+  max_addr = addr + n;
+  for (addr = addr; addr < max_addr; addr += page_size) {
+    report_progress (addr - low_addr, n_bytes, NULL);
 
-	if (addr + page_size > n_bytes) {
+	if (addr + page_size > max_addr) {
 	   block_size = n_bytes % page_size;
 	}
 	else {
Index: G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500v2.c
===================================================================
--- G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500v2.c	(revision 1)
+++ G:/DOC/Components/Atmel/AVR_ISP/avrdude/src/stk500v2.c	(working copy)
@@ -493,9 +493,10 @@
 
 
 static int stk500v2_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, 
-                              int page_size, int n_bytes)
+                              int page_size, int n_bytes, unsigned long addr)
 {
-  int addr, block_size, last_addr;
+  int block_size, last_addr;
+  unsigned long max_addr, low_addr;
   int a_div=1;
   unsigned char commandbuf[10];
   unsigned char buf[266];
@@ -574,11 +575,13 @@
 
   last_addr=-1;
 
-  for (addr=0; addr < n_bytes; addr += page_size) {
-    report_progress(addr,n_bytes,NULL);
+  low_addr = addr;
+  max_addr = addr + n_bytes;
+  for (addr=addr; addr < max_addr; addr += page_size) {
+    report_progress(addr -low_addr,n_bytes,NULL);
 
-    if ((n_bytes-addr) < page_size)
-      block_size = n_bytes - addr;
+    if ((max_addr-addr) < page_size)
+      block_size = max_addr - addr;
     else
       block_size = page_size;
 
@@ -610,7 +613,7 @@
     }
   }
 
-  return n_bytes;
+  return last_addr;
 }
 
 static int stk500v2_is_page_empty(unsigned int address, int page_size,
@@ -629,12 +632,13 @@
 }
 
 static int stk500v2_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
-                             int page_size, int n_bytes)
+                             int page_size, int n_bytes, unsigned long addr)
 {
-  int addr, block_size;
+  int block_size;
   unsigned char commandbuf[4];
   unsigned char buf[275];	// max buffer size for stk500v2 at this point
   unsigned char cmds[4];
+  unsigned long max_addr, low_addr;
   int result;
   OPCODE * rop;
 
@@ -664,11 +668,13 @@
 
   stk500v2_loadaddr(pgm, 0);
 
-  for (addr=0; addr < n_bytes; addr += page_size) {
-    report_progress(addr, n_bytes,NULL);
+  low_addr = addr;
+  max_addr = addr + n_bytes;
+  for (addr=addr; addr < max_addr; addr += page_size) {
+    report_progress(addr - low_addr, n_bytes,NULL);
 
-    if ((n_bytes-addr) < page_size)
-      block_size = n_bytes - addr;
+    if ((max_addr-addr) < page_size)
+      block_size = max_addr - addr;
     else
       block_size = page_size;
     DEBUG("block_size at addr %d is %d\n",addr,block_size);
@@ -694,7 +700,7 @@
     memcpy(&m->buf[addr], &buf[2], block_size);
   }
 
-  return n_bytes;
+  return addr;
 }
 
 
