diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2018-07-18 10:48:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 10:48:03 +0100 |
| commit | 344e40379c25f78361ffeed36581bdcee244a757 (patch) | |
| tree | 69244cfaf90c2828381756bbb61e49d7d07b5617 /include/common/debug.h | |
| parent | f9d2808a1ceb1e93a99ecfba9020efaa76d09ab5 (diff) | |
| parent | c426fd709fcf15f4643ac6729425c205d0ac1683 (diff) | |
Merge pull request #1480 from sandrine-bailleux-arm/topics/sb/debug-macros
Always compile debug macros
Diffstat (limited to 'include/common/debug.h')
| -rw-r--r-- | include/common/debug.h | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/include/common/debug.h b/include/common/debug.h index 3f0f84a1..99f402c0 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,10 +7,12 @@ #ifndef __DEBUG_H__ #define __DEBUG_H__ -/* The log output macros print output to the console. These macros produce +/* + * The log output macros print output to the console. These macros produce * compiled log output only if the LOG_LEVEL defined in the makefile (or the * make command line) is greater or equal than the level required for that * type of log output. + * * The format expected is the same as for printf(). For example: * INFO("Info %s.\n", "message") -> INFO: Info message. * WARN("Warning %s.\n", "message") -> WARNING: Warning message. @@ -38,34 +40,46 @@ #define LOG_MARKER_INFO "\x28" /* 40 */ #define LOG_MARKER_VERBOSE "\x32" /* 50 */ +/* + * If the log output is too low then this macro is used in place of tf_log() + * below. The intent is to get the compiler to evaluate the function call for + * type checking and format specifier correctness but let it optimize it out. + */ +#define no_tf_log(fmt, ...) \ + do { \ + if (0) { \ + tf_log(fmt, ##__VA_ARGS__); \ + } \ + } while (0) + #if LOG_LEVEL >= LOG_LEVEL_NOTICE # define NOTICE(...) tf_log(LOG_MARKER_NOTICE __VA_ARGS__) #else -# define NOTICE(...) +# define NOTICE(...) no_tf_log(LOG_MARKER_NOTICE __VA_ARGS__) #endif #if LOG_LEVEL >= LOG_LEVEL_ERROR # define ERROR(...) tf_log(LOG_MARKER_ERROR __VA_ARGS__) #else -# define ERROR(...) +# define ERROR(...) no_tf_log(LOG_MARKER_ERROR __VA_ARGS__) #endif #if LOG_LEVEL >= LOG_LEVEL_WARNING # define WARN(...) tf_log(LOG_MARKER_WARNING __VA_ARGS__) #else -# define WARN(...) +# define WARN(...) no_tf_log(LOG_MARKER_WARNING __VA_ARGS__) #endif #if LOG_LEVEL >= LOG_LEVEL_INFO # define INFO(...) tf_log(LOG_MARKER_INFO __VA_ARGS__) #else -# define INFO(...) +# define INFO(...) no_tf_log(LOG_MARKER_INFO __VA_ARGS__) #endif #if LOG_LEVEL >= LOG_LEVEL_VERBOSE # define VERBOSE(...) tf_log(LOG_MARKER_VERBOSE __VA_ARGS__) #else -# define VERBOSE(...) +# define VERBOSE(...) no_tf_log(LOG_MARKER_VERBOSE __VA_ARGS__) #endif void __dead2 do_panic(void); |