diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-08-01 11:43:57 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-08-01 11:43:57 +0200 |
| commit | a8694035ae45870956891d64e369f7eaeb2f3e78 (patch) | |
| tree | 50a7d41e8fa6ee91c88f18533fb3b0e4fb4ddde2 | |
| parent | bsps/powerpc: Rename ppc_exc_wrap_async_normal (diff) | |
| download | rtems-a8694035ae45870956891d64e369f7eaeb2f3e78.tar.bz2 | |
bsps/powerpc: Add PPC_EXC_INTERRUPT_FRAME_SIZE
Use a specific define for the interrupt exception frame size.
Update #3082.
5 files changed, 11 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S index 9f65cb9959..7bc520d6b1 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S @@ -58,7 +58,7 @@ mpc55xx_exc_vector_base: stw r4, GPR4_OFFSET(r1) li r4, 4 b ppc_exc_wrap_nopush_std - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) #ifndef PPC_EXC_CONFIG_USE_FIXED_HANDLER stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32763 @@ -88,7 +88,7 @@ mpc55xx_exc_vector_base: stw r4, GPR4_OFFSET(r1) li r4, 24 b ppc_exc_wrap_nopush_std - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) #ifndef PPC_EXC_CONFIG_USE_FIXED_HANDLER stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32752 @@ -98,7 +98,7 @@ mpc55xx_exc_vector_base: nop nop #endif - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) #ifndef PPC_EXC_CONFIG_USE_FIXED_HANDLER stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32749 diff --git a/c/src/lib/libbsp/powerpc/qoriq/start/start.S b/c/src/lib/libbsp/powerpc/qoriq/start/start.S index a0097e7d49..6be06e9273 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/start/start.S +++ b/c/src/lib/libbsp/powerpc/qoriq/start/start.S @@ -333,7 +333,7 @@ bsp_exc_vector_base: li r3, 3 b ppc_exc_fatal_normal /* External input */ - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) b ppc_exc_interrupt nop nop diff --git a/c/src/lib/libbsp/powerpc/t32mppc/start/start.S b/c/src/lib/libbsp/powerpc/t32mppc/start/start.S index d1c271c69f..a7c47c1439 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/start/start.S +++ b/c/src/lib/libbsp/powerpc/t32mppc/start/start.S @@ -113,7 +113,7 @@ bsp_exc_vector_base: stw r4, GPR4_OFFSET(r1) li r4, 4 b ppc_exc_wrap_nopush_std - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32763 b ppc_exc_interrupt @@ -137,11 +137,11 @@ bsp_exc_vector_base: stw r4, GPR4_OFFSET(r1) li r4, 24 b ppc_exc_wrap_nopush_std - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32752 b ppc_exc_interrupt - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32749 b ppc_exc_interrupt diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S index f5c9ce9898..7a137a526d 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S @@ -73,7 +73,7 @@ ppc_exc_min_prolog_async_tmpl_normal: - stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) + stwu r1, -PPC_EXC_INTERRUPT_FRAME_SIZE(r1) #ifndef PPC_EXC_CONFIG_USE_FIXED_HANDLER stw VECTOR_REGISTER, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) @@ -502,7 +502,7 @@ ppc_exc_interrupt: #endif /* RTEMS_PROFILING */ /* Pop stack */ - addi r1, r1, CPU_INTERRUPT_FRAME_SIZE + addi r1, r1, PPC_EXC_INTERRUPT_FRAME_SIZE /* Return */ rfi diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h index 7835abb7e4..3068ec2c0d 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h @@ -160,6 +160,8 @@ extern "C" { #define EXC_GENERIC_SIZE PPC_EXC_FRAME_SIZE +#define PPC_EXC_INTERRUPT_FRAME_SIZE CPU_INTERRUPT_FRAME_SIZE + #if defined(__ALTIVEC__) && !defined(PPC_MULTILIB_ALTIVEC) #define EXC_VEC_OFFSET EXC_GENERIC_SIZE #ifndef PPC_CACHE_ALIGNMENT |