cpu/kw2x: optimization of startup code

This commit is contained in:
Hauke Petersen 2015-06-12 18:42:53 +02:00
parent 253e7ce715
commit 88130fcb54
2 changed files with 91 additions and 87 deletions

View File

@ -23,6 +23,6 @@ export CFLAGS += -DCPU_ARCH_$(ARCH)
export COMMON_STARTUP = $(KINETIS_COMMON) export COMMON_STARTUP = $(KINETIS_COMMON)
# add the CPU specific system calls implementations for the linker # add the CPU specific system calls implementations for the linker
export UNDEF += $(BINDIR)cpu/interrupt-vector.o export UNDEF += $(BINDIR)cpu/vector.o
include $(RIOTCPU)/Makefile.include.cortexm_common include $(RIOTCPU)/Makefile.include.cortexm_common

View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2014 Freie Universität Berlin * Copyright (C) 2014 Freie Universität Berlin
* Copyright (C) 2014 PHYTEC Messtechnik GmbH * Copyright (C) 2015 PHYTEC Messtechnik GmbH
* *
* This file is subject to the terms and conditions of the GNU Lesser General * This file is subject to the terms and conditions of the GNU Lesser General
* Public License v2.1. See the file LICENSE in the top level directory for more * Public License v2.1. See the file LICENSE in the top level directory for more
@ -21,89 +21,91 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include "cpu_conf.h" #include "vectors_cortexm.h"
#include "fault_handlers.h" #include "wdog.h"
/** /**
* memory markers as defined in the linker script * memory markers as defined in the linker script
*/ */
extern uint32_t _estack; extern uint32_t _estack;
extern void reset_handler(void); void pre_startup (void)
{
/* disable the WDOG */
wdog_disable();
}
void dummy_handler(void) void dummy_handler(void)
{ {
isr_unhandled(); dummy_handler_default();
} }
/* Cortex-M specific interrupt vectors */ /* Cortex-M specific interrupt vectors */
void isr_svc(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_svc(void);
void isr_pendsv(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pendsv(void);
void isr_systick(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_systick(void);
/* MKW22D512 specific interrupt vector */ /* MKW22D512 specific interrupt vector */
void isr_dma0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma0(void);
void isr_dma1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma1(void);
void isr_dma2(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma2(void);
void isr_dma3(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma3(void);
void isr_dma4(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma4(void);
void isr_dma5(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma5(void);
void isr_dma6(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma6(void);
void isr_dma7(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma7(void);
void isr_dma8(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma8(void);
void isr_dma9(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma9(void);
void isr_dma10(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma10(void);
void isr_dma11(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma11(void);
void isr_dma12(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma12(void);
void isr_dma13(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma13(void);
void isr_dma14(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma14(void);
void isr_dma15(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma15(void);
void isr_dma_error(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dma_error(void);
void isr_mcm(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_mcm(void);
void isr_ftfl(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_ftfl(void);
void isr_ftfl_collision(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_ftfl_collision(void);
void isr_pmc(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pmc(void);
void isr_llwu(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_llwu(void);
void isr_wdog_ewm(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_wdog_ewm(void);
void isr_rng(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_rng(void);
void isr_i2c0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_i2c0(void);
void isr_i2c1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_i2c1(void);
void isr_spi0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_spi0(void);
void isr_spi1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_spi1(void);
void isr_i2s0_tx(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_i2s0_tx(void);
void isr_i2s0_rx(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_i2s0_rx(void);
void isr_uart0_rx_tx(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart0_rx_tx(void);
void isr_uart0_err(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart0_err(void);
void isr_uart1_rx_tx(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart1_rx_tx(void);
void isr_uart1_err(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart1_err(void);
void isr_uart2_rx_tx(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart2_rx_tx(void);
void isr_uart2_err(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_uart2_err(void);
void isr_adc0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_adc0(void);
void isr_cmp0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_cmp0(void);
void isr_cmp1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_cmp1(void);
void isr_ftm0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_ftm0(void);
void isr_ftm1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_ftm1(void);
void isr_ftm2(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_ftm2(void);
void isr_cmt(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_cmt(void);
void isr_rtc(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_rtc(void);
void isr_rtc_seconds(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_rtc_seconds(void);
void isr_pit0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pit0(void);
void isr_pit1(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pit1(void);
void isr_pit2(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pit2(void);
void isr_pit3(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pit3(void);
void isr_pdb0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_pdb0(void);
void isr_usb0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_usb0(void);
void isr_usbdcd(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_usbdcd(void);
void isr_dac0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_dac0(void);
void isr_mcg(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_mcg(void);
void isr_lptmr0(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_lptmr0(void);
void isr_porta(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_porta(void);
void isr_portb(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_portb(void);
void isr_portc(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_portc(void);
void isr_portd(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_portd(void);
void isr_porte(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_porte(void);
void isr_swi(void) __attribute__((weak, alias("dummy_handler"))); WEAK_DEFAULT void isr_swi(void);
/* interrupt vector table */ /* interrupt vector table */
__attribute__((section(".vector_table"))) __attribute__((section(".vector_table")))
@ -111,21 +113,23 @@ const void *interrupt_vector[] = {
/* Stack pointer */ /* Stack pointer */
(void *)(&_estack), /* pointer to the top of the empty stack */ (void *)(&_estack), /* pointer to the top of the empty stack */
/* Cortex-M4 handlers */ /* Cortex-M4 handlers */
(void *) reset_handler, /* entry point of the program */ (void*) reset_handler_default, /* entry point of the program */
(void *) isr_nmi, /* non maskable interrupt handler */ (void*) nmi_default, /* non maskable interrupt handler */
(void *) isr_hard_fault, /* if you end up here its not good */ (void*) hard_fault_default, /* hard fault exception */
(void *) isr_mem_manage, /* memory controller interrupt */ (void*) mem_manage_default, /* memory manage exception */
(void *) isr_bus_fault, /* also not good to end up here */ (void*) bus_fault_default, /* bus fault exception */
(void *) isr_usage_fault, /* autsch */ (void*) usage_fault_default, /* usage fault exception */
(void *)(0UL), /* Reserved */ (void*) (0UL), /* Reserved */
(void *)(0UL), /* Reserved */ (void*) (0UL), /* Reserved */
(void *)(0UL), /* Reserved */ (void*) (0UL), /* Reserved */
(void *)(0UL), /* Reserved */ (void*) (0UL), /* Reserved */
(void *) isr_svc, /* system call interrupt */ (void*) isr_svc, /* system call interrupt, in RIOT used for
(void *) isr_debug_mon, /* debug interrupt */ * switching into thread context on boot */
(void *)(0UL), /* Reserved */ (void*) debug_mon_default, /* debug monitor exception */
(void *) isr_pendsv, /* pendSV interrupt, used for task switching in RIOT */ (void*) (0UL), /* Reserved */
(void *) isr_systick, /* SysTick interrupt, not used in RIOT */ (void*) isr_pendsv, /* pendSV interrupt, in RIOT the actual
* context switching is happening here */
(void*) isr_systick, /* SysTick interrupt, not used in RIOT */
/* MKW22D512 specific peripheral handlers */ /* MKW22D512 specific peripheral handlers */
(void *) isr_dma0, /* DMA channel 0 transfer complete */ (void *) isr_dma0, /* DMA channel 0 transfer complete */
(void *) isr_dma1, /* DMA channel 1 transfer complete */ (void *) isr_dma1, /* DMA channel 1 transfer complete */