|
@@ -71,7 +71,15 @@ endfunc report_exception
|
|
|
assert_msg1:
|
|
|
.asciz "ASSERT: File "
|
|
|
assert_msg2:
|
|
|
+#if ARM_ARCH_MAJOR == 7 && !defined(ARMV7_SUPPORTS_VIRTUALIZATION)
|
|
|
+ /******************************************************************
|
|
|
+ * Virtualization comes with the UDIV/SDIV instructions. If missing
|
|
|
+ * write file line number in hexadecimal format.
|
|
|
+ ******************************************************************/
|
|
|
+ .asciz " Line 0x"
|
|
|
+#else
|
|
|
.asciz " Line "
|
|
|
+#endif
|
|
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
|
* Assertion support in assembly.
|
|
@@ -113,6 +121,13 @@ func asm_assert
|
|
|
bne 1f
|
|
|
mov r4, r6
|
|
|
|
|
|
+#if ARM_ARCH_MAJOR == 7 && !defined(ARMV7_SUPPORTS_VIRTUALIZATION)
|
|
|
+ /******************************************************************
|
|
|
+ * Virtualization comes with the UDIV/SDIV instructions. If missing
|
|
|
+ * write file line number in hexadecimal format.
|
|
|
+ ******************************************************************/
|
|
|
+ bl asm_print_hex
|
|
|
+#else
|
|
|
/* Print line number in decimal */
|
|
|
mov r6, #10 /* Divide by 10 after every loop iteration */
|
|
|
ldr r5, =MAX_DEC_DIVISOR
|
|
@@ -124,6 +139,7 @@ dec_print_loop:
|
|
|
udiv r5, r5, r6 /* Reduce divisor */
|
|
|
cmp r5, #0
|
|
|
bne dec_print_loop
|
|
|
+#endif
|
|
|
|
|
|
bl plat_crash_console_flush
|
|
|
|