michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: rename _VectorTableROM

Browse source 
For non-XIP systems, it's not in ROM, so remove the "ROM" part. Adapt it
to coding conventions at the same time, and export it to C code.

Change-Id: Id09a6be8bc9c462667ed71b53be7fa5382c88db3
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2015-10-29 13:59:07 -04:00 • committed by Anas Nashif
commit f8807dae89
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/core/cortex_m/vector_table.S
View file

@ -18,8 +18,8 @@
* @file * @file
* @brief Populated vector table in ROM * @brief Populated vector table in ROM
* *
* Vector table in ROM for starting system. The reset vector is the system entry * Vector table at the beginning of the image for starting system. The reset
* point, ie. the first instruction executed. * vector is the system entry point, ie. the first instruction executed.
* *
* The table is populated with all the system exception handlers. The NMI vector * The table is populated with all the system exception handlers. The NMI vector
* must be populated with a valid handler since it can happen at any time. The * must be populated with a valid handler since it can happen at any time. The
@ -36,7 +36,7 @@
_ASM_FILE_PROLOGUE _ASM_FILE_PROLOGUE
SECTION_SUBSEC_FUNC(exc_vector_table,_Start,__start) SECTION_SUBSEC_FUNC(exc_vector_table,_Start,__start)
SECTION_SUBSEC_FUNC(exc_vector_table,_Start,_VectorTableROM) SECTION_SUBSEC_FUNC(exc_vector_table,_Start,_vector_table)
.word __CORTEXM_BOOT_MSP .word __CORTEXM_BOOT_MSP
.word __reset .word __reset

6
arch/arm/core/cortex_m/vector_table.h
View file

@ -47,7 +47,7 @@ extern "C" {
.equ __CORTEXM_BOOT_PSP, (__CORTEXM_BOOT_MSP - 0x100) .equ __CORTEXM_BOOT_PSP, (__CORTEXM_BOOT_MSP - 0x100)
GTEXT(__start) GTEXT(__start)
GTEXT(_VectorTableROM) GTEXT(_vector_table)
GTEXT(__reset) GTEXT(__reset)
GTEXT(__nmi) GTEXT(__nmi)
@ -63,6 +63,10 @@ GTEXT(__reserved)
GTEXT(_PrepC) GTEXT(_PrepC)
GTEXT(_isr_wrapper) GTEXT(_isr_wrapper)
#else
extern void *_vector_table[];
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#ifdef __cplusplus #ifdef __cplusplus