From 0da2fe7e29380f1b45286ae8a5a999547d250d33 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Tue, 16 May 2017 09:52:02 +0100 Subject: Simplify assert() to reduce memory usage The behaviour of assert() now depends on the value of the new optional platform define `PLAT_LOG_LEVEL_ASSERT`. This defaults to `LOG_LEVEL` if not defined by the platform. - If `PLAT_LOG_LEVEL_ASSERT` >= `LOG_LEVEL_VERBOSE`, it prints the file name, line and asserted expression. - If `PLAT_LOG_LEVEL_ASSERT` >= `LOG_LEVEL_INFO`, it prints the file name and line. - If not, it doesn't print anything. Note the old behaviour was to print the function name whereas now it prints the file name. This reduces memory usage because the file name is shared between all assert calls in a given file. Also, the default behaviour in debug builds is to no longer print the asserted expression, greatly reducing the string usage. For FVP debug builds this change saves approximately: No TBBR TBBR BL1 1.6 KB 2.2 KB BL2 1.7 KB 2.1 KB BL31 2.6 KB 3.3 KB Change-Id: I2947569d593df0b25611dc3c7a6096f42155c115 Signed-off-by: Antonio Nino Diaz --- lib/stdlib/assert.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/stdlib/assert.c b/lib/stdlib/assert.c index 5220ad8f..41f70703 100644 --- a/lib/stdlib/assert.c +++ b/lib/stdlib/assert.c @@ -4,22 +4,33 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include #include #include #include -void __assert(const char *function, const char *file, unsigned int line, - const char *assertion) -{ -#if LOG_LEVEL >= LOG_LEVEL_INFO - /* - * Only print the output if LOG_LEVEL is higher or equal to - * LOG_LEVEL_INFO, which is the default value for builds with DEBUG=1. - */ - tf_printf("ASSERT: %s <%d> : %s\n", function, line, assertion); +/* +* Only print the output if PLAT_LOG_LEVEL_ASSERT is higher or equal to +* LOG_LEVEL_INFO, which is the default value for builds with DEBUG=1. +*/ +#if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE +void __assert(const char *file, unsigned int line, const char *assertion) +{ + tf_printf("ASSERT: %s <%d> : %s\n", file, line, assertion); console_flush(); -#endif - plat_panic_handler(); } +#elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO +void __assert(const char *file, unsigned int line) +{ + tf_printf("ASSERT: %s <%d>\n", file, line); + console_flush(); + plat_panic_handler(); +} +#else +void __assert(void) +{ + plat_panic_handler(); +} +#endif -- cgit v1.2.3