patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

arch: arm: fix ESF pointer in SecureStackDump()

Browse source 
This commit fixes a build error, when building with
CONFIG_ARM_SECURE_FIRMWARE=y. The error was introduced
in #15930 (6f19d0), where we added internal structure
to the exception stack frame struct.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2019-05-14 15:01:10 +02:00 committed by Kumar Gala
parent 6c55bb446c
commit 424224afb7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/core/fault.c
View file

@ -737,7 +737,7 @@ static void SecureStackDump(const NANO_ESF *secure_esf)
*/ */
top_of_sec_stack += ADDITIONAL_STATE_CONTEXT_WORDS; top_of_sec_stack += ADDITIONAL_STATE_CONTEXT_WORDS;
secure_esf = (const NANO_ESF *)top_of_sec_stack; secure_esf = (const NANO_ESF *)top_of_sec_stack;
sec_ret_addr = secure_esf->pc; sec_ret_addr = secure_esf->basic.pc;
} else { } else {
/* Exception during Non-Secure function call. /* Exception during Non-Secure function call.
* The return address is located on top of stack. * The return address is located on top of stack.