Commit a5ac37e7 authored by Paul Beesley's avatar Paul Beesley Committed by TrustedFirmware Code Review
Browse files

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

parents 3441952f 53d7e003
...@@ -61,14 +61,6 @@ excpt_msg: ...@@ -61,14 +61,6 @@ excpt_msg:
intr_excpt_msg: intr_excpt_msg:
.asciz "Unhandled Interrupt Exception in EL3.\nx30" .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. * Helper function to print from crash buf.
* The print loop is controlled by the buf size and * The print loop is controlled by the buf size and
...@@ -101,7 +93,7 @@ test_size_list: ...@@ -101,7 +93,7 @@ test_size_list:
bl print_alignment bl print_alignment
ldr x4, [x7], #REGSZ ldr x4, [x7], #REGSZ
bl asm_print_hex bl asm_print_hex
bl print_newline bl asm_print_newline
b test_size_list b test_size_list
exit_size_print: exit_size_print:
mov x30, sp mov x30, sp
...@@ -253,7 +245,7 @@ func do_crash_reporting ...@@ -253,7 +245,7 @@ func do_crash_reporting
/* report x30 first from the crash buf */ /* report x30 first from the crash buf */
ldr x4, [x0, #REGSZ * 7] ldr x4, [x0, #REGSZ * 7]
bl asm_print_hex bl asm_print_hex
bl print_newline bl asm_print_newline
/* Load the crash buf address */ /* Load the crash buf address */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
/* Now mov x7 into crash buf */ /* Now mov x7 into crash buf */
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
.globl asm_print_str .globl asm_print_str
.globl asm_print_hex .globl asm_print_hex
.globl asm_print_hex_bits .globl asm_print_hex_bits
.globl asm_print_newline
.globl asm_assert .globl asm_assert
.globl do_panic .globl do_panic
...@@ -130,6 +131,15 @@ asm_print_hex_bits: ...@@ -130,6 +131,15 @@ asm_print_hex_bits:
ret x3 ret x3
endfunc asm_print_hex 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 * The common implementation of do_panic for all BL stages
***********************************************************/ ***********************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment