diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-09 01:13:24 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-09 01:13:24 +0000 |
commit | 4ddac4a34e050d0a22a4510526860726c6f16183 (patch) | |
tree | 82daabd3578dc2ac395b04771b90d4c8bdc5dccd /nuttx/include | |
parent | 711d70866a83ae674146d8c1798bd0054cac2392 (diff) | |
download | px4-nuttx-4ddac4a34e050d0a22a4510526860726c6f16183.tar.gz px4-nuttx-4ddac4a34e050d0a22a4510526860726c6f16183.tar.bz2 px4-nuttx-4ddac4a34e050d0a22a4510526860726c6f16183.zip |
Support C pre-processors without variable-arg macros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@535 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/debug.h | 140 | ||||
-rw-r--r-- | nuttx/include/nuttx/compiler.h | 53 |
2 files changed, 166 insertions, 27 deletions
diff --git a/nuttx/include/debug.h b/nuttx/include/debug.h index 651b2cbe8..c76c57313 100644 --- a/nuttx/include/debug.h +++ b/nuttx/include/debug.h @@ -1,7 +1,7 @@ -/************************************************************ +/**************************************************************************** * debug.h * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,24 +31,25 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ #ifndef __DEBUG_H #define __DEBUG_H -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> +#include <nuttx/compiler.h> -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ /* Debug macros to runtime filter the opsys debug messages */ -#ifdef __GNUC__ +#ifdef CONFIG_HAVE_FUNCTIONNAME # define EXTRA_FMT "%s: " # define EXTRA_ARG ,__FUNCTION__ #else @@ -56,6 +57,14 @@ # define EXTRA_ARG #endif +/* Debug macros will differ depending upon if the toolchain supports + * macros with a variable number of arguments or not. + */ + +#ifdef CONFIG_CPP_HAVE_VARARGS + +/* Variable argument macros supported */ + #ifdef CONFIG_DEBUG # define dbg(format, arg...) \ lib_rawprintf(EXTRA_FMT format EXTRA_ARG, ##arg) @@ -74,11 +83,13 @@ # define vdbg(x...) # endif -#else +#else /* CONFIG_DEBUG */ + # define dbg(x...) # define lldbg(x...) # define vdbg(x...) -#endif + +#endif /* CONFIG_DEBUG */ /* Subsystem specific debug */ @@ -132,17 +143,88 @@ # define lvdbg(x...) #endif -/************************************************************ +#else /* CONFIG_CPP_HAVE_VARARGS */ + +/* Variable argument macros NOT supported */ + +#ifdef CONFIG_DEBUG +# ifndef CONFIG_ARCH_LOWPUTC +# define lldbg (void) +# endif +# ifndef CONFIG_DEBUG_VERBOSE +# define vdbg (void) +# endif +#else +# define dbg (void) +# define lldbg (void) +# define vdbg (void) +#endif + +/* Subsystem specific debug */ + +#ifdef CONFIG_DEBUG_MM +# define mdbg dbg +# define mlldbg lldbg +# define mvdbg vdbg +#else +# define mdbg (void) +# define mlldbg (void) +# define mvdbg (void) +#endif + +#ifdef CONFIG_DEBUG_SCHED +# define sdbg dbg +# define slldbg lldbg +# define svdbg vdbg +#else +# define sdbg (void) +# define slldbg (void) +# define svdbg (void) +#endif + +#ifdef CONFIG_DEBUG_NET +# define ndbg dbg +# define nlldbg lldbg +# define nvdbg vdbg +#else +# define ndbg (void) +# define nlldbg (void) +# define nvdbg (void) +#endif + +#ifdef CONFIG_DEBUG_FS +# define fdbg dbg +# define flldbg lldbg +# define fvdbg vdbg +#else +# define fdbg (void) +# define flldbg (void) +# define fvdbg (void) +#endif + +#ifdef CONFIG_DEBUG_LIB +# define ldbg dbg +# define llldbg lldbg +# define lvdbg vdbg +#else +# define ldbg (void) +# define llldbg (void) +# define lvdbg (void) +#endif + +#endif /* CONFIG_CPP_HAVE_VARARGS */ + +/**************************************************************************** * Public Type Declarations - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************/ + ****************************************************************************/ #undef EXTERN #if defined(__cplusplus) @@ -152,12 +234,36 @@ extern "C" { #define EXTERN extern #endif +/* These low-level debug APIs are provided by the NuttX library. If + * the cross-compiler's pre-processor supports a variable number of + * macro arguments, then the macros above will map all debug statements + * on or the other of the following. + */ + EXTERN int lib_rawprintf(const char *format, ...); #ifdef CONFIG_ARCH_LOWPUTC EXTERN int lib_lowprintf(const char *format, ...); #endif +/* If the cross-compiler's pre-processor does not support variable + * length arguments, then these additional APIs will be built. + */ + +#ifndef CONFIG_CPP_HAVE_VARARGS +#ifdef CONFIG_DEBUG +EXTERN int dbg(const char *format, ...); + +# ifdef CONFIG_ARCH_LOWPUTC +EXTERN int lldbg(const char *format, ...); +# endif + +# ifdef CONFIG_DEBUG_VERBOSE +EXTERN int vdbg(const char *format, ...); +#endif +#endif /* CONFIG_DEBUG */ +#endif /* CONFIG_CPP_HAVE_VARARGS */ + #undef EXTERN #if defined(__cplusplus) } diff --git a/nuttx/include/nuttx/compiler.h b/nuttx/include/nuttx/compiler.h index 2ab68b381..318a7f137 100644 --- a/nuttx/include/nuttx/compiler.h +++ b/nuttx/include/nuttx/compiler.h @@ -48,7 +48,17 @@ #ifdef __GNUC__ -/* GCC supports weak symbols which can be used to reduce +/* Pre-processor */ + +# define CONFIG_CPP_HAVE_VARARGS 1 /* Supports variable argument macros */ + +/* Intriniscs */ + +# define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ + +/* Attributes + * + * GCC supports weak symbols which can be used to reduce * code size because unnecessary "weak" functions can be * excluded from the link. */ @@ -118,11 +128,23 @@ #elif defined(SDCC) -/* Disable warnings for unused function arguments */ +/* Pre-processor */ + +# define CONFIG_CPP_HAVE_VARARGS 1 /* Supports variable argument macros */ + +/* Intriniscs */ + +# define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ + +/* Pragmas + * + * Disable warnings for unused function arguments */ # pragma disable_warning 85 -/* SDCC does not support weak symbols */ +/* Attributes + * + * SDCC does not support weak symbols */ # undef CONFIG_HAVE_WEAKFUNCTIONS # define weak_alias(name, aliasname) @@ -196,29 +218,40 @@ # undef CONFIG_CAN_PASS_STRUCTS -/* ZiLog-specific definitions ***********************************************/ +/* Zilog-specific definitions ***********************************************/ #elif defined(__ZILOG__) -/* At present, only the ZiLog ZNeo compiler is recognized */ +/* At present, only the Zilog ZNeo compiler is recognized */ # ifndef __ZNEO__ -# warning "Unrecognized ZiLog compiler" +# warning "Unrecognized Zilog compiler" # endif -/* The ZiLog compiler does not support weak symbols */ +/* Pre-processor */ + +# undef CONFIG_CPP_HAVE_VARARGS /* No variable argument macros */ + +/* Intriniscs */ + +# define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ + +/* Attributes + * + * The Zilog compiler does not support weak symbols + */ # undef CONFIG_HAVE_WEAKFUNCTIONS # define weak_alias(name, aliasname) # define weak_function # define weak_const_function -/* The ZiLog compiler does not support the noreturn or packed attributes */ +/* The Zilog compiler does not support the noreturn or packed attributes */ # define noreturn_function # define packed_struct -/* The ZiLog compiler does not support the reentrant attribute */ +/* The Zilog compiler does not support the reentrant attribute */ # define reentrant_function @@ -241,7 +274,7 @@ # undef CONFIG_PTR_IS_NOT_INT -/* The ZiLog compiler does not support inline functions */ +/* The Zilog compiler does not support inline functions */ # undef CONFIG_HAVE_INLINE # define inline |