diff options
author | Soby Mathew <soby.mathew@arm.com> | 2014-08-19 11:26:00 +0100 |
---|---|---|
committer | Soby Mathew <soby.mathew@arm.com> | 2014-08-19 14:42:35 +0100 |
commit | aecc0840805672279e4165f4d368a59b5c20771e (patch) | |
tree | 658c6ed36c041cfd9d2f367b6dae55d4069ac40b /common/aarch64/debug.S | |
parent | a4a8eaeb36f7a023b057f49e0f43f1d0134fd7f0 (diff) | |
download | trusted-firmware-a-aecc0840805672279e4165f4d368a59b5c20771e.tar.gz |
Rework use of labels in assembly macros.
This patch provides a workaround for the ASM_ASSERT label issue
and also reworks the use of labels in assembly macros.
If the caller of the ASM_ASSERT macro happened to use the
label '1' to jump past the ASM_ASSERT macro, it would not have
worked since the ASM_ASSERT macro internally used the same label.
Hence, as a workaround, this patch makes the label a high
number in the expectation that the caller will never use it.
Also updated the other assembly macros using numerical labels to
named lables.
Change-Id: Iec892359db84f2391ad2a83a92141c4d7049776a
Diffstat (limited to 'common/aarch64/debug.S')
-rw-r--r-- | common/aarch64/debug.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S index b7d7ac2368..fcf5f268ab 100644 --- a/common/aarch64/debug.S +++ b/common/aarch64/debug.S @@ -58,13 +58,13 @@ assert_msg2: .macro asm_print_line_dec mov x6, #10 /* Divide by 10 after every loop iteration */ mov x5, #MAX_DEC_DIVISOR -1: +dec_print_loop: udiv x0, x4, x5 /* Get the quotient */ msub x4, x0, x5, x4 /* Find the remainder */ add x0, x0, #ASCII_OFFSET_NUM /* Convert to ascii */ bl plat_crash_console_putc udiv x5, x5, x6 /* Reduce divisor */ - cbnz x5, 1b + cbnz x5, dec_print_loop .endm |