X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/ad9bc17c8ecab1f0bbd26f2270d4d396f4bc5e52..HEAD:/avr/debug.c diff --git a/avr/debug.c b/avr/debug.c index f3632c2..89ef4b1 100644 --- a/avr/debug.c +++ b/avr/debug.c @@ -1,19 +1,20 @@ /* - * (C) Copyright 2014 Leo C. + * (C) Copyright 2014,2016 Leo C. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0 */ +#include "debug.h" #include "common.h" -#include +#include /* __malloc_margin */ #include #include #include #include "command.h" #include "cli_readline.h" +#include "eval_arg.h" #include "print-utils.h" -#include "debug.h" /* * Debugging @@ -21,28 +22,13 @@ #ifdef DEBUG - -#if 0 -void dump_heap(void) -{ - extern unsigned int __brkval; - - dump_ram(__malloc_heap_start, - __brkval - (unsigned int) __malloc_heap_start, - "=== Heap:"); -} -#endif - - /* * Memory Display * md addr {len} */ -command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_dump_mem(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { - void (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count); - - (void) cmdtp; (void) flag; + ERRNUM (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count); if (argc < 2) return CMD_RET_USAGE; @@ -65,11 +51,11 @@ command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg } /* Address is specified since argc > 1 */ - addr = strtoul(argv[1], NULL, 16); + addr = eval_arg(argv[1], NULL); /* If another parameter, it is the length to display. */ if (argc > 2) - length = (uint16_t) strtoul(argv[2], NULL, 16); + length = (uint16_t) eval_arg(argv[2], NULL); /* Print the lines. */ dump_mem(addr, addr, length, readwhat, NULL); @@ -77,7 +63,7 @@ command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg return CMD_RET_SUCCESS; } -command_ret_t do_eep_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_eep_cp(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { uint16_t src, dest, count; int_fast8_t step; @@ -88,9 +74,9 @@ command_ret_t do_eep_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ if (argc != 4) return CMD_RET_USAGE; - src = (size_t) strtoul(argv[1], NULL, 16); - dest = (size_t) strtoul(argv[2], NULL, 16); - count = (size_t) strtoul(argv[3], NULL, 16); + src = (size_t) eval_arg(argv[1], NULL); + dest = (size_t) eval_arg(argv[2], NULL); + count = (size_t) eval_arg(argv[3], NULL); if (src > E2END) { debug("src > EEPROM size: 0x%04x\n", src); @@ -138,10 +124,9 @@ command_ret_t do_eep_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ static uint8_t *mm_last_addr; static command_ret_t -mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[]) +mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, uint_fast8_t flag, int argc, char * const argv[]) { uint8_t *addr; - uint8_t data; int nbytes; (void) cmdtp; @@ -160,17 +145,17 @@ mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg /* Address is specified since argc > 1 */ - addr = (uint8_t *) (size_t) strtoul(argv[1], NULL, 16); + addr = (uint8_t *) (size_t) eval_arg(argv[1], NULL); } /* Print the address, followed by value. Then accept input for * the next value. A non-converted value exits. */ do { - data = *addr; + uint8_t data = *addr; printf_P(PSTR("%04x: %02x"), addr, data); - nbytes = cli_readline(PSTR(" ? ")); + nbytes = cli_readline(PSTR(" ? "), 0); if (nbytes == 0 || (nbytes == 1 && console_buffer[0] == '-')) { /* pressed as only input, don't modify current * location and move to next. "-" pressed will go back. @@ -181,7 +166,7 @@ mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg } else { char *endp; - data = strtoul(console_buffer, &endp, 16); + data = eval_arg(console_buffer, &endp); nbytes = endp - console_buffer; if (nbytes) { *addr = data; @@ -189,36 +174,39 @@ mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg addr++; } } - } while (nbytes); + } while (nbytes > 0); mm_last_addr = addr; return CMD_RET_SUCCESS; } -command_ret_t do_mem_mm_avr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_mem_mm_avr(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { return mod_mem_avr (cmdtp, 1, flag, argc, argv); } -command_ret_t do_mem_nm_avr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_mem_nm_avr(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { return mod_mem_avr (cmdtp, 0, flag, argc, argv); } /*------------------------------------------------------------------------------*/ -#if 1 - struct __freelist { size_t sz; struct __freelist *nx; }; -extern char *__brkval; /* first location not yet allocated */ -extern struct __freelist *__flp; /* freelist pointer (head of freelist) */ +extern char *__brkval; /* first location not yet allocated */ +extern struct __freelist *__flp; /* freelist pointer (head of freelist) */ #define STACK_POINTER() ((char *)AVR_STACK_POINTER_REG) +size_t get_freemem(void) +{ + return (size_t) STACK_POINTER() - __malloc_margin - (size_t) __brkval; +} + void printfreelist(const char * title) { @@ -226,29 +214,47 @@ printfreelist(const char * title) int i; unsigned int freesum = 0; -/* TODO: printf_P */ - if (!__flp) { - printf("%s no free list\n", title ? title : ""); + printf_P(PSTR("%s no free list\n"), title ? title : ""); } else { - printf("Free list: %s\n", title ? title : ""); + printf_P(PSTR("Free list: %s\n"), title ? title : ""); for (i = 0, fp1 = __flp; fp1; i++, fp1 = fp1->nx) { - printf(" entry %d @ %04x: size %4u, next ", + printf_P(PSTR(" entry %d @ %04x: size %4u, next "), i, (size_t)fp1, fp1->sz); if (fp1->nx) - printf("%04x\n", (size_t)fp1->nx); + printf_P(PSTR("%04x\n"), (size_t)fp1->nx); else - printf("NULL\n"); + printf_P(PSTR("NULL\n")); freesum += fp1->sz; } } - freesum += (size_t) STACK_POINTER() - __malloc_margin - (size_t) __brkval; + freesum += get_freemem(); - printf("SP: %04x, __brkval: %04x, Total free: %04u\n", + printf_P(PSTR("SP: %04x, __brkval: %04x, Total free: %04u\n"), (size_t) STACK_POINTER(), (size_t) __brkval, freesum); } -#endif +command_ret_t do_pr_free_avr(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) +{ + printfreelist(NULL); + + return CMD_RET_SUCCESS; +} + +void dump_heap(void) +{ + //extern unsigned int __brkval; + + dump_ram((uint8_t *)__malloc_heap_start, (size_t) __malloc_heap_start, __brkval - __malloc_heap_start, + "=== Heap:"); +} + +command_ret_t do_pr_heap_avr(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) +{ + dump_heap(); + + return CMD_RET_SUCCESS; +} #endif /* DEBUG */