From 23cb9afeb6352a927ee1f797e21a69a281bf8619 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 1 Aug 2017 11:38:32 +0200 Subject: bsps/powerpc: Rename ppc_exc_wrap_async_normal Rename ppc_exc_wrap_async_normal to ppc_exc_interrupt to avoid a bit of obfuscation. Update #3082. --- c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S | 6 +++--- c/src/lib/libbsp/powerpc/qoriq/start/start.S | 2 +- c/src/lib/libbsp/powerpc/t32mppc/start/start.S | 6 +++--- .../libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S | 6 +++--- 4 files changed, 10 insertions(+), 10 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 c8103e7e87..9f65cb9959 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 @@ -63,7 +63,7 @@ mpc55xx_exc_vector_base: stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32763 #endif - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt #ifdef PPC_EXC_CONFIG_USE_FIXED_HANDLER nop nop @@ -93,7 +93,7 @@ mpc55xx_exc_vector_base: stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32752 #endif - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt #ifdef PPC_EXC_CONFIG_USE_FIXED_HANDLER nop nop @@ -103,7 +103,7 @@ mpc55xx_exc_vector_base: stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32749 #endif - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt #ifdef PPC_EXC_CONFIG_USE_FIXED_HANDLER nop nop diff --git a/c/src/lib/libbsp/powerpc/qoriq/start/start.S b/c/src/lib/libbsp/powerpc/qoriq/start/start.S index 7af2848720..a0097e7d49 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/start/start.S +++ b/c/src/lib/libbsp/powerpc/qoriq/start/start.S @@ -334,7 +334,7 @@ bsp_exc_vector_base: b ppc_exc_fatal_normal /* External input */ stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt nop nop /* Alignment */ diff --git a/c/src/lib/libbsp/powerpc/t32mppc/start/start.S b/c/src/lib/libbsp/powerpc/t32mppc/start/start.S index 18d16a6e19..d1c271c69f 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/start/start.S +++ b/c/src/lib/libbsp/powerpc/t32mppc/start/start.S @@ -116,7 +116,7 @@ bsp_exc_vector_base: stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32763 - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt stwu r1, -EXC_GENERIC_SIZE(r1) stw r4, GPR4_OFFSET(r1) li r4, 6 @@ -140,11 +140,11 @@ bsp_exc_vector_base: stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32752 - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt stwu r1, -CPU_INTERRUPT_FRAME_SIZE(r1) stw r4, PPC_EXC_VECTOR_PROLOGUE_OFFSET(r1) li r4, -32749 - b ppc_exc_wrap_async_normal + b ppc_exc_interrupt stw r1, ppc_exc_lock_crit@sdarel(r13) stw r4, ppc_exc_vector_register_crit@sdarel(r13) li r4, -32748 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 f79687b387..f5c9ce9898 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 @@ -69,7 +69,7 @@ #endif /* PPC_EXC_CONFIG_USE_FIXED_HANDLER */ .global ppc_exc_min_prolog_async_tmpl_normal - .global ppc_exc_wrap_async_normal + .global ppc_exc_interrupt ppc_exc_min_prolog_async_tmpl_normal: @@ -84,9 +84,9 @@ ppc_exc_min_prolog_async_tmpl_normal: * We store the absolute branch target address here. It will be used * to generate the branch operation in ppc_exc_make_prologue(). */ - .int ppc_exc_wrap_async_normal + .int ppc_exc_interrupt -ppc_exc_wrap_async_normal: +ppc_exc_interrupt: #ifdef RTEMS_PROFILING /* Save non-volatile ENTRY_INSTANT_REGISTER */ -- cgit v1.2.3