Shrink code by using registers for variables "length" and "address"

http://code.google.com/p/optiboot/issues/detail?id=33

Fix high-value watchdog timeouts on ATmega8
http://code.google.com/p/optiboot/issues/detail?id=38

Change "start app on bad commands" code to start the app via the
watchdog timer, so that the app is always started with the chip
in fully reset state.
http://code.google.com/p/optiboot/issues/detail?id=37
(cherry picked from commit 6f7687b0f925cb07447cbbcc692766c51c02f700)

1 files changed, 222 insertions, 217 deletions

diff --git a/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst b/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
index d7ce991..a4da506 100644
--- a/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
+++ b/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
@@ -3,27 +3,27 @@ optiboot_atmega328_pro_8MHz.elf:     file format elf32-avr
 
 Sections:
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 .text         000001fc  00000000  00000000  00000054  2**1
+  0 .text         000001da  00000000  00000000  00000054  2**1
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  1 .version      00000002  00007ffe  00007ffe  00000250  2**0
+  1 .version      00000002  00007ffe  00007ffe  0000022e  2**0
                   CONTENTS, READONLY
-  2 .debug_aranges 00000028  00000000  00000000  00000252  2**0
+  2 .debug_aranges 00000028  00000000  00000000  00000230  2**0
                   CONTENTS, READONLY, DEBUGGING
-  3 .debug_pubnames 0000006a  00000000  00000000  0000027a  2**0
+  3 .debug_pubnames 0000005f  00000000  00000000  00000258  2**0
                   CONTENTS, READONLY, DEBUGGING
-  4 .debug_info   00000285  00000000  00000000  000002e4  2**0
+  4 .debug_info   0000028c  00000000  00000000  000002b7  2**0
                   CONTENTS, READONLY, DEBUGGING
-  5 .debug_abbrev 0000019f  00000000  00000000  00000569  2**0
+  5 .debug_abbrev 00000199  00000000  00000000  00000543  2**0
                   CONTENTS, READONLY, DEBUGGING
-  6 .debug_line   00000453  00000000  00000000  00000708  2**0
+  6 .debug_line   00000456  00000000  00000000  000006dc  2**0
                   CONTENTS, READONLY, DEBUGGING
-  7 .debug_frame  00000090  00000000  00000000  00000b5c  2**2
+  7 .debug_frame  00000080  00000000  00000000  00000b34  2**2
                   CONTENTS, READONLY, DEBUGGING
-  8 .debug_str    00000141  00000000  00000000  00000bec  2**0
+  8 .debug_str    00000149  00000000  00000000  00000bb4  2**0
                   CONTENTS, READONLY, DEBUGGING
-  9 .debug_loc    000001e1  00000000  00000000  00000d2d  2**0
+  9 .debug_loc    0000027e  00000000  00000000  00000cfd  2**0
                   CONTENTS, READONLY, DEBUGGING
- 10 .debug_ranges 00000068  00000000  00000000  00000f0e  2**0
+ 10 .debug_ranges 00000060  00000000  00000000  00000f7b  2**0
                   CONTENTS, READONLY, DEBUGGING
 
 Disassembly of section .text:
@@ -47,7 +47,7 @@ int main(void) {
    4:	14 be       	out	0x34, r1	; 52
   if (!(ch & _BV(EXTRF))) appStart();
    6:	81 ff       	sbrs	r24, 1
-   8:	e6 d0       	rcall	.+460    	; 0x1d6 <appStart>
+   8:	e3 d0       	rcall	.+454    	; 0x1d0 <appStart>
 
 #if LED_START_FLASHES > 0
   // Set up Timer 1 for timeout counter
@@ -77,7 +77,7 @@ int main(void) {
   // Set up watchdog to trigger after 500ms
   watchdogConfig(WATCHDOG_1S);
   28:	8e e0       	ldi	r24, 0x0E	; 14
-  2a:	cf d0       	rcall	.+414    	; 0x1ca <watchdogConfig>
+  2a:	bc d0       	rcall	.+376    	; 0x1a4 <watchdogConfig>
 
   /* Set LED pin as output */
   LED_DDR |= _BV(LED);
@@ -111,8 +111,8 @@ void flash_led(uint8_t count) {
 #else
     LED_PIN |= _BV(LED);
   44:	1d 9a       	sbi	0x03, 5	; 3
-  return getch();
 }
+#endif
 
 // Watchdog functions. These are only safe with interrupts turned off.
 void watchdogReset() {
@@ -132,8 +132,8 @@ void watchdogReset() {
     if(ch == STK_GET_PARAMETER) {
       // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
       getNch(1);
-  4c:	dd 24       	eor	r13, r13
-  4e:	d3 94       	inc	r13
+  4c:	99 24       	eor	r9, r9
+  4e:	93 94       	inc	r9
         __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
         addrPtr += 2;
       } while (--ch);
@@ -141,21 +141,21 @@ void watchdogReset() {
       // Write from programming buffer
       __boot_page_write_short((uint16_t)(void*)address);
   50:	a5 e0       	ldi	r26, 0x05	; 5
-  52:	ea 2e       	mov	r14, r26
+  52:	aa 2e       	mov	r10, r26
       boot_spm_busy_wait();
 
 #if defined(RWWSRE)
       // Reenable read access to flash
       boot_rww_enable();
   54:	f1 e1       	ldi	r31, 0x11	; 17
-  56:	ff 2e       	mov	r15, r31
+  56:	bf 2e       	mov	r11, r31
 #endif
 
   /* Forever loop */
   for (;;) {
     /* get character from UART */
     ch = getch();
-  58:	ab d0       	rcall	.+342    	; 0x1b0 <getch>
+  58:	9d d0       	rcall	.+314    	; 0x194 <getch>
 
     if(ch == STK_GET_PARAMETER) {
   5a:	81 34       	cpi	r24, 0x41	; 65
@@ -163,10 +163,10 @@ void watchdogReset() {
       // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
       getNch(1);
   5e:	81 e0       	ldi	r24, 0x01	; 1
-  60:	c5 d0       	rcall	.+394    	; 0x1ec <getNch>
+  60:	af d0       	rcall	.+350    	; 0x1c0 <getNch>
       putch(0x03);
   62:	83 e0       	ldi	r24, 0x03	; 3
-  64:	20 c0       	rjmp	.+64     	; 0xa6 <__SREG__+0x67>
+  64:	1f c0       	rjmp	.+62     	; 0xa4 <__SREG__+0x65>
     }
     else if(ch == STK_SET_DEVICE) {
   66:	82 34       	cpi	r24, 0x42	; 66
@@ -182,71 +182,77 @@ void watchdogReset() {
       // SET DEVICE EXT is ignored
       getNch(5);
   72:	85 e0       	ldi	r24, 0x05	; 5
-  74:	bb d0       	rcall	.+374    	; 0x1ec <getNch>
-  76:	91 c0       	rjmp	.+290    	; 0x19a <__SREG__+0x15b>
+  74:	a5 d0       	rcall	.+330    	; 0x1c0 <getNch>
+  76:	83 c0       	rjmp	.+262    	; 0x17e <__SREG__+0x13f>
     }
     else if(ch == STK_LOAD_ADDRESS) {
   78:	85 35       	cpi	r24, 0x55	; 85
-  7a:	81 f4       	brne	.+32     	; 0x9c <__SREG__+0x5d>
+  7a:	79 f4       	brne	.+30     	; 0x9a <__SREG__+0x5b>
       // LOAD ADDRESS
       uint16_t newAddress;
       newAddress = getch();
-  7c:	99 d0       	rcall	.+306    	; 0x1b0 <getch>
+  7c:	8b d0       	rcall	.+278    	; 0x194 <getch>
       newAddress = (newAddress & 0xff) | (getch() << 8);
-  7e:	08 2f       	mov	r16, r24
-  80:	10 e0       	ldi	r17, 0x00	; 0
-  82:	96 d0       	rcall	.+300    	; 0x1b0 <getch>
-  84:	90 e0       	ldi	r25, 0x00	; 0
-  86:	98 2f       	mov	r25, r24
-  88:	88 27       	eor	r24, r24
-  8a:	80 2b       	or	r24, r16
-  8c:	91 2b       	or	r25, r17
+  7e:	e8 2e       	mov	r14, r24
+  80:	ff 24       	eor	r15, r15
+  82:	88 d0       	rcall	.+272    	; 0x194 <getch>
+  84:	08 2f       	mov	r16, r24
+  86:	10 e0       	ldi	r17, 0x00	; 0
+  88:	10 2f       	mov	r17, r16
+  8a:	00 27       	eor	r16, r16
+  8c:	0e 29       	or	r16, r14
+  8e:	1f 29       	or	r17, r15
 #ifdef RAMPZ
       // Transfer top bit to RAMPZ
       RAMPZ = (newAddress & 0x8000) ? 1 : 0;
 #endif
       newAddress += newAddress; // Convert from word address to byte address
-  8e:	88 0f       	add	r24, r24
-  90:	99 1f       	adc	r25, r25
+  90:	00 0f       	add	r16, r16
+  92:	11 1f       	adc	r17, r17
       address = newAddress;
-  92:	90 93 01 02 	sts	0x0201, r25
-  96:	80 93 00 02 	sts	0x0200, r24
-  9a:	7e c0       	rjmp	.+252    	; 0x198 <__SREG__+0x159>
       verifySpace();
+  94:	8d d0       	rcall	.+282    	; 0x1b0 <verifySpace>
+  96:	68 01       	movw	r12, r16
+  98:	72 c0       	rjmp	.+228    	; 0x17e <__SREG__+0x13f>
     }
     else if(ch == STK_UNIVERSAL) {
-  9c:	86 35       	cpi	r24, 0x56	; 86
-  9e:	29 f4       	brne	.+10     	; 0xaa <__SREG__+0x6b>
+  9a:	86 35       	cpi	r24, 0x56	; 86
+  9c:	29 f4       	brne	.+10     	; 0xa8 <__SREG__+0x69>
       // UNIVERSAL command is ignored
       getNch(4);
-  a0:	84 e0       	ldi	r24, 0x04	; 4
-  a2:	a4 d0       	rcall	.+328    	; 0x1ec <getNch>
+  9e:	84 e0       	ldi	r24, 0x04	; 4
+  a0:	8f d0       	rcall	.+286    	; 0x1c0 <getNch>
       putch(0x00);
-  a4:	80 e0       	ldi	r24, 0x00	; 0
-  a6:	7c d0       	rcall	.+248    	; 0x1a0 <putch>
-  a8:	78 c0       	rjmp	.+240    	; 0x19a <__SREG__+0x15b>
+  a2:	80 e0       	ldi	r24, 0x00	; 0
+  a4:	6f d0       	rcall	.+222    	; 0x184 <putch>
+  a6:	6b c0       	rjmp	.+214    	; 0x17e <__SREG__+0x13f>
     }
     /* Write memory, length is big endian and is in bytes */
     else if(ch == STK_PROG_PAGE) {
-  aa:	84 36       	cpi	r24, 0x64	; 100
-  ac:	09 f0       	breq	.+2      	; 0xb0 <__SREG__+0x71>
-  ae:	4e c0       	rjmp	.+156    	; 0x14c <__SREG__+0x10d>
+  a8:	84 36       	cpi	r24, 0x64	; 100
+  aa:	09 f0       	breq	.+2      	; 0xae <__SREG__+0x6f>
+  ac:	42 c0       	rjmp	.+132    	; 0x132 <__SREG__+0xf3>
       // PROGRAM PAGE - we support flash programming only, not EEPROM
       uint8_t *bufPtr;
       uint16_t addrPtr;
 
-      getLen();
-  b0:	87 d0       	rcall	.+270    	; 0x1c0 <getLen>
+      getch();			/* getlen() */
+  ae:	72 d0       	rcall	.+228    	; 0x194 <getch>
+      length = getch();
+  b0:	71 d0       	rcall	.+226    	; 0x194 <getch>
+  b2:	08 2f       	mov	r16, r24
+      getch();
+  b4:	6f d0       	rcall	.+222    	; 0x194 <getch>
 
       // If we are in RWW section, immediately start page erase
       if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
-  b2:	e0 91 00 02 	lds	r30, 0x0200
-  b6:	f0 91 01 02 	lds	r31, 0x0201
+  b6:	80 e0       	ldi	r24, 0x00	; 0
+  b8:	c8 16       	cp	r12, r24
   ba:	80 e7       	ldi	r24, 0x70	; 112
-  bc:	e0 30       	cpi	r30, 0x00	; 0
-  be:	f8 07       	cpc	r31, r24
-  c0:	18 f4       	brcc	.+6      	; 0xc8 <__SREG__+0x89>
-  c2:	83 e0       	ldi	r24, 0x03	; 3
+  bc:	d8 06       	cpc	r13, r24
+  be:	20 f4       	brcc	.+8      	; 0xc8 <__SREG__+0x89>
+  c0:	83 e0       	ldi	r24, 0x03	; 3
+  c2:	f6 01       	movw	r30, r12
   c4:	87 bf       	out	0x37, r24	; 55
   c6:	e8 95       	spm
   c8:	c0 e0       	ldi	r28, 0x00	; 0
@@ -255,302 +261,301 @@ void watchdogReset() {
       // While that is going on, read in page contents
       bufPtr = buff;
       do *bufPtr++ = getch();
-  cc:	71 d0       	rcall	.+226    	; 0x1b0 <getch>
+  cc:	63 d0       	rcall	.+198    	; 0x194 <getch>
   ce:	89 93       	st	Y+, r24
       while (--length);
-  d0:	80 91 02 02 	lds	r24, 0x0202
-  d4:	81 50       	subi	r24, 0x01	; 1
-  d6:	80 93 02 02 	sts	0x0202, r24
-  da:	88 23       	and	r24, r24
-  dc:	b9 f7       	brne	.-18     	; 0xcc <__SREG__+0x8d>
+  d0:	0c 17       	cp	r16, r28
+  d2:	e1 f7       	brne	.-8      	; 0xcc <__SREG__+0x8d>
 
       // If we are in NRWW section, page erase has to be delayed until now.
       // Todo: Take RAMPZ into account
       if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
-  de:	e0 91 00 02 	lds	r30, 0x0200
-  e2:	f0 91 01 02 	lds	r31, 0x0201
-  e6:	80 e7       	ldi	r24, 0x70	; 112
-  e8:	e0 30       	cpi	r30, 0x00	; 0
-  ea:	f8 07       	cpc	r31, r24
-  ec:	18 f0       	brcs	.+6      	; 0xf4 <__SREG__+0xb5>
-  ee:	83 e0       	ldi	r24, 0x03	; 3
-  f0:	87 bf       	out	0x37, r24	; 55
-  f2:	e8 95       	spm
+  d4:	f0 e0       	ldi	r31, 0x00	; 0
+  d6:	cf 16       	cp	r12, r31
+  d8:	f0 e7       	ldi	r31, 0x70	; 112
+  da:	df 06       	cpc	r13, r31
+  dc:	20 f0       	brcs	.+8      	; 0xe6 <__SREG__+0xa7>
+  de:	83 e0       	ldi	r24, 0x03	; 3
+  e0:	f6 01       	movw	r30, r12
+  e2:	87 bf       	out	0x37, r24	; 55
+  e4:	e8 95       	spm
 
       // Read command terminator, start reply
       verifySpace();
-  f4:	75 d0       	rcall	.+234    	; 0x1e0 <verifySpace>
+  e6:	64 d0       	rcall	.+200    	; 0x1b0 <verifySpace>
 
       // If only a partial page is to be programmed, the erase might not be complete.
       // So check that here
       boot_spm_busy_wait();
-  f6:	07 b6       	in	r0, 0x37	; 55
-  f8:	00 fc       	sbrc	r0, 0
-  fa:	fd cf       	rjmp	.-6      	; 0xf6 <__SREG__+0xb7>
-      }
-#endif
-
-      // Copy buffer into programming buffer
+  e8:	07 b6       	in	r0, 0x37	; 55
+  ea:	00 fc       	sbrc	r0, 0
+  ec:	fd cf       	rjmp	.-6      	; 0xe8 <__SREG__+0xa9>
+  ee:	a6 01       	movw	r20, r12
+  f0:	a0 e0       	ldi	r26, 0x00	; 0
+  f2:	b1 e0       	ldi	r27, 0x01	; 1
       bufPtr = buff;
       addrPtr = (uint16_t)(void*)address;
-  fc:	40 91 00 02 	lds	r20, 0x0200
- 100:	50 91 01 02 	lds	r21, 0x0201
- 104:	a0 e0       	ldi	r26, 0x00	; 0
- 106:	b1 e0       	ldi	r27, 0x01	; 1
       ch = SPM_PAGESIZE / 2;
       do {
         uint16_t a;
         a = *bufPtr++;
- 108:	2c 91       	ld	r18, X
- 10a:	30 e0       	ldi	r19, 0x00	; 0
+  f4:	2c 91       	ld	r18, X
+  f6:	30 e0       	ldi	r19, 0x00	; 0
         a |= (*bufPtr++) << 8;
- 10c:	11 96       	adiw	r26, 0x01	; 1
- 10e:	8c 91       	ld	r24, X
- 110:	11 97       	sbiw	r26, 0x01	; 1
- 112:	90 e0       	ldi	r25, 0x00	; 0
- 114:	98 2f       	mov	r25, r24
- 116:	88 27       	eor	r24, r24
- 118:	82 2b       	or	r24, r18
- 11a:	93 2b       	or	r25, r19
+  f8:	11 96       	adiw	r26, 0x01	; 1
+  fa:	8c 91       	ld	r24, X
+  fc:	11 97       	sbiw	r26, 0x01	; 1
+  fe:	90 e0       	ldi	r25, 0x00	; 0
+ 100:	98 2f       	mov	r25, r24
+ 102:	88 27       	eor	r24, r24
+ 104:	82 2b       	or	r24, r18
+ 106:	93 2b       	or	r25, r19
 #define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
 #define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
 #endif
 
 /* main program starts here */
 int main(void) {
- 11c:	12 96       	adiw	r26, 0x02	; 2
+ 108:	12 96       	adiw	r26, 0x02	; 2
       ch = SPM_PAGESIZE / 2;
       do {
         uint16_t a;
         a = *bufPtr++;
         a |= (*bufPtr++) << 8;
         __boot_page_fill_short((uint16_t)(void*)addrPtr,a);
- 11e:	fa 01       	movw	r30, r20
- 120:	0c 01       	movw	r0, r24
- 122:	d7 be       	out	0x37, r13	; 55
- 124:	e8 95       	spm
- 126:	11 24       	eor	r1, r1
+ 10a:	fa 01       	movw	r30, r20
+ 10c:	0c 01       	movw	r0, r24
+ 10e:	97 be       	out	0x37, r9	; 55
+ 110:	e8 95       	spm
+ 112:	11 24       	eor	r1, r1
         addrPtr += 2;
- 128:	4e 5f       	subi	r20, 0xFE	; 254
- 12a:	5f 4f       	sbci	r21, 0xFF	; 255
+ 114:	4e 5f       	subi	r20, 0xFE	; 254
+ 116:	5f 4f       	sbci	r21, 0xFF	; 255
       } while (--ch);
- 12c:	f1 e0       	ldi	r31, 0x01	; 1
- 12e:	a0 38       	cpi	r26, 0x80	; 128
- 130:	bf 07       	cpc	r27, r31
- 132:	51 f7       	brne	.-44     	; 0x108 <__SREG__+0xc9>
+ 118:	f1 e0       	ldi	r31, 0x01	; 1
+ 11a:	a0 38       	cpi	r26, 0x80	; 128
+ 11c:	bf 07       	cpc	r27, r31
+ 11e:	51 f7       	brne	.-44     	; 0xf4 <__SREG__+0xb5>
 
       // Write from programming buffer
       __boot_page_write_short((uint16_t)(void*)address);
- 134:	e0 91 00 02 	lds	r30, 0x0200
- 138:	f0 91 01 02 	lds	r31, 0x0201
- 13c:	e7 be       	out	0x37, r14	; 55
- 13e:	e8 95       	spm
+ 120:	f6 01       	movw	r30, r12
+ 122:	a7 be       	out	0x37, r10	; 55
+ 124:	e8 95       	spm
       boot_spm_busy_wait();
- 140:	07 b6       	in	r0, 0x37	; 55
- 142:	00 fc       	sbrc	r0, 0
- 144:	fd cf       	rjmp	.-6      	; 0x140 <__SREG__+0x101>
+ 126:	07 b6       	in	r0, 0x37	; 55
+ 128:	00 fc       	sbrc	r0, 0
+ 12a:	fd cf       	rjmp	.-6      	; 0x126 <__SREG__+0xe7>
 
 #if defined(RWWSRE)
       // Reenable read access to flash
       boot_rww_enable();
- 146:	f7 be       	out	0x37, r15	; 55
- 148:	e8 95       	spm
- 14a:	27 c0       	rjmp	.+78     	; 0x19a <__SREG__+0x15b>
+ 12c:	b7 be       	out	0x37, r11	; 55
+ 12e:	e8 95       	spm
+ 130:	26 c0       	rjmp	.+76     	; 0x17e <__SREG__+0x13f>
 #endif
 
     }
     /* Read memory block mode, length is big endian.  */
     else if(ch == STK_READ_PAGE) {
- 14c:	84 37       	cpi	r24, 0x74	; 116
- 14e:	b9 f4       	brne	.+46     	; 0x17e <__SREG__+0x13f>
+ 132:	84 37       	cpi	r24, 0x74	; 116
+ 134:	b1 f4       	brne	.+44     	; 0x162 <__SREG__+0x123>
       // READ PAGE - we only read flash
-      getLen();
- 150:	37 d0       	rcall	.+110    	; 0x1c0 <getLen>
+      getch();			/* getlen() */
+ 136:	2e d0       	rcall	.+92     	; 0x194 <getch>
+      length = getch();
+ 138:	2d d0       	rcall	.+90     	; 0x194 <getch>
+ 13a:	f8 2e       	mov	r15, r24
+      getch();
+ 13c:	2b d0       	rcall	.+86     	; 0x194 <getch>
+
       verifySpace();
- 152:	46 d0       	rcall	.+140    	; 0x1e0 <verifySpace>
+ 13e:	38 d0       	rcall	.+112    	; 0x1b0 <verifySpace>
+ 140:	f6 01       	movw	r30, r12
+ 142:	ef 2c       	mov	r14, r15
         putch(result);
         address++;
       }
       while (--length);
 #else
       do putch(pgm_read_byte_near(address++));
- 154:	e0 91 00 02 	lds	r30, 0x0200
- 158:	f0 91 01 02 	lds	r31, 0x0201
- 15c:	31 96       	adiw	r30, 0x01	; 1
- 15e:	f0 93 01 02 	sts	0x0201, r31
- 162:	e0 93 00 02 	sts	0x0200, r30
- 166:	31 97       	sbiw	r30, 0x01	; 1
- 168:	e4 91       	lpm	r30, Z+
- 16a:	8e 2f       	mov	r24, r30
- 16c:	19 d0       	rcall	.+50     	; 0x1a0 <putch>
+ 144:	8f 01       	movw	r16, r30
+ 146:	0f 5f       	subi	r16, 0xFF	; 255
+ 148:	1f 4f       	sbci	r17, 0xFF	; 255
+ 14a:	84 91       	lpm	r24, Z+
+ 14c:	1b d0       	rcall	.+54     	; 0x184 <putch>
       while (--length);
- 16e:	80 91 02 02 	lds	r24, 0x0202
- 172:	81 50       	subi	r24, 0x01	; 1
- 174:	80 93 02 02 	sts	0x0202, r24
- 178:	88 23       	and	r24, r24
- 17a:	61 f7       	brne	.-40     	; 0x154 <__SREG__+0x115>
- 17c:	0e c0       	rjmp	.+28     	; 0x19a <__SREG__+0x15b>
+ 14e:	ea 94       	dec	r14
+ 150:	f8 01       	movw	r30, r16
+ 152:	c1 f7       	brne	.-16     	; 0x144 <__SREG__+0x105>
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 154:	08 94       	sec
+ 156:	c1 1c       	adc	r12, r1
+ 158:	d1 1c       	adc	r13, r1
+ 15a:	fa 94       	dec	r15
+ 15c:	cf 0c       	add	r12, r15
+ 15e:	d1 1c       	adc	r13, r1
+ 160:	0e c0       	rjmp	.+28     	; 0x17e <__SREG__+0x13f>
 #endif
 #endif
     }
 
     /* Get device signature bytes  */
     else if(ch == STK_READ_SIGN) {
- 17e:	85 37       	cpi	r24, 0x75	; 117
- 180:	39 f4       	brne	.+14     	; 0x190 <__SREG__+0x151>
+ 162:	85 37       	cpi	r24, 0x75	; 117
+ 164:	39 f4       	brne	.+14     	; 0x174 <__SREG__+0x135>
       // READ SIGN - return what Avrdude wants to hear
       verifySpace();
- 182:	2e d0       	rcall	.+92     	; 0x1e0 <verifySpace>
+ 166:	24 d0       	rcall	.+72     	; 0x1b0 <verifySpace>
       putch(SIGNATURE_0);
- 184:	8e e1       	ldi	r24, 0x1E	; 30
- 186:	0c d0       	rcall	.+24     	; 0x1a0 <putch>
+ 168:	8e e1       	ldi	r24, 0x1E	; 30
+ 16a:	0c d0       	rcall	.+24     	; 0x184 <putch>
       putch(SIGNATURE_1);
- 188:	85 e9       	ldi	r24, 0x95	; 149
- 18a:	0a d0       	rcall	.+20     	; 0x1a0 <putch>
+ 16c:	85 e9       	ldi	r24, 0x95	; 149
+ 16e:	0a d0       	rcall	.+20     	; 0x184 <putch>
       putch(SIGNATURE_2);
- 18c:	8f e0       	ldi	r24, 0x0F	; 15
- 18e:	8b cf       	rjmp	.-234    	; 0xa6 <__SREG__+0x67>
+ 170:	8f e0       	ldi	r24, 0x0F	; 15
+ 172:	98 cf       	rjmp	.-208    	; 0xa4 <__SREG__+0x65>
     }
     else if (ch == 'Q') {
- 190:	81 35       	cpi	r24, 0x51	; 81
- 192:	11 f4       	brne	.+4      	; 0x198 <__SREG__+0x159>
+ 174:	81 35       	cpi	r24, 0x51	; 81
+ 176:	11 f4       	brne	.+4      	; 0x17c <__SREG__+0x13d>
       // Adaboot no-wait mod
       watchdogConfig(WATCHDOG_16MS);
- 194:	88 e0       	ldi	r24, 0x08	; 8
- 196:	19 d0       	rcall	.+50     	; 0x1ca <watchdogConfig>
+ 178:	88 e0       	ldi	r24, 0x08	; 8
+ 17a:	14 d0       	rcall	.+40     	; 0x1a4 <watchdogConfig>
       verifySpace();
     }
     else {
       // This covers the response to commands like STK_ENTER_PROGMODE
       verifySpace();
- 198:	23 d0       	rcall	.+70     	; 0x1e0 <verifySpace>
+ 17c:	19 d0       	rcall	.+50     	; 0x1b0 <verifySpace>
     }
     putch(STK_OK);
- 19a:	80 e1       	ldi	r24, 0x10	; 16
- 19c:	01 d0       	rcall	.+2      	; 0x1a0 <putch>
- 19e:	5c cf       	rjmp	.-328    	; 0x58 <__SREG__+0x19>
+ 17e:	80 e1       	ldi	r24, 0x10	; 16
+ 180:	01 d0       	rcall	.+2      	; 0x184 <putch>
+ 182:	6a cf       	rjmp	.-300    	; 0x58 <__SREG__+0x19>
 
-000001a0 <putch>:
+00000184 <putch>:
   }
 }
 
 void putch(char ch) {
- 1a0:	98 2f       	mov	r25, r24
+ 184:	98 2f       	mov	r25, r24
 #ifndef SOFT_UART
   while (!(UCSR0A & _BV(UDRE0)));
- 1a2:	80 91 c0 00 	lds	r24, 0x00C0
- 1a6:	85 ff       	sbrs	r24, 5
- 1a8:	fc cf       	rjmp	.-8      	; 0x1a2 <putch+0x2>
+ 186:	80 91 c0 00 	lds	r24, 0x00C0
+ 18a:	85 ff       	sbrs	r24, 5
+ 18c:	fc cf       	rjmp	.-8      	; 0x186 <putch+0x2>
   UDR0 = ch;
- 1aa:	90 93 c6 00 	sts	0x00C6, r25
+ 18e:	90 93 c6 00 	sts	0x00C6, r25
       [uartBit] "I" (UART_TX_BIT)
     :
       "r25"
   );
 #endif
 }
- 1ae:	08 95       	ret
+ 192:	08 95       	ret
 
-000001b0 <getch>:
-  return getch();
+00000194 <getch>:
 }
+#endif
 
 // Watchdog functions. These are only safe with interrupts turned off.
 void watchdogReset() {
   __asm__ __volatile__ (
- 1b0:	a8 95       	wdr
+ 194:	a8 95       	wdr
       [uartBit] "I" (UART_RX_BIT)
     :
       "r25"
 );
 #else
   while(!(UCSR0A & _BV(RXC0)));
- 1b2:	80 91 c0 00 	lds	r24, 0x00C0
- 1b6:	87 ff       	sbrs	r24, 7
- 1b8:	fc cf       	rjmp	.-8      	; 0x1b2 <getch+0x2>
+ 196:	80 91 c0 00 	lds	r24, 0x00C0
+ 19a:	87 ff       	sbrs	r24, 7
+ 19c:	fc cf       	rjmp	.-8      	; 0x196 <getch+0x2>
   ch = UDR0;
- 1ba:	80 91 c6 00 	lds	r24, 0x00C6
+ 19e:	80 91 c6 00 	lds	r24, 0x00C6
   LED_PIN |= _BV(LED);
 #endif
 #endif
 
   return ch;
 }
- 1be:	08 95       	ret
-
-000001c0 <getLen>:
-  } while (--count);
-}
-#endif
-
-uint8_t getLen() {
-  getch();
- 1c0:	f7 df       	rcall	.-18     	; 0x1b0 <getch>
-  length = getch();
- 1c2:	f6 df       	rcall	.-20     	; 0x1b0 <getch>
- 1c4:	80 93 02 02 	sts	0x0202, r24
-  return getch();
-}
- 1c8:	f3 cf       	rjmp	.-26     	; 0x1b0 <getch>
+ 1a2:	08 95       	ret
 
-000001ca <watchdogConfig>:
+000001a4 <watchdogConfig>:
     "wdr\n"
   );
 }
 
 void watchdogConfig(uint8_t x) {
   WDTCSR = _BV(WDCE) | _BV(WDE);
- 1ca:	e0 e6       	ldi	r30, 0x60	; 96
- 1cc:	f0 e0       	ldi	r31, 0x00	; 0
- 1ce:	98 e1       	ldi	r25, 0x18	; 24
- 1d0:	90 83       	st	Z, r25
+ 1a4:	e0 e6       	ldi	r30, 0x60	; 96
+ 1a6:	f0 e0       	ldi	r31, 0x00	; 0
+ 1a8:	98 e1       	ldi	r25, 0x18	; 24
+ 1aa:	90 83       	st	Z, r25
   WDTCSR = x;
- 1d2:	80 83       	st	Z, r24
+ 1ac:	80 83       	st	Z, r24
 }
- 1d4:	08 95       	ret
-
-000001d6 <appStart>:
-
-void appStart() {
-  watchdogConfig(WATCHDOG_OFF);
- 1d6:	80 e0       	ldi	r24, 0x00	; 0
- 1d8:	f8 df       	rcall	.-16     	; 0x1ca <watchdogConfig>
-  __asm__ __volatile__ (
- 1da:	ee 27       	eor	r30, r30
- 1dc:	ff 27       	eor	r31, r31
- 1de:	09 94       	ijmp
+ 1ae:	08 95       	ret
 
-000001e0 <verifySpace>:
+000001b0 <verifySpace>:
   do getch(); while (--count);
   verifySpace();
 }
 
 void verifySpace() {
-  if (getch() != CRC_EOP) appStart();
- 1e0:	e7 df       	rcall	.-50     	; 0x1b0 <getch>
- 1e2:	80 32       	cpi	r24, 0x20	; 32
- 1e4:	09 f0       	breq	.+2      	; 0x1e8 <verifySpace+0x8>
- 1e6:	f7 df       	rcall	.-18     	; 0x1d6 <appStart>
+  if (getch() != CRC_EOP) {
+ 1b0:	f1 df       	rcall	.-30     	; 0x194 <getch>
+ 1b2:	80 32       	cpi	r24, 0x20	; 32
+ 1b4:	19 f0       	breq	.+6      	; 0x1bc <verifySpace+0xc>
+    watchdogConfig(WATCHDOG_16MS);    // shorten WD timeout
+ 1b6:	88 e0       	ldi	r24, 0x08	; 8
+ 1b8:	f5 df       	rcall	.-22     	; 0x1a4 <watchdogConfig>
+ 1ba:	ff cf       	rjmp	.-2      	; 0x1ba <verifySpace+0xa>
+    while (1)			      // and busy-loop so that WD causes
+      ;				      //  a reset and app start.
+  }
   putch(STK_INSYNC);
- 1e8:	84 e1       	ldi	r24, 0x14	; 20
+ 1bc:	84 e1       	ldi	r24, 0x14	; 20
 }
- 1ea:	da cf       	rjmp	.-76     	; 0x1a0 <putch>
+ 1be:	e2 cf       	rjmp	.-60     	; 0x184 <putch>
 
-000001ec <getNch>:
+000001c0 <getNch>:
     ::[count] "M" (UART_B_VALUE)
   );
 }
 #endif
 
 void getNch(uint8_t count) {
- 1ec:	1f 93       	push	r17
- 1ee:	18 2f       	mov	r17, r24
+ 1c0:	1f 93       	push	r17
+ 1c2:	18 2f       	mov	r17, r24
   do getch(); while (--count);
- 1f0:	df df       	rcall	.-66     	; 0x1b0 <getch>
- 1f2:	11 50       	subi	r17, 0x01	; 1
- 1f4:	e9 f7       	brne	.-6      	; 0x1f0 <getNch+0x4>
+ 1c4:	e7 df       	rcall	.-50     	; 0x194 <getch>
+ 1c6:	11 50       	subi	r17, 0x01	; 1
+ 1c8:	e9 f7       	brne	.-6      	; 0x1c4 <getNch+0x4>
   verifySpace();
- 1f6:	f4 df       	rcall	.-24     	; 0x1e0 <verifySpace>
+ 1ca:	f2 df       	rcall	.-28     	; 0x1b0 <verifySpace>
+}
+ 1cc:	1f 91       	pop	r17
+ 1ce:	08 95       	ret
+
+000001d0 <appStart>:
+  WDTCSR = _BV(WDCE) | _BV(WDE);
+  WDTCSR = x;
 }
- 1f8:	1f 91       	pop	r17
- 1fa:	08 95       	ret
+
+void appStart() {
+  watchdogConfig(WATCHDOG_OFF);
+ 1d0:	80 e0       	ldi	r24, 0x00	; 0
+ 1d2:	e8 df       	rcall	.-48     	; 0x1a4 <watchdogConfig>
+  __asm__ __volatile__ (
+ 1d4:	ee 27       	eor	r30, r30
+ 1d6:	ff 27       	eor	r31, r31
+ 1d8:	09 94       	ijmp