X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fdebug.h;h=0c8bfec09e75effc8d830d6acd853ffd36d9f9e4;hb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;hp=658ecf1d4c620a28d7b59123c2ec70ffe3ff8c08;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h index 658ecf1d..0c8bfec0 100644 --- a/bertos/cfg/debug.h +++ b/bertos/cfg/debug.h @@ -37,8 +37,8 @@ * diagnostic messages to a serial terminal or a JTAG debugger. * * \version $Id$ - * \author Bernardo Innocenti - */ + * \author Bernie Innocenti + */ #ifndef BERTOS_DEBUG_H #define BERTOS_DEBUG_H @@ -46,9 +46,10 @@ #include #include - /* - * Defaults for rarely used config stuff. - */ + +/* + * Defaults for rarely used config stuff. + */ #ifndef CONFIG_KDEBUG_DISABLE_TRACE #define CONFIG_KDEBUG_DISABLE_TRACE 0 #endif @@ -58,67 +59,66 @@ #endif #if defined(__doxygen__) - /** - * Preprocessor symbol defined only for debug builds. - * - * The build infrastructure must arrange for _DEBUG to - * be predefined for all the source files being compiled. - * - * This is compatible with the MSVC convention for the - * default Debug and Release project targets. - */ - #define _DEBUG 1 + /** + * Preprocessor symbol defined only for debug builds. + * + * The build infrastructure must arrange for _DEBUG to + * be predefined for all the source files being compiled. + * + * This is compatible with the MSVC convention for the + * default Debug and Release project targets. + */ + #define _DEBUG 1 #endif #ifdef _DEBUG + // STLport specific: enable extra checks + #define __STL_DEBUG 1 - // STLport specific: enable extra checks - #define __STL_DEBUG 1 - - // MSVC specific: Enable memory allocation debug - #if defined(_MSC_VER) - #include - #endif + // MSVC specific: Enable memory allocation debug + #if defined(_MSC_VER) + #include + #endif - /* - * On UNIX systems the extabilished practice is to define - * NDEBUG for release builds and nothing for debug builds. - */ - #ifdef NDEBUG - #undef NDEBUG - #endif + /* + * On UNIX systems the extabilished practice is to define + * NDEBUG for release builds and nothing for debug builds. + */ + #ifdef NDEBUG + #undef NDEBUG + #endif - /** - * This macro duplicates the old MSVC trick of redefining - * THIS_FILE locally to avoid the overhead of many duplicate - * strings in ASSERT(). - */ - #ifndef THIS_FILE - #define THIS_FILE __FILE__ - #endif + /** + * This macro duplicates the old MSVC trick of redefining + * THIS_FILE locally to avoid the overhead of many duplicate + * strings in ASSERT(). + */ + #ifndef THIS_FILE + #define THIS_FILE __FILE__ + #endif - /** - * This macro can be used to conditionally exclude one or more - * statements conditioned on \c _DEBUG, avoiding the clutter - * of ifdef/endif pairs. - * - * \code - * struct FooBar - * { - * int foo; - * bool bar; - * DB(int ref_count;) // Track number of users - * - * void release() - * { - * DB(--ref_count;) - * } - * }; - * \endcode - */ - #define DB(x) x + /** + * This macro can be used to conditionally exclude one or more + * statements conditioned on \c _DEBUG, avoiding the clutter + * of ifdef/endif pairs. + * + * \code + * struct FooBar + * { + * int foo; + * bool bar; + * DB(int ref_count;) // Track number of users + * + * void release() + * { + * DB(--ref_count;) + * } + * }; + * \endcode + */ + #define DB(x) x - #include "cfg/cfg_debug.h" /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ + #include "cfg/cfg_debug.h" /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ #include /* CPU_HARVARD */ /* These are implemented in drv/kdebug.c */ @@ -132,14 +132,14 @@ #include void kputs_P(const char *PROGMEM str); void kprintf_P(const char *PROGMEM fmt, ...) FORMAT(__printf__, 1, 2); - int __assert_P(const char *PROGMEM cond, const char *PROGMEM file, int line); + int __bassert_P(const char *PROGMEM cond, const char *PROGMEM file, int line); void __trace_P(const char *func); void __tracemsg_P(const char *func, const char *PROGMEM fmt, ...); int __invalid_ptr_P(void *p, const char *PROGMEM name, const char *PROGMEM file, int line); int __check_wall_P(long *wall, int size, const char * PGM_ATTR name, const char * PGM_ATTR file, int line); #define kputs(str) kputs_P(PSTR(str)) #define kprintf(fmt, ...) kprintf_P(PSTR(fmt) ,## __VA_ARGS__) - #define __assert(cond, file, line) __assert_P(PSTR(cond), PSTR(file), (line)) + #define __bassert(cond, file, line) __bassert_P(PSTR(cond), PSTR(file), (line)) #define __trace(func) __trace_P(func) #define __tracemsg(func, fmt, ...) __tracemsg_P(func, PSTR(fmt), ## __VA_ARGS__) #define __invalid_ptr(p, name, file, line) __invalid_ptr_P((p), PSTR(name), PSTR(file), (line)) @@ -147,7 +147,7 @@ #else /* !CPU_HARVARD */ void kputs(const char *str); void kprintf(const char *fmt, ...) FORMAT(__printf__, 1, 2); - int __assert(const char *cond, const char *file, int line); + int __bassert(const char *cond, const char *file, int line); void __trace(const char *func); void __tracemsg(const char *func, const char *fmt, ...) FORMAT(__printf__, 2, 3); int __invalid_ptr(void *p, const char *name, const char *file, int line); @@ -155,10 +155,10 @@ #endif /* !CPU_HARVARD */ #if !CONFIG_KDEBUG_ASSERT_NO_TEXT - #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __assert(#x, THIS_FILE, __LINE__))) - #define ASSERT2(x, help) ((void)(LIKELY(x) ? 0 : __assert(help " (" #x ")", THIS_FILE, __LINE__))) + #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __bassert(#x, THIS_FILE, __LINE__))) + #define ASSERT2(x, help) ((void)(LIKELY(x) ? 0 : __bassert(help " (" #x ")", THIS_FILE, __LINE__))) #else - #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __assert("", THIS_FILE, __LINE__))) + #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __bassert("", THIS_FILE, __LINE__))) #define ASSERT2(x, help) ((void)ASSERT(x)) #endif @@ -186,6 +186,7 @@ #define TRACEMSG(...) do {} while(0) #endif + /** * \name Walls to detect data corruption * \{ @@ -304,7 +305,7 @@ #define kprintf(fmt,...) do { (void)(fmt); } while(0) #else /* ...but GCC can. */ - INLINE void kprintf(UNUSED_ARG(const char *, fmt), ...) { /* nop */ } + INLINE void kprintf(UNUSED_ARG(const char *, fmt), ...) { /* nop */ } #endif #endif /* _DEBUG */