X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=1e20615a59cc8d1a16cd0c84e060ec3be03a2e18;hb=633a26b43c6a9a43ecb1d08425fbb53145e10bc1;hp=cabd8b7a8a9f3cd0d8a7cffe67f3cd77d4ffc160;hpb=642c2c9ff83ee4d1ce00edda253ddf20774b6976;p=bertos.git diff --git a/drv/kdebug.c b/drv/kdebug.c old mode 100755 new mode 100644 index cabd8b7a..1e20615a --- a/drv/kdebug.c +++ b/drv/kdebug.c @@ -1,249 +1,94 @@ -/*! +/** * \file * * - * \brief General pourpose debug functions. + * \brief General pourpose debug support for embedded systems (implementation). * * \version $Id$ - * * \author Bernardo Innocenti * \author Stefano Fedrigo */ -/*#* - *#* $Log$ - *#* Revision 1.14 2004/09/06 21:39:56 bernie - *#* Allow partial redefinition of BUS macros. - *#* - *#* Revision 1.13 2004/08/29 22:04:26 bernie - *#* Convert 485 macros to generic BUS macros; - *#* kputchar(): New public function. - *#* - *#* Revision 1.12 2004/08/25 14:12:08 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.11 2004/08/24 16:19:08 bernie - *#* kputchar(): New public function; Add missing dummy inlines for \!_DEBUG. - *#* - *#* Revision 1.10 2004/08/04 15:57:50 rasky - *#* Cambiata la putchar per kdebug per DSP56k: la nuova funzione e' quella piu' a basso livello (assembly) - *#* - *#* Revision 1.9 2004/08/02 20:20:29 aleph - *#* Merge from project_ks - *#* - *#* Revision 1.8 2004/07/30 14:26:33 rasky - *#* Semplificato l'output dell'ASSERT - *#* Aggiunta ASSERT2 con stringa di help opzionalmente disattivabile - *#* - *#* Revision 1.7 2004/07/30 14:15:53 rasky - *#* Nuovo supporto unificato per detect della CPU - *#* - *#* Revision 1.6 2004/07/18 21:49:28 bernie - *#* Add ATmega8 support. - *#* - *#* Revision 1.5 2004/06/27 15:20:26 aleph - *#* Change UNUSED() macro to accept two arguments: type and name; - *#* Add macro GNUC_PREREQ to detect GCC version during build; - *#* Some spacing cleanups and typo fix - *#* - *#* Revision 1.4 2004/06/06 18:09:51 bernie - *#* Import DSP56800 changes; Print broken wall bricks in hex. - *#* - *#* Revision 1.3 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.2 2004/05/23 18:21:53 bernie - *#* Trim CVS logs and cleanup header info. - *#* - *#*/ - -#include "kdebug.h" -#include "hw.h" -#include "config.h" + +#include +#include +#include +#include +#include /* for BV() */ +#include +#warning what about these? +//#include /* for CLOCK_FREQ */ +//#include /* Required for bus macros overrides */ #include /* for _formatted_write() */ +#include #ifdef _DEBUG -#if defined(_EMUL) +#if CPU_HARVARD && !defined(_PROGMEM) + #error This module build correctly only in program memory! +#endif + + +#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 */ -#elif CPU_I196 - #include "Util196.h" - #define KDBG_WAIT_READY() do {} while (!(SP_STAT & (SPSF_TX_EMPTY | SPSF_TX_INT))) - #define KDBG_WRITE_CHAR(c) do { SBUF = (c); } while(0) - #define KDBG_MASK_IRQ(old) \ - do { \ - (old) = INT_MASK1 & INT1F_TI; \ - INT_MASK1 &= ~INT1F_TI; \ - } while(0) - #define KDBG_RESTORE_IRQ(old) do { INT_MASK1 |= (old); } - typedef uint16_t kdbg_irqsave_t; /* FIXME: unconfirmed */ -#elif CPU_AVR - #include - - #if CONFIG_KDEBUG_PORT == 0 - - /* - * Support for special bus policies or external transceivers - * on UART0 (to be overridden in "hw.h"). - */ - #ifndef KDBG_UART0_BUS_INIT - #define KDBG_UART0_BUS_INIT do {} while (0) - #endif - #ifndef KDBG_UART0_BUS_RX - #define KDBG_UART0_BUS_RX do {} while (0) - #endif - #ifndef KDBG_UART0_BUS_TX - #define KDBG_UART0_BUS_TX do {} while (0) - #endif - - #if defined(__AVR_ATmega64__) - #define UCR UCSR0B - #define UDR UDR0 - #define USR UCSR0A - #elif defined(__AVR_ATmega8__) - #define UCR UCSRB - #define USR UCSRA - #endif - - #define KDBG_WAIT_READY() do { loop_until_bit_is_set(USR, UDRE); } while(0) - #define KDBG_WAIT_TXDONE() do { loop_until_bit_is_set(USR, TXC); } while(0) - - /* - * We must clear the TXC flag before sending a new character to allow - * KDBG_WAIT_TXDONE() to work properly. - * - * BUG: if KDBG_WRITE_CHAR() is called after the TXC flag is set by hardware, - * a new TXC could be generated after we've cleared it and before the new - * character is written to UDR. On a 485 bus, the transceiver will be put - * in RX mode while still transmitting the last char. - */ - #define KDBG_WRITE_CHAR(c) do { USR |= BV(TXC); UDR = (c); } while(0) - - #define KDBG_MASK_IRQ(old) do { \ - (old) = UCR; \ - UCR |= BV(TXEN); \ - UCR &= ~(BV(TXCIE) | BV(UDRIE)); \ - KDBG_UART0_BUS_TX; \ - } while(0) - - #define KDBG_RESTORE_IRQ(old) do { \ - KDBG_WAIT_TXDONE(); \ - KDBG_UART0_BUS_RX; \ - UCR = (old); \ - } while(0) - - typedef uint8_t kdbg_irqsave_t; - - #elif CONFIG_KDEBUG_PORT == 1 - - /* - * Support for special bus policies or external transceivers - * on UART1 (to be overridden in "hw.h"). - */ - #ifndef KDBG_UART1_BUS_INIT - #define KDBG_UART1_BUS_INIT do {} while (0) - #endif - #ifndef KDBG_UART1_BUS_RX - #define KDBG_UART1_BUS_RX do {} while (0) - #endif - #ifndef KDBG_UART1_BUS_TX - #define KDBG_UART1_BUS_TX do {} while (0) - #endif - - #define KDBG_WAIT_READY() do { loop_until_bit_is_set(UCSR1A, UDRE); } while(0) - #define KDBG_WAIT_TXDONE() do { loop_until_bit_is_set(UCSR1A, TXC); } while(0) - #define KDBG_WRITE_CHAR(c) do { UCSR1A |= BV(TXC); UDR1 = (c); } while(0) - - #define KDBG_MASK_IRQ(old) do { \ - (old) = UCSR1B; \ - UCSR1B |= BV(TXEN); \ - UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \ - KDBG_UART1_BUS_TX; \ - } while(0) - - #define KDBG_RESTORE_IRQ(old) do { \ - KDBG_WAIT_TXDONE(); \ - KDBG_UART1_BUS_RX; \ - UCSR1B = (old); \ - } while(0) - - typedef uint8_t kdbg_irqsave_t; - #else - #error CONFIG_KDEBUG_PORT should be either 0 or 1 + + #define kdbg_hw_init() do {} while (0) ///< Not needed + + #if CONFIG_KDEBUG_PORT == 666 + #error BITBANG debug console missing for this platform #endif -#elif defined(__MWERKS__) && CPU_DSP56K - /* Debugging go through the JTAG interface. The MSL library already - implements the console I/O correctly. */ - #include - #define KDBG_WAIT_READY() do { } while (0) - #define KDBG_WRITE_CHAR(c) __put_char(c, stdout) - #define KDBG_MASK_IRQ(old) do { (void)(old); } while (0) - #define KDBG_RESTORE_IRQ(old) do { (void)(old); } while (0) - typedef uint8_t kdbg_irqsave_t; /* unused */ #else - #error Unknown architecture + #include CPU_CSOURCE(kdebug) #endif void kdbg_init(void) { -#if CPU_I196 - - /* Set serial port for 19200bps 8N1 */ - INT_MASK1 &= ~(INT1F_TI | INT1F_RI); - SP_CON = SPCF_RECEIVE_ENABLE | SPCF_MODE1; - ioc1_img |= IOC1F_TXD_SEL | IOC1F_EXTINT_SRC; - IOC1 = ioc1_img; - BAUD_RATE = 0x33; - BAUD_RATE = 0x80; - -#elif CPU_AVR - - /* Compute the baud rate */ - uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1; - - #if defined(__AVR_ATmega64__) - #if CONFIG_KDEBUG_PORT == 0 - UBRR0H = (uint8_t)(period>>8); - UBRR0L = (uint8_t)period; - KDBG_UART0_BUS_INIT; - #elif CONFIG_KDEBUG_PORT == 1 - UBRR1H = (uint8_t)(period>>8); - UBRR1L = (uint8_t)period; - KDBG_UART1_BUS_INIT; - #else - #error CONFIG_KDEBUG_PORT must be either 0 or 1 - #endif - #elif defined(__AVR_ATmega8__) - UBRRH = (uint8_t)(period>>8); - UBRRL = (uint8_t)period; - #elif defined(__AVR_ATmega103__) - UBRR = (uint8_t)period; - KDBG_UART0_BUS_INIT; - #else - #error Unknown arch - #endif - -#endif /* !CPU_I196 && !CPU_AVR */ - - kputs("\n\n*** DBG START ***\n"); + /* Init debug hw */ + kdbg_hw_init(); + kputs("\n\n*** BeRTOS DBG START ***\n"); } -/*! +/** * Output one character to the debug console */ -static void __kputchar(char c, UNUSED(void *, unused)) +static void __kputchar(char c, UNUSED_ARG(void *, unused)) { /* Poll while serial buffer is still busy */ KDBG_WAIT_READY(); @@ -272,22 +117,31 @@ void kputchar(char c) } -void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) +static void PGM_FUNC(kvprintf)(const char * PGM_ATTR fmt, va_list ap) { - va_list ap; - +#if CONFIG_PRINTF /* Mask serial TX intr */ kdbg_irqsave_t irqsave; KDBG_MASK_IRQ(irqsave); - va_start(ap, fmt); PGM_FUNC(_formatted_write)(fmt, __kputchar, 0, ap); - va_end(ap); /* Restore serial TX intr */ KDBG_RESTORE_IRQ(irqsave); +#else + /* A better than nothing printf() surrogate. */ + PGM_FUNC(kputs)(fmt); +#endif /* CONFIG_PRINTF */ } +void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + PGM_FUNC(kvprintf)(fmt, ap); + va_end(ap); +} void PGM_FUNC(kputs)(const char * PGM_ATTR str) { @@ -304,22 +158,82 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str) } -int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, int line) +/** + * Cheap function to print small integers without using printf(). + */ +int kputnum(int num) +{ + int output_len = 0; + int divisor = 10000; + int digit; + + do + { + digit = num / divisor; + num %= divisor; + + if (digit || output_len || divisor == 1) + { + kputchar(digit + '0'); + ++output_len; + } + } + while (divisor /= 10); + + return output_len; +} + + +static void klocation(const char * PGM_ATTR file, int line) { PGM_FUNC(kputs)(file); - PGM_FUNC(kprintf)(PSTR(":%d: Assertion failed: "), line); + kputchar(':'); + kputnum(line); + PGM_FUNC(kputs)(PGM_STR(": ")); +} + +int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, int line) +{ + klocation(file, line); + PGM_FUNC(kputs)(PGM_STR("Assertion failed: ")); PGM_FUNC(kputs)(cond); - PGM_FUNC(kputs)(PSTR("\n")); + kputchar('\n'); + BREAKPOINT; return 1; } +/* + * Unfortunately, there's no way to get __func__ in + * program memory, so we waste quite a lot of RAM in + * AVR and other Harvard processors. + */ +void PGM_FUNC(__trace)(const char *name) +{ + PGM_FUNC(kprintf)(PGM_STR("%s()\n"), name); +} + +void PGM_FUNC(__tracemsg)(const char *name, const char * PGM_ATTR fmt, ...) +{ + va_list ap; + + PGM_FUNC(kprintf)(PGM_STR("%s(): "), name); + va_start(ap, fmt); + PGM_FUNC(kvprintf)(fmt, ap); + va_end(ap); + kputchar('\n'); +} int PGM_FUNC(__invalid_ptr)(void *value, const char * PGM_ATTR name, const char * PGM_ATTR file, int line) { - PGM_FUNC(kputs)(file); - PGM_FUNC(kprintf)(PSTR(":%d: Invalid pointer: "), line); + klocation(file, line); + PGM_FUNC(kputs)(PGM_STR("Invalid ptr: ")); PGM_FUNC(kputs)(name); - PGM_FUNC(kprintf)(PSTR(" = 0x%x\n"), value); + #if CONFIG_PRINTF + PGM_FUNC(kprintf)(PGM_STR(" = 0x%p\n"), value); + #else + (void)value; + kputchar('\n'); + #endif return 1; } @@ -331,7 +245,7 @@ void __init_wall(long *wall, int size) } -int __check_wall(long *wall, int size, const char *name, const char *file, int line) +int PGM_FUNC(__check_wall)(long *wall, int size, const char * PGM_ATTR name, const char * PGM_ATTR file, int line) { int i, fail = 0; @@ -339,8 +253,14 @@ int __check_wall(long *wall, int size, const char *name, const char *file, int l { if (wall[i] != WALL_VALUE) { - kprintf("%s:%d: Wall broken: %s[%d] (0x%p) = 0x%lx\n", - file, line, name, i, wall + i, wall[i]); + klocation(file, line); + PGM_FUNC(kputs)(PGM_STR("Wall broken: ")); + PGM_FUNC(kputs)(name); + #if CONFIG_PRINTF + PGM_FUNC(kprintf)(PGM_STR("[%d] (0x%p) = 0x%lx\n"), i, wall + i, wall[i]); + #else + kputchar('\n'); + #endif fail = 1; } } @@ -349,7 +269,9 @@ int __check_wall(long *wall, int size, const char *name, const char *file, int l } -/*! +#if CONFIG_PRINTF + +/** * Dump binary data in hex */ void kdump(const void *_buf, size_t len) @@ -361,4 +283,6 @@ void kdump(const void *_buf, size_t len) kputchar('\n'); } +#endif /* CONFIG_PRINTF */ + #endif /* _DEBUG */