From a8694035ae45870956891d64e369f7eaeb2f3e78 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 1 Aug 2017 11:43:57 +0200 Subject: bsps/powerpc: Add PPC_EXC_INTERRUPT_FRAME_SIZE Use a specific define for the interrupt exception frame size. Update #3082. --- .../libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S | 4 ++-- c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libcpu/powerpc') 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 -- cgit v1.2.3