Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 01:54:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dead loops in assert() in C and ASM

Browse source 
The desired behaviour is to call `plat_panic_handler()`, and to use
`no_ret` to do so from ASM.

Change-Id: I88b2feefa6e6c8f9bf057fd51ee0d2e9fb551e4f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2017-02-16 16:49:18 +00:00
parent 0b32628edd
commit 1e09ff9344
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/aarch32/debug.S
View file

@ -75,7 +75,7 @@ func do_panic
1: 1:
mov lr, r6 mov lr, r6
b plat_panic_handler no_ret plat_panic_handler
endfunc do_panic endfunc do_panic
/*********************************************************** /***********************************************************

2
common/aarch64/debug.S
View file

@ -98,7 +98,7 @@ func asm_assert
asm_print_line_dec asm_print_line_dec
bl plat_crash_console_flush bl plat_crash_console_flush
_assert_loop: _assert_loop:
b _assert_loop no_ret plat_panic_handler
endfunc asm_assert endfunc asm_assert
#endif #endif

2
lib/stdlib/assert.c
View file

@ -42,5 +42,5 @@ void __assert (const char *function, const char *file, unsigned int line,
console_flush(); console_flush();
while(1); plat_panic_handler();
} }