diff options
author | Jerome Forissier <jerome@forissier.org> | 2020-09-03 14:37:31 +0200 |
---|---|---|
committer | Jérôme Forissier <jerome@forissier.org> | 2020-09-04 14:25:44 +0200 |
commit | 3513f961cda064f90d10f7de72af6330427a2013 (patch) | |
tree | d034d13b91a2e19cfe1954618e26629426f5721d /core/arch/arm/kernel/thread_spmc_a32.S | |
parent | 827be46c173f31c57006af70ca3a15a5b1a7fba3 (diff) |
arm32: fold UNWIND(.fnstart/.fnend) into the FUNC macros
This change applies to arm32 assembler sources.
Instead of using UNWIND(.fnstart) after FUNC or LOCAL_FUNC and
UNWIND(.fnend) before END_FUNC, let's fold these statements into the
FUNC macros.
The .fnstart/.fnend directives mark the start and end of a function
with an unwind table entry (.ARM.exidx) and therefore a function
without them has no entry and cannot be unwound. This means that a
stack dump (on abort or panic) would stop when reaching such a
function.
As a result of this patch, a small number of functions now have an
entry in the unwind table when they had none before (the functions
which were using FUNC or LOCAL_FUNC but had no .fnstart/.fnend). It was
almost always a bug and this pacth only increases the size of the
.ARM.exidx section by a few bytes (tested on QEMU).
Signed-off-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Diffstat (limited to 'core/arch/arm/kernel/thread_spmc_a32.S')
-rw-r--r-- | core/arch/arm/kernel/thread_spmc_a32.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/arch/arm/kernel/thread_spmc_a32.S b/core/arch/arm/kernel/thread_spmc_a32.S index 42525dbc..4be601d1 100644 --- a/core/arch/arm/kernel/thread_spmc_a32.S +++ b/core/arch/arm/kernel/thread_spmc_a32.S @@ -48,7 +48,6 @@ LOCAL_FUNC ffa_msg_send_direct_resp , : END_FUNC ffa_msg_send_direct_resp FUNC thread_std_smc_entry , : -UNWIND( .fnstart) UNWIND( .cantunwind) ror r4, r0, #16 /* Save target info with src and dst swapped */ @@ -69,12 +68,10 @@ UNWIND( .cantunwind) mov r6, #FFA_PARAM_MBZ /* Unused parameter */ mov r7, #FFA_PARAM_MBZ /* Unused parameter */ b ffa_msg_send_direct_resp -UNWIND( .fnend) END_FUNC thread_std_smc_entry /* void thread_rpc(struct thread_rpc_arg *rpc_arg) */ FUNC thread_rpc , : -UNWIND( .fnstart) push {r0, lr} UNWIND( .save {r0, lr}) @@ -112,7 +109,6 @@ UNWIND( .save {r0, lr}) pop {r12, lr} /* Get pointer to rv[] */ stm r12, {r0-r3} /* Store r0-r3 into rv[] */ bx lr -UNWIND( .fnend) END_FUNC thread_rpc DECLARE_KEEP_PAGER thread_rpc |