rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity
07a88dc998
Arduino/hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst
WestfW 07a88dc998 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 6f7687b0f9)
2011-10-10 12:11:15 -04:00

562 lines
18 KiB
Plaintext
Raw Blame History

optiboot_atmega328.elf: file format elf32-avr
Sections:
Idx Name Size VMA LMA File off Algn
0 .text 000001da 00007e00 00007e00 00000054 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 .version 00000002 00007ffe 00007ffe 0000022e 2**0
CONTENTS, READONLY
2 .debug_aranges 00000028 00000000 00000000 00000230 2**0
CONTENTS, READONLY, DEBUGGING
3 .debug_pubnames 0000005f 00000000 00000000 00000258 2**0
CONTENTS, READONLY, DEBUGGING
4 .debug_info 0000028c 00000000 00000000 000002b7 2**0
CONTENTS, READONLY, DEBUGGING
5 .debug_abbrev 00000199 00000000 00000000 00000543 2**0
CONTENTS, READONLY, DEBUGGING
6 .debug_line 00000456 00000000 00000000 000006dc 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_frame 00000080 00000000 00000000 00000b34 2**2
CONTENTS, READONLY, DEBUGGING
8 .debug_str 00000149 00000000 00000000 00000bb4 2**0
CONTENTS, READONLY, DEBUGGING
9 .debug_loc 0000027e 00000000 00000000 00000cfd 2**0
CONTENTS, READONLY, DEBUGGING
10 .debug_ranges 00000060 00000000 00000000 00000f7b 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
00007e00 <main>:
#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) {
7e00: 11 24 eor r1, r1
#ifdef __AVR_ATmega8__
SP=RAMEND; // This is done by hardware reset
#endif
// Adaboot no-wait mod
ch = MCUSR;
7e02: 84 b7 in r24, 0x34 ; 52
MCUSR = 0;
7e04: 14 be out 0x34, r1 ; 52
if (!(ch & _BV(EXTRF))) appStart();
7e06: 81 ff sbrs r24, 1
7e08: e3 d0 rcall .+454 ; 0x7fd0 <appStart>
#if LED_START_FLASHES > 0
// Set up Timer 1 for timeout counter
TCCR1B = _BV(CS12) | _BV(CS10); // div 1024
7e0a: 85 e0 ldi r24, 0x05 ; 5
7e0c: 80 93 81 00 sts 0x0081, r24
UCSRA = _BV(U2X); //Double speed mode USART
UCSRB = _BV(RXEN) | _BV(TXEN); // enable Rx & Tx
UCSRC = _BV(URSEL) | _BV(UCSZ1) | _BV(UCSZ0); // config USART; 8N1
UBRRL = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
#else
UCSR0A = _BV(U2X0); //Double speed mode USART0
7e10: 82 e0 ldi r24, 0x02 ; 2
7e12: 80 93 c0 00 sts 0x00C0, r24
UCSR0B = _BV(RXEN0) | _BV(TXEN0);
7e16: 88 e1 ldi r24, 0x18 ; 24
7e18: 80 93 c1 00 sts 0x00C1, r24
UCSR0C = _BV(UCSZ00) | _BV(UCSZ01);
7e1c: 86 e0 ldi r24, 0x06 ; 6
7e1e: 80 93 c2 00 sts 0x00C2, r24
UBRR0L = (uint8_t)( (F_CPU + BAUD_RATE * 4L) / (BAUD_RATE * 8L) - 1 );
7e22: 80 e1 ldi r24, 0x10 ; 16
7e24: 80 93 c4 00 sts 0x00C4, r24
#endif
#endif
// Set up watchdog to trigger after 500ms
watchdogConfig(WATCHDOG_1S);
7e28: 8e e0 ldi r24, 0x0E ; 14
7e2a: bc d0 rcall .+376 ; 0x7fa4 <watchdogConfig>
/* Set LED pin as output */
LED_DDR |= _BV(LED);
7e2c: 25 9a sbi 0x04, 5 ; 4
7e2e: 86 e0 ldi r24, 0x06 ; 6
}
#if LED_START_FLASHES > 0
void flash_led(uint8_t count) {
do {
TCNT1 = -(F_CPU/(1024*16));
7e30: 20 e3 ldi r18, 0x30 ; 48
7e32: 3c ef ldi r19, 0xFC ; 252
TIFR1 = _BV(TOV1);
7e34: 91 e0 ldi r25, 0x01 ; 1
}
#if LED_START_FLASHES > 0
void flash_led(uint8_t count) {
do {
TCNT1 = -(F_CPU/(1024*16));
7e36: 30 93 85 00 sts 0x0085, r19
7e3a: 20 93 84 00 sts 0x0084, r18
TIFR1 = _BV(TOV1);
7e3e: 96 bb out 0x16, r25 ; 22
while(!(TIFR1 & _BV(TOV1)));
7e40: b0 9b sbis 0x16, 0 ; 22
7e42: fe cf rjmp .-4 ; 0x7e40 <main+0x40>
#ifdef __AVR_ATmega8__
LED_PORT ^= _BV(LED);
#else
LED_PIN |= _BV(LED);
7e44: 1d 9a sbi 0x03, 5 ; 3
}
#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
__asm__ __volatile__ (
7e46: a8 95 wdr
LED_PORT ^= _BV(LED);
#else
LED_PIN |= _BV(LED);
#endif
watchdogReset();
} while (--count);
7e48: 81 50 subi r24, 0x01 ; 1
7e4a: a9 f7 brne .-22 ; 0x7e36 <main+0x36>
/* get character from UART */
ch = getch();
if(ch == STK_GET_PARAMETER) {
// GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
getNch(1);
7e4c: 99 24 eor r9, r9
7e4e: 93 94 inc r9
__boot_page_fill_short((uint16_t)(void*)addrPtr,a);
addrPtr += 2;
} while (--ch);
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
7e50: a5 e0 ldi r26, 0x05 ; 5
7e52: aa 2e mov r10, r26
boot_spm_busy_wait();
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
7e54: f1 e1 ldi r31, 0x11 ; 17
7e56: bf 2e mov r11, r31
#endif
/* Forever loop */
for (;;) {
/* get character from UART */
ch = getch();
7e58: 9d d0 rcall .+314 ; 0x7f94 <getch>
if(ch == STK_GET_PARAMETER) {
7e5a: 81 34 cpi r24, 0x41 ; 65
7e5c: 21 f4 brne .+8 ; 0x7e66 <main+0x66>
// GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
getNch(1);
7e5e: 81 e0 ldi r24, 0x01 ; 1
7e60: af d0 rcall .+350 ; 0x7fc0 <getNch>
putch(0x03);
7e62: 83 e0 ldi r24, 0x03 ; 3
7e64: 1f c0 rjmp .+62 ; 0x7ea4 <main+0xa4>
}
else if(ch == STK_SET_DEVICE) {
7e66: 82 34 cpi r24, 0x42 ; 66
7e68: 11 f4 brne .+4 ; 0x7e6e <main+0x6e>
// SET DEVICE is ignored
getNch(20);
7e6a: 84 e1 ldi r24, 0x14 ; 20
7e6c: 03 c0 rjmp .+6 ; 0x7e74 <main+0x74>
}
else if(ch == STK_SET_DEVICE_EXT) {
7e6e: 85 34 cpi r24, 0x45 ; 69
7e70: 19 f4 brne .+6 ; 0x7e78 <main+0x78>
// SET DEVICE EXT is ignored
getNch(5);
7e72: 85 e0 ldi r24, 0x05 ; 5
7e74: a5 d0 rcall .+330 ; 0x7fc0 <getNch>
7e76: 83 c0 rjmp .+262 ; 0x7f7e <main+0x17e>
}
else if(ch == STK_LOAD_ADDRESS) {
7e78: 85 35 cpi r24, 0x55 ; 85
7e7a: 79 f4 brne .+30 ; 0x7e9a <main+0x9a>
// LOAD ADDRESS
uint16_t newAddress;
newAddress = getch();
7e7c: 8b d0 rcall .+278 ; 0x7f94 <getch>
newAddress = (newAddress & 0xff) | (getch() << 8);
7e7e: e8 2e mov r14, r24
7e80: ff 24 eor r15, r15
7e82: 88 d0 rcall .+272 ; 0x7f94 <getch>
7e84: 08 2f mov r16, r24
7e86: 10 e0 ldi r17, 0x00 ; 0
7e88: 10 2f mov r17, r16
7e8a: 00 27 eor r16, r16
7e8c: 0e 29 or r16, r14
7e8e: 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
7e90: 00 0f add r16, r16
7e92: 11 1f adc r17, r17
address = newAddress;
verifySpace();
7e94: 8d d0 rcall .+282 ; 0x7fb0 <verifySpace>
7e96: 68 01 movw r12, r16
7e98: 72 c0 rjmp .+228 ; 0x7f7e <main+0x17e>
}
else if(ch == STK_UNIVERSAL) {
7e9a: 86 35 cpi r24, 0x56 ; 86
7e9c: 29 f4 brne .+10 ; 0x7ea8 <main+0xa8>
// UNIVERSAL command is ignored
getNch(4);
7e9e: 84 e0 ldi r24, 0x04 ; 4
7ea0: 8f d0 rcall .+286 ; 0x7fc0 <getNch>
putch(0x00);
7ea2: 80 e0 ldi r24, 0x00 ; 0
7ea4: 6f d0 rcall .+222 ; 0x7f84 <putch>
7ea6: 6b c0 rjmp .+214 ; 0x7f7e <main+0x17e>
}
/* Write memory, length is big endian and is in bytes */
else if(ch == STK_PROG_PAGE) {
7ea8: 84 36 cpi r24, 0x64 ; 100
7eaa: 09 f0 breq .+2 ; 0x7eae <main+0xae>
7eac: 42 c0 rjmp .+132 ; 0x7f32 <main+0x132>
// PROGRAM PAGE - we support flash programming only, not EEPROM
uint8_t *bufPtr;
uint16_t addrPtr;
getch(); /* getlen() */
7eae: 72 d0 rcall .+228 ; 0x7f94 <getch>
length = getch();
7eb0: 71 d0 rcall .+226 ; 0x7f94 <getch>
7eb2: 08 2f mov r16, r24
getch();
7eb4: 6f d0 rcall .+222 ; 0x7f94 <getch>
// If we are in RWW section, immediately start page erase
if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
7eb6: 80 e0 ldi r24, 0x00 ; 0
7eb8: c8 16 cp r12, r24
7eba: 80 e7 ldi r24, 0x70 ; 112
7ebc: d8 06 cpc r13, r24
7ebe: 20 f4 brcc .+8 ; 0x7ec8 <main+0xc8>
7ec0: 83 e0 ldi r24, 0x03 ; 3
7ec2: f6 01 movw r30, r12
7ec4: 87 bf out 0x37, r24 ; 55
7ec6: e8 95 spm
7ec8: c0 e0 ldi r28, 0x00 ; 0
7eca: d1 e0 ldi r29, 0x01 ; 1
// While that is going on, read in page contents
bufPtr = buff;
do *bufPtr++ = getch();
7ecc: 63 d0 rcall .+198 ; 0x7f94 <getch>
7ece: 89 93 st Y+, r24
while (--length);
7ed0: 0c 17 cp r16, r28
7ed2: e1 f7 brne .-8 ; 0x7ecc <main+0xcc>
// 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);
7ed4: f0 e0 ldi r31, 0x00 ; 0
7ed6: cf 16 cp r12, r31
7ed8: f0 e7 ldi r31, 0x70 ; 112
7eda: df 06 cpc r13, r31
7edc: 20 f0 brcs .+8 ; 0x7ee6 <main+0xe6>
7ede: 83 e0 ldi r24, 0x03 ; 3
7ee0: f6 01 movw r30, r12
7ee2: 87 bf out 0x37, r24 ; 55
7ee4: e8 95 spm
// Read command terminator, start reply
verifySpace();
7ee6: 64 d0 rcall .+200 ; 0x7fb0 <verifySpace>
// If only a partial page is to be programmed, the erase might not be complete.
// So check that here
boot_spm_busy_wait();
7ee8: 07 b6 in r0, 0x37 ; 55
7eea: 00 fc sbrc r0, 0
7eec: fd cf rjmp .-6 ; 0x7ee8 <main+0xe8>
7eee: a6 01 movw r20, r12
7ef0: a0 e0 ldi r26, 0x00 ; 0
7ef2: b1 e0 ldi r27, 0x01 ; 1
bufPtr = buff;
addrPtr = (uint16_t)(void*)address;
ch = SPM_PAGESIZE / 2;
do {
uint16_t a;
a = *bufPtr++;
7ef4: 2c 91 ld r18, X
7ef6: 30 e0 ldi r19, 0x00 ; 0
a |= (*bufPtr++) << 8;
7ef8: 11 96 adiw r26, 0x01 ; 1
7efa: 8c 91 ld r24, X
7efc: 11 97 sbiw r26, 0x01 ; 1
7efe: 90 e0 ldi r25, 0x00 ; 0
7f00: 98 2f mov r25, r24
7f02: 88 27 eor r24, r24
7f04: 82 2b or r24, r18
7f06: 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) {
7f08: 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);
7f0a: fa 01 movw r30, r20
7f0c: 0c 01 movw r0, r24
7f0e: 97 be out 0x37, r9 ; 55
7f10: e8 95 spm
7f12: 11 24 eor r1, r1
addrPtr += 2;
7f14: 4e 5f subi r20, 0xFE ; 254
7f16: 5f 4f sbci r21, 0xFF ; 255
} while (--ch);
7f18: f1 e0 ldi r31, 0x01 ; 1
7f1a: a0 38 cpi r26, 0x80 ; 128
7f1c: bf 07 cpc r27, r31
7f1e: 51 f7 brne .-44 ; 0x7ef4 <main+0xf4>
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
7f20: f6 01 movw r30, r12
7f22: a7 be out 0x37, r10 ; 55
7f24: e8 95 spm
boot_spm_busy_wait();
7f26: 07 b6 in r0, 0x37 ; 55
7f28: 00 fc sbrc r0, 0
7f2a: fd cf rjmp .-6 ; 0x7f26 <main+0x126>
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
7f2c: b7 be out 0x37, r11 ; 55
7f2e: e8 95 spm
7f30: 26 c0 rjmp .+76 ; 0x7f7e <main+0x17e>
#endif
}
/* Read memory block mode, length is big endian. */
else if(ch == STK_READ_PAGE) {
7f32: 84 37 cpi r24, 0x74 ; 116
7f34: b1 f4 brne .+44 ; 0x7f62 <main+0x162>
// READ PAGE - we only read flash
getch(); /* getlen() */
7f36: 2e d0 rcall .+92 ; 0x7f94 <getch>
length = getch();
7f38: 2d d0 rcall .+90 ; 0x7f94 <getch>
7f3a: f8 2e mov r15, r24
getch();
7f3c: 2b d0 rcall .+86 ; 0x7f94 <getch>
verifySpace();
7f3e: 38 d0 rcall .+112 ; 0x7fb0 <verifySpace>
7f40: f6 01 movw r30, r12
7f42: ef 2c mov r14, r15
putch(result);
address++;
}
while (--length);
#else
do putch(pgm_read_byte_near(address++));
7f44: 8f 01 movw r16, r30
7f46: 0f 5f subi r16, 0xFF ; 255
7f48: 1f 4f sbci r17, 0xFF ; 255
7f4a: 84 91 lpm r24, Z+
7f4c: 1b d0 rcall .+54 ; 0x7f84 <putch>
while (--length);
7f4e: ea 94 dec r14
7f50: f8 01 movw r30, r16
7f52: c1 f7 brne .-16 ; 0x7f44 <main+0x144>
#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) {
7f54: 08 94 sec
7f56: c1 1c adc r12, r1
7f58: d1 1c adc r13, r1
7f5a: fa 94 dec r15
7f5c: cf 0c add r12, r15
7f5e: d1 1c adc r13, r1
7f60: 0e c0 rjmp .+28 ; 0x7f7e <main+0x17e>
#endif
#endif
}
/* Get device signature bytes */
else if(ch == STK_READ_SIGN) {
7f62: 85 37 cpi r24, 0x75 ; 117
7f64: 39 f4 brne .+14 ; 0x7f74 <main+0x174>
// READ SIGN - return what Avrdude wants to hear
verifySpace();
7f66: 24 d0 rcall .+72 ; 0x7fb0 <verifySpace>
putch(SIGNATURE_0);
7f68: 8e e1 ldi r24, 0x1E ; 30
7f6a: 0c d0 rcall .+24 ; 0x7f84 <putch>
putch(SIGNATURE_1);
7f6c: 85 e9 ldi r24, 0x95 ; 149
7f6e: 0a d0 rcall .+20 ; 0x7f84 <putch>
putch(SIGNATURE_2);
7f70: 8f e0 ldi r24, 0x0F ; 15
7f72: 98 cf rjmp .-208 ; 0x7ea4 <main+0xa4>
}
else if (ch == 'Q') {
7f74: 81 35 cpi r24, 0x51 ; 81
7f76: 11 f4 brne .+4 ; 0x7f7c <main+0x17c>
// Adaboot no-wait mod
watchdogConfig(WATCHDOG_16MS);
7f78: 88 e0 ldi r24, 0x08 ; 8
7f7a: 14 d0 rcall .+40 ; 0x7fa4 <watchdogConfig>
verifySpace();
}
else {
// This covers the response to commands like STK_ENTER_PROGMODE
verifySpace();
7f7c: 19 d0 rcall .+50 ; 0x7fb0 <verifySpace>
}
putch(STK_OK);
7f7e: 80 e1 ldi r24, 0x10 ; 16
7f80: 01 d0 rcall .+2 ; 0x7f84 <putch>
7f82: 6a cf rjmp .-300 ; 0x7e58 <main+0x58>
00007f84 <putch>:
}
}
void putch(char ch) {
7f84: 98 2f mov r25, r24
#ifndef SOFT_UART
while (!(UCSR0A & _BV(UDRE0)));
7f86: 80 91 c0 00 lds r24, 0x00C0
7f8a: 85 ff sbrs r24, 5
7f8c: fc cf rjmp .-8 ; 0x7f86 <putch+0x2>
UDR0 = ch;
7f8e: 90 93 c6 00 sts 0x00C6, r25
[uartBit] "I" (UART_TX_BIT)
:
"r25"
);
#endif
}
7f92: 08 95 ret
00007f94 <getch>:
}
#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
__asm__ __volatile__ (
7f94: a8 95 wdr
[uartBit] "I" (UART_RX_BIT)
:
"r25"
);
#else
while(!(UCSR0A & _BV(RXC0)));
7f96: 80 91 c0 00 lds r24, 0x00C0
7f9a: 87 ff sbrs r24, 7
7f9c: fc cf rjmp .-8 ; 0x7f96 <getch+0x2>
ch = UDR0;
7f9e: 80 91 c6 00 lds r24, 0x00C6
LED_PIN |= _BV(LED);
#endif
#endif
return ch;
}
7fa2: 08 95 ret
00007fa4 <watchdogConfig>:
"wdr\n"
);
}
void watchdogConfig(uint8_t x) {
WDTCSR = _BV(WDCE) | _BV(WDE);
7fa4: e0 e6 ldi r30, 0x60 ; 96
7fa6: f0 e0 ldi r31, 0x00 ; 0
7fa8: 98 e1 ldi r25, 0x18 ; 24
7faa: 90 83 st Z, r25
WDTCSR = x;
7fac: 80 83 st Z, r24
}
7fae: 08 95 ret
00007fb0 <verifySpace>:
do getch(); while (--count);
verifySpace();
}
void verifySpace() {
if (getch() != CRC_EOP) {
7fb0: f1 df rcall .-30 ; 0x7f94 <getch>
7fb2: 80 32 cpi r24, 0x20 ; 32
7fb4: 19 f0 breq .+6 ; 0x7fbc <verifySpace+0xc>
watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
7fb6: 88 e0 ldi r24, 0x08 ; 8
7fb8: f5 df rcall .-22 ; 0x7fa4 <watchdogConfig>
7fba: ff cf rjmp .-2 ; 0x7fba <verifySpace+0xa>
while (1) // and busy-loop so that WD causes
; // a reset and app start.
}
putch(STK_INSYNC);
7fbc: 84 e1 ldi r24, 0x14 ; 20
}
7fbe: e2 cf rjmp .-60 ; 0x7f84 <putch>
00007fc0 <getNch>:
::[count] "M" (UART_B_VALUE)
);
}
#endif
void getNch(uint8_t count) {
7fc0: 1f 93 push r17
7fc2: 18 2f mov r17, r24
do getch(); while (--count);
7fc4: e7 df rcall .-50 ; 0x7f94 <getch>
7fc6: 11 50 subi r17, 0x01 ; 1
7fc8: e9 f7 brne .-6 ; 0x7fc4 <getNch+0x4>
verifySpace();
7fca: f2 df rcall .-28 ; 0x7fb0 <verifySpace>
}
7fcc: 1f 91 pop r17
7fce: 08 95 ret
00007fd0 <appStart>:
WDTCSR = _BV(WDCE) | _BV(WDE);
WDTCSR = x;
}
void appStart() {
watchdogConfig(WATCHDOG_OFF);
7fd0: 80 e0 ldi r24, 0x00 ; 0
7fd2: e8 df rcall .-48 ; 0x7fa4 <watchdogConfig>
__asm__ __volatile__ (
7fd4: ee 27 eor r30, r30
7fd6: ff 27 eor r31, r31
7fd8: 09 94 ijmp
Reference in New Issue View Git Blame Copy Permalink