X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/1157e75889d3d6d23d1e2514f401cd5b354bd149..fcf1d5b30bd3b341fb7596aef395f347c6dc97b4:/avr/debug.c

diff --git a/avr/debug.c b/avr/debug.c
index f3632c2..21dd242 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -1,19 +1,20 @@
 /*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014,2016 Leo C. <erbl259-lmu@yahoo.de>
  *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
+#include "debug.h"
 #include "common.h"
-#include <stdlib.h>
+#include <stdlib.h>			/* __malloc_margin */
 #include <string.h>
 #include <ctype.h>
 #include <avr/eeprom.h>
 
 #include "command.h"
 #include "cli_readline.h"
+#include "eval_arg.h"
 #include "print-utils.h"
-#include "debug.h"
 
 /*
  * Debugging
@@ -38,9 +39,9 @@ void dump_heap(void)
  * 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, uint_fast8_t flag, int argc, char * const argv[])
 {
-	void (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count);
+	int (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count);
 
 	(void) cmdtp; (void) flag;
 
@@ -65,11 +66,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 +78,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 +89,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 +139,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 +160,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] == '-')) {
 			/* <CR> pressed as only input, don't modify current
 			 * location and move to next. "-" pressed will go back.
@@ -181,7 +181,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,26 +189,24 @@ 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;
@@ -249,6 +247,11 @@ printfreelist(const char * title)
 		(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;
+}
 
 #endif /* DEBUG */