RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

arm: Return the current handler from arm_cp15_set_exception_handler

Browse Source 
Closes #3762
This commit is contained in:
Chris Johns
2019-06-25 18:43:55 +10:00
parent 9b858ee6ef
commit c43071f523
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bsps/arm/shared/cp15/arm-cp15-set-exception-handler.c
View File

@@ -16,15 +16,18 @@
#include <bsp/linker-symbols.h> #include <bsp/linker-symbols.h>
void arm_cp15_set_exception_handler( void* arm_cp15_set_exception_handler(
Arm_symbolic_exception_name exception, Arm_symbolic_exception_name exception,
void (*handler)(void) void (*handler)(void)
) )
{ {
uint32_t current_handler = 0;
if ((unsigned) exception < MAX_EXCEPTIONS) { if ((unsigned) exception < MAX_EXCEPTIONS) {
uint32_t *cpu_table = (uint32_t *) 0 + MAX_EXCEPTIONS; uint32_t *cpu_table = (uint32_t *) 0 + MAX_EXCEPTIONS;
uint32_t *mirror_table = (uint32_t *) bsp_vector_table_begin + MAX_EXCEPTIONS; uint32_t *mirror_table = (uint32_t *) bsp_vector_table_begin + MAX_EXCEPTIONS;
uint32_t current_handler = mirror_table[exception];
current_handler = mirror_table[exception];
if (current_handler != (uint32_t) handler) { if (current_handler != (uint32_t) handler) {
size_t table_size = MAX_EXCEPTIONS * sizeof(uint32_t); size_t table_size = MAX_EXCEPTIONS * sizeof(uint32_t);
@@ -53,4 +56,6 @@ void arm_cp15_set_exception_handler(
rtems_interrupt_local_enable(level); rtems_interrupt_local_enable(level);
} }
} }
return (void*) current_handler;
} }

7
cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
View File

@@ -2246,7 +2246,12 @@ uint32_t arm_cp15_set_translation_table_entries(
uint32_t section_flags uint32_t section_flags
); );
void arm_cp15_set_exception_handler( /**
* @brief Sets the @a exception @a handler in the vector table.
*
* @return Previous handler.
*/
void* arm_cp15_set_exception_handler(
Arm_symbolic_exception_name exception, Arm_symbolic_exception_name exception,
void (*handler)(void) void (*handler)(void)
); );