andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Move assembly newline function into common debug code" into integration

This commit is contained in:
Paul Beesley 2019-08-29 16:05:28 +00:00 committed by TrustedFirmware Code Review
parent 3441952f61 53d7e003fe
commit a5ac37e7a6
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bl31/aarch64/crash_reporting.S
View File

@ -61,14 +61,6 @@ excpt_msg:
intr_excpt_msg:
.asciz "Unhandled Interrupt Exception in EL3.\nx30"
/*
* Helper function to print newline to console.
*/
func print_newline
mov x0, '\n'
b plat_crash_console_putc
endfunc print_newline
/*
* Helper function to print from crash buf.
* The print loop is controlled by the buf size and
@ -101,7 +93,7 @@ test_size_list:
bl print_alignment
ldr x4, [x7], #REGSZ
bl asm_print_hex
bl print_newline
bl asm_print_newline
b test_size_list
exit_size_print:
mov x30, sp
@ -253,7 +245,7 @@ func do_crash_reporting
/* report x30 first from the crash buf */
ldr x4, [x0, #REGSZ * 7]
bl asm_print_hex
bl print_newline
bl asm_print_newline
/* Load the crash buf address */
mrs x0, tpidr_el3
/* Now mov x7 into crash buf */

10
common/aarch64/debug.S
View File

@ -11,6 +11,7 @@
.globl asm_print_str
.globl asm_print_hex
.globl asm_print_hex_bits
.globl asm_print_newline
.globl asm_assert
.globl do_panic
@ -130,6 +131,15 @@ asm_print_hex_bits:
ret x3
endfunc asm_print_hex
/*
* Helper function to print newline to console
* Clobber: x0
*/
func asm_print_newline
mov x0, '\n'
b plat_crash_console_putc
endfunc asm_print_newline
/***********************************************************
* The common implementation of do_panic for all BL stages
***********************************************************/