From 6b5df304d868c9eefac269bcaaa224bfdbb925cb Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 18 Feb 2008 16:00:49 +0000 Subject: [PATCH] Unify embedded and hosted debug support git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1135 38d2e660-2303-0410-9eaa-f027e97ec537 --- cfg/debug.h | 194 +++++++++++++++++---------------------------------- drv/kdebug.c | 11 +-- 2 files changed, 71 insertions(+), 134 deletions(-) diff --git a/cfg/debug.h b/cfg/debug.h index 91fefb72..a75b4d2d 100644 --- a/cfg/debug.h +++ b/cfg/debug.h @@ -112,144 +112,80 @@ * * void release() * { - * DB(--ref_count;) + * DB(--ref_count;) * } * }; * \endcode */ #define DB(x) x - #if OS_HOSTED - #include - #include - - INLINE void kdbg_init(void) { /* nop */ } - INLINE void kputchar(char c) - { - putc(c, stderr); - } - INLINE void kputs(const char *str) - { - fputs(str, stderr); - } - #if COMPILER_VARIADIC_MACROS - /* G++ can't inline functions with variable arguments... */ - #define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) - #else - #define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap) - INLINE int kprintf(const char *fmt, ...) - { - va_list ap; - int result; - - va_start(ap, fmt); - result = kvprintf(fmt, ap); - va_end(ap); - - return result; - } - #endif - void kdump(const void *buf, size_t len); /* UNIMPLEMENTED */ - - #ifndef ASSERT - #include - #define ASSERT(x) assert(x) - #endif /* ASSERT */ - #define ASSERT2(x, help) ASSERT(help && x) - - /** - * Check that the given pointer is either NULL or pointing to valid memory. - * - * The assumption here is that valid pointers never point to low - * memory regions. This helps catching pointers taken from - * struct/class memebers when the struct pointer was NULL. - */ - #define ASSERT_VALID_PTR(p) ASSERT((unsigned long)(p) > 0x200) - - /** - * Check that the given pointer is not pointing to invalid memory. - * - * \see ASSERT_VALID_PTR() - */ - #define ASSERT_VALID_PTR_OR_NULL(p) ASSERT((((p) == NULL) || ((unsigned long)(p) >= 0x200))) - - #if !CONFIG_KDEBUG_DISABLE_TRACE - #define TRACE kprintf("%s()\n", __func__) - #if COMPILER_VARIADIC_MACROS - #define TRACEMSG(msg,...) kprintf("%s(): " msg, __func__, ## __VA_ARGS__) - #else - INLINE void TRACEMSG(const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - kprintf("%s(): ", __func__); - kvprintf(fmt, va); - va_end(va); - } - #endif - #else - #define TRACE do {} while(0) - #define TRACEMSG(...) do {} while(0) - #endif - - #else /* !OS_HOSTED */ - - #include /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ - #include /* CPU_HARVARD */ - - /* These are implemented in drv/kdebug.c */ - void kdbg_init(void); - void kputchar(char c); - int kputnum(int num); - void kdump(const void *buf, size_t len); - void __init_wall(long *wall, int size); - - #if CPU_HARVARD - #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); - 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 __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)) - #define __check_wall(wall, size, name, file, line) __check_wall_P(wall, size, PSTR(name), PSTR(file), (line)) - #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); - 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); - int __check_wall(long *wall, int size, const char *name, const char *file, int line); - #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__))) - #else - #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __assert("", THIS_FILE, __LINE__))) - #define ASSERT2(x, help) ((void)ASSERT(x)) - #endif + #include /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ + #include /* CPU_HARVARD */ + + /* These are implemented in drv/kdebug.c */ + void kdbg_init(void); + void kputchar(char c); + int kputnum(int num); + void kdump(const void *buf, size_t len); + void __init_wall(long *wall, int size); + + #if CPU_HARVARD + #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); + 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 __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)) + #define __check_wall(wall, size, name, file, line) __check_wall_P(wall, size, PSTR(name), PSTR(file), (line)) + #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); + 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); + int __check_wall(long *wall, int size, const char *name, const char *file, int line); + #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__))) + #else + #define ASSERT(x) ((void)(LIKELY(x) ? 0 : __assert("", THIS_FILE, __LINE__))) + #define ASSERT2(x, help) ((void)ASSERT(x)) + #endif - #define ASSERT_VALID_PTR(p) ((void)(LIKELY((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__))) - #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__))) + /** + * Check that the given pointer is either NULL or pointing to valid memory. + * + * The assumption here is that valid pointers never point to low + * memory regions. This helps catching pointers taken from + * struct/class memebers when the struct pointer was NULL. + */ + #define ASSERT_VALID_PTR(p) ((void)(LIKELY((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__))) - #if !CONFIG_KDEBUG_DISABLE_TRACE - #define TRACE __trace(__func__) - #define TRACEMSG(msg,...) __tracemsg(__func__, msg, ## __VA_ARGS__) - #else - #define TRACE do {} while(0) - #define TRACEMSG(...) do {} while(0) - #endif + /** + * Check that the given pointer is not pointing to invalid memory. + * + * \see ASSERT_VALID_PTR() + */ + #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__))) - #endif /* !OS_HOSTED */ + #if !CONFIG_KDEBUG_DISABLE_TRACE + #define TRACE __trace(__func__) + #define TRACEMSG(msg,...) __tracemsg(__func__, msg, ## __VA_ARGS__) + #else + #define TRACE do {} while(0) + #define TRACEMSG(...) do {} while(0) + #endif /** * \name Walls to detect data corruption diff --git a/drv/kdebug.c b/drv/kdebug.c index 739400a4..1e20615a 100644 --- a/drv/kdebug.c +++ b/drv/kdebug.c @@ -45,8 +45,9 @@ #include #include /* for BV() */ #include -#include /* for CLOCK_FREQ */ -#include /* Required for bus macros overrides */ +#warning what about these? +//#include /* for CLOCK_FREQ */ +//#include /* Required for bus macros overrides */ #include /* for _formatted_write() */ #include @@ -58,10 +59,10 @@ #endif -#if defined(_EMUL) +#if OS_HOSTED #include #define KDBG_WAIT_READY() do { /*nop*/ } while(0) - #define KDBG_WRITE_CHAR(c) putchar((c)) + #define KDBG_WRITE_CHAR(c) putc((c), stderr) #define KDBG_MASK_IRQ(old) do { (void)(old); } while(0) #define KDBG_RESTORE_IRQ(old) do { /*nop*/ } while(0) typedef char kdbg_irqsave_t; /* unused */ @@ -228,7 +229,7 @@ int PGM_FUNC(__invalid_ptr)(void *value, const char * PGM_ATTR name, const char PGM_FUNC(kputs)(PGM_STR("Invalid ptr: ")); PGM_FUNC(kputs)(name); #if CONFIG_PRINTF - PGM_FUNC(kprintf)(PGM_STR(" = 0x%x\n"), (unsigned int)value); + PGM_FUNC(kprintf)(PGM_STR(" = 0x%p\n"), value); #else (void)value; kputchar('\n'); -- 2.25.1