Skip to content

Commit 728084c

Browse files
bogdanmbogdanm
committed
Merge pull request #134 from Joey-Ye/master
Clean up GCC_ARM startup code
2 parents 425e197 + feacef8 commit 728084c

File tree

9 files changed

+438
-466
lines changed

9 files changed

+438
-466
lines changed

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_GCC_ARM/startup_MKL25Z4.s

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ Reset_Handler:
150150
ldr r3, =__data_end__
151151

152152
subs r3, r2
153-
ble .flash_to_ram_loop_end
153+
ble .Lflash_to_ram_loop_end
154154

155155
movs r4, 0
156-
.flash_to_ram_loop:
156+
.Lflash_to_ram_loop:
157157
ldr r0, [r1,r4]
158158
str r0, [r2,r4]
159159
adds r4, 4
160160
cmp r4, r3
161-
blt .flash_to_ram_loop
162-
.flash_to_ram_loop_end:
161+
blt .Lflash_to_ram_loop
162+
.Lflash_to_ram_loop_end:
163163

164164
ldr r0, =SystemInit
165165
blx r0
@@ -189,38 +189,41 @@ Reset_Handler:
189189
def_default_handler SysTick_Handler
190190
def_default_handler Default_Handler
191191

192-
def_default_handler DMA0_IRQHandler
193-
def_default_handler DMA1_IRQHandler
194-
def_default_handler DMA2_IRQHandler
195-
def_default_handler DMA3_IRQHandler
196-
def_default_handler FTFA_IRQHandler
197-
def_default_handler LVD_LVW_IRQHandler
198-
def_default_handler LLW_IRQHandler
199-
def_default_handler I2C0_IRQHandler
200-
def_default_handler I2C1_IRQHandler
201-
def_default_handler SPI0_IRQHandler
202-
def_default_handler SPI1_IRQHandler
203-
def_default_handler UART0_IRQHandler
204-
def_default_handler UART1_IRQHandler
205-
def_default_handler UART2_IRQHandler
206-
def_default_handler ADC0_IRQHandler
207-
def_default_handler CMP0_IRQHandler
208-
def_default_handler TPM0_IRQHandler
209-
def_default_handler TPM1_IRQHandler
210-
def_default_handler TPM2_IRQHandler
211-
def_default_handler RTC_IRQHandler
212-
def_default_handler RTC_Seconds_IRQHandler
213-
def_default_handler PIT_IRQHandler
214-
def_default_handler USB0_IRQHandler
215-
def_default_handler DAC0_IRQHandler
216-
def_default_handler TSI0_IRQHandler
217-
def_default_handler MCG_IRQHandler
218-
def_default_handler LPTimer_IRQHandler
219-
def_default_handler PORTA_IRQHandler
220-
def_default_handler PORTD_IRQHandler
221-
222-
.weak DEF_IRQHandler
223-
.set DEF_IRQHandler, Default_Handler
192+
.macro def_irq_default_handler handler_name
193+
.weak \handler_name
194+
.set \handler_name, Default_Handler
195+
.endm
196+
197+
def_irq_default_handler DMA0_IRQHandler
198+
def_irq_default_handler DMA1_IRQHandler
199+
def_irq_default_handler DMA2_IRQHandler
200+
def_irq_default_handler DMA3_IRQHandler
201+
def_irq_default_handler FTFA_IRQHandler
202+
def_irq_default_handler LVD_LVW_IRQHandler
203+
def_irq_default_handler LLW_IRQHandler
204+
def_irq_default_handler I2C0_IRQHandler
205+
def_irq_default_handler I2C1_IRQHandler
206+
def_irq_default_handler SPI0_IRQHandler
207+
def_irq_default_handler SPI1_IRQHandler
208+
def_irq_default_handler UART0_IRQHandler
209+
def_irq_default_handler UART1_IRQHandler
210+
def_irq_default_handler UART2_IRQHandler
211+
def_irq_default_handler ADC0_IRQHandler
212+
def_irq_default_handler CMP0_IRQHandler
213+
def_irq_default_handler TPM0_IRQHandler
214+
def_irq_default_handler TPM1_IRQHandler
215+
def_irq_default_handler TPM2_IRQHandler
216+
def_irq_default_handler RTC_IRQHandler
217+
def_irq_default_handler RTC_Seconds_IRQHandler
218+
def_irq_default_handler PIT_IRQHandler
219+
def_irq_default_handler USB0_IRQHandler
220+
def_irq_default_handler DAC0_IRQHandler
221+
def_irq_default_handler TSI0_IRQHandler
222+
def_irq_default_handler MCG_IRQHandler
223+
def_irq_default_handler LPTimer_IRQHandler
224+
def_irq_default_handler PORTA_IRQHandler
225+
def_irq_default_handler PORTD_IRQHandler
226+
def_irq_default_handler DEF_IRQHandler
224227

225228
/* Flash protection region, placed at 0x400 */
226229
.text

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL46Z/TOOLCHAIN_GCC_ARM/startup_MKL46Z4.s

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ Reset_Handler:
150150
ldr r3, =__data_end__
151151

152152
subs r3, r2
153-
ble .flash_to_ram_loop_end
153+
ble .Lflash_to_ram_loop_end
154154

155155
movs r4, 0
156-
.flash_to_ram_loop:
156+
.Lflash_to_ram_loop:
157157
ldr r0, [r1,r4]
158158
str r0, [r2,r4]
159159
adds r4, 4
160160
cmp r4, r3
161-
blt .flash_to_ram_loop
162-
.flash_to_ram_loop_end:
161+
blt .Lflash_to_ram_loop
162+
.Lflash_to_ram_loop_end:
163163

164164
ldr r0, =SystemInit
165165
blx r0
@@ -187,44 +187,45 @@ Reset_Handler:
187187
def_default_handler SVC_Handler
188188
def_default_handler PendSV_Handler
189189
def_default_handler SysTick_Handler
190-
def_default_handler Default_Handler
191-
192-
def_default_handler DMA0_IRQHandler
193-
def_default_handler DMA1_IRQHandler
194-
def_default_handler DMA2_IRQHandler
195-
def_default_handler DMA3_IRQHandler
196-
def_default_handler FTFA_IRQHandler
197-
def_default_handler LVD_LVW_IRQHandler
198-
def_default_handler LLW_IRQHandler
199-
def_default_handler I2C0_IRQHandler
200-
def_default_handler I2C1_IRQHandler
201-
def_default_handler SPI0_IRQHandler
202-
def_default_handler SPI1_IRQHandler
203-
def_default_handler UART0_IRQHandler
204-
def_default_handler UART1_IRQHandler
205-
def_default_handler UART2_IRQHandler
206-
def_default_handler ADC0_IRQHandler
207-
def_default_handler CMP0_IRQHandler
208-
def_default_handler TPM0_IRQHandler
209-
def_default_handler TPM1_IRQHandler
210-
def_default_handler TPM2_IRQHandler
211-
def_default_handler RTC_IRQHandler
212-
def_default_handler RTC_Seconds_IRQHandler
213-
def_default_handler PIT_IRQHandler
214-
def_default_handler I2S_IRQHandler
215-
def_default_handler USB0_IRQHandler
216-
def_default_handler DAC0_IRQHandler
217-
def_default_handler TSI0_IRQHandler
218-
def_default_handler MCG_IRQHandler
219-
def_default_handler LPTimer_IRQHandler
220-
def_default_handler LCD_IRQHandler
221-
def_default_handler PORTA_IRQHandler
222-
def_default_handler PORTD_IRQHandler
223-
224-
225-
226-
.weak DEF_IRQHandler
227-
.set DEF_IRQHandler, Default_Handler
190+
def_default_handler Default_Handler
191+
192+
.macro def_irq_default_handler handler_name
193+
.weak \handler_name
194+
.set \handler_name, Default_Handler
195+
.endm
196+
197+
def_irq_default_handler DMA0_IRQHandler
198+
def_irq_default_handler DMA1_IRQHandler
199+
def_irq_default_handler DMA2_IRQHandler
200+
def_irq_default_handler DMA3_IRQHandler
201+
def_irq_default_handler FTFA_IRQHandler
202+
def_irq_default_handler LVD_LVW_IRQHandler
203+
def_irq_default_handler LLW_IRQHandler
204+
def_irq_default_handler I2C0_IRQHandler
205+
def_irq_default_handler I2C1_IRQHandler
206+
def_irq_default_handler SPI0_IRQHandler
207+
def_irq_default_handler SPI1_IRQHandler
208+
def_irq_default_handler UART0_IRQHandler
209+
def_irq_default_handler UART1_IRQHandler
210+
def_irq_default_handler UART2_IRQHandler
211+
def_irq_default_handler ADC0_IRQHandler
212+
def_irq_default_handler CMP0_IRQHandler
213+
def_irq_default_handler TPM0_IRQHandler
214+
def_irq_default_handler TPM1_IRQHandler
215+
def_irq_default_handler TPM2_IRQHandler
216+
def_irq_default_handler RTC_IRQHandler
217+
def_irq_default_handler RTC_Seconds_IRQHandler
218+
def_irq_default_handler PIT_IRQHandler
219+
def_irq_default_handler I2S_IRQHandler
220+
def_irq_default_handler USB0_IRQHandler
221+
def_irq_default_handler DAC0_IRQHandler
222+
def_irq_default_handler TSI0_IRQHandler
223+
def_irq_default_handler MCG_IRQHandler
224+
def_irq_default_handler LPTimer_IRQHandler
225+
def_irq_default_handler LCD_IRQHandler
226+
def_irq_default_handler PORTA_IRQHandler
227+
def_irq_default_handler PORTD_IRQHandler
228+
def_irq_default_handler DEF_IRQHandler
228229

229230
/* Flash protection region, placed at 0x400 */
230231
.text

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/startup_LPC11xx.s

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ Reset_Handler:
150150
ldr r3, =__data_end__
151151

152152
subs r3, r2
153-
ble .flash_to_ram_loop_end
153+
ble .Lflash_to_ram_loop_end
154154

155155
movs r4, 0
156-
.flash_to_ram_loop:
156+
.Lflash_to_ram_loop:
157157
ldr r0, [r1,r4]
158158
str r0, [r2,r4]
159159
adds r4, 4
160160
cmp r4, r3
161-
blt .flash_to_ram_loop
162-
.flash_to_ram_loop_end:
161+
blt .Lflash_to_ram_loop
162+
.Lflash_to_ram_loop_end:
163163

164164
ldr r0, =SystemInit
165165
blx r0
@@ -181,33 +181,36 @@ Reset_Handler:
181181
b .
182182
.size \handler_name, . - \handler_name
183183
.endm
184-
185-
def_default_handler NMI_Handler
186-
def_default_handler HardFault_Handler
187-
def_default_handler SVC_Handler
188-
def_default_handler PendSV_Handler
189-
def_default_handler SysTick_Handler
190-
def_default_handler Default_Handler
191-
192-
def_default_handler WAKEUP_IRQHandler
193-
def_default_handler SSP1_IRQHandler
194-
def_default_handler I2C_IRQHandler
195-
def_default_handler TIMER16_0_IRQHandler
196-
def_default_handler TIMER16_1_IRQHandler
197-
def_default_handler TIMER32_0_IRQHandler
198-
def_default_handler TIMER32_1_IRQHandler
199-
def_default_handler SSP0_IRQHandler
200-
def_default_handler UART_IRQHandler
201-
def_default_handler ADC_IRQHandler
202-
def_default_handler WDT_IRQHandler
203-
def_default_handler BOD_IRQHandler
204-
def_default_handler PIOINT3_IRQHandler
205-
def_default_handler PIOINT2_IRQHandler
206-
def_default_handler PIOINT1_IRQHandler
207-
def_default_handler PIOINT0_IRQHandler
208184

209-
.weak DEF_IRQHandler
210-
.set DEF_IRQHandler, Default_Handler
185+
def_default_handler NMI_Handler
186+
def_default_handler HardFault_Handler
187+
def_default_handler SVC_Handler
188+
def_default_handler PendSV_Handler
189+
def_default_handler SysTick_Handler
190+
def_default_handler Default_Handler
191+
192+
.macro def_irq_default_handler handler_name
193+
.weak \handler_name
194+
.set \handler_name, Default_Handler
195+
.endm
196+
197+
def_irq_default_handler WAKEUP_IRQHandler
198+
def_irq_default_handler SSP1_IRQHandler
199+
def_irq_default_handler I2C_IRQHandler
200+
def_irq_default_handler TIMER16_0_IRQHandler
201+
def_irq_default_handler TIMER16_1_IRQHandler
202+
def_irq_default_handler TIMER32_0_IRQHandler
203+
def_irq_default_handler TIMER32_1_IRQHandler
204+
def_irq_default_handler SSP0_IRQHandler
205+
def_irq_default_handler UART_IRQHandler
206+
def_irq_default_handler ADC_IRQHandler
207+
def_irq_default_handler WDT_IRQHandler
208+
def_irq_default_handler BOD_IRQHandler
209+
def_irq_default_handler PIOINT3_IRQHandler
210+
def_irq_default_handler PIOINT2_IRQHandler
211+
def_irq_default_handler PIOINT1_IRQHandler
212+
def_irq_default_handler PIOINT0_IRQHandler
213+
def_irq_default_handler DEF_IRQHandler
211214

212215
.end
213216

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_ARM/startup_LPC11xx.s

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ Reset_Handler:
150150
ldr r3, =__data_end__
151151

152152
subs r3, r2
153-
ble .flash_to_ram_loop_end
153+
ble .Lflash_to_ram_loop_end
154154

155155
movs r4, 0
156-
.flash_to_ram_loop:
156+
.Lflash_to_ram_loop:
157157
ldr r0, [r1,r4]
158158
str r0, [r2,r4]
159159
adds r4, 4
160160
cmp r4, r3
161-
blt .flash_to_ram_loop
162-
.flash_to_ram_loop_end:
161+
blt .Lflash_to_ram_loop
162+
.Lflash_to_ram_loop_end:
163163

164164
ldr r0, =SystemInit
165165
blx r0
@@ -181,33 +181,36 @@ Reset_Handler:
181181
b .
182182
.size \handler_name, . - \handler_name
183183
.endm
184-
185-
def_default_handler NMI_Handler
186-
def_default_handler HardFault_Handler
187-
def_default_handler SVC_Handler
188-
def_default_handler PendSV_Handler
189-
def_default_handler SysTick_Handler
190-
def_default_handler Default_Handler
191-
192-
def_default_handler WAKEUP_IRQHandler
193-
def_default_handler SSP1_IRQHandler
194-
def_default_handler I2C_IRQHandler
195-
def_default_handler TIMER16_0_IRQHandler
196-
def_default_handler TIMER16_1_IRQHandler
197-
def_default_handler TIMER32_0_IRQHandler
198-
def_default_handler TIMER32_1_IRQHandler
199-
def_default_handler SSP0_IRQHandler
200-
def_default_handler UART_IRQHandler
201-
def_default_handler ADC_IRQHandler
202-
def_default_handler WDT_IRQHandler
203-
def_default_handler BOD_IRQHandler
204-
def_default_handler PIOINT3_IRQHandler
205-
def_default_handler PIOINT2_IRQHandler
206-
def_default_handler PIOINT1_IRQHandler
207-
def_default_handler PIOINT0_IRQHandler
208184

209-
.weak DEF_IRQHandler
210-
.set DEF_IRQHandler, Default_Handler
185+
def_default_handler NMI_Handler
186+
def_default_handler HardFault_Handler
187+
def_default_handler SVC_Handler
188+
def_default_handler PendSV_Handler
189+
def_default_handler SysTick_Handler
190+
def_default_handler Default_Handler
191+
192+
.macro def_irq_default_handler handler_name
193+
.weak \handler_name
194+
.set \handler_name, Default_Handler
195+
.endm
196+
197+
def_irq_default_handler WAKEUP_IRQHandler
198+
def_irq_default_handler SSP1_IRQHandler
199+
def_irq_default_handler I2C_IRQHandler
200+
def_irq_default_handler TIMER16_0_IRQHandler
201+
def_irq_default_handler TIMER16_1_IRQHandler
202+
def_irq_default_handler TIMER32_0_IRQHandler
203+
def_irq_default_handler TIMER32_1_IRQHandler
204+
def_irq_default_handler SSP0_IRQHandler
205+
def_irq_default_handler UART_IRQHandler
206+
def_irq_default_handler ADC_IRQHandler
207+
def_irq_default_handler WDT_IRQHandler
208+
def_irq_default_handler BOD_IRQHandler
209+
def_irq_default_handler PIOINT3_IRQHandler
210+
def_irq_default_handler PIOINT2_IRQHandler
211+
def_irq_default_handler PIOINT1_IRQHandler
212+
def_irq_default_handler PIOINT0_IRQHandler
213+
def_irq_default_handler DEF_IRQHandler
211214

212215
.end
213216

0 commit comments

Comments
 (0)