X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/69988dc1f60ce27d2192eb2aa579962f585fffc8..a8eb521f94848a627a3fe470e34f62b13c157d34:/avr/debug.c

diff --git a/avr/debug.c b/avr/debug.c
index 74d8ab2..d4ae1f4 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -1,3 +1,9 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
 #include "common.h"
 #include <stdlib.h>
 #include <string.h>
@@ -5,171 +11,67 @@
 #include <avr/eeprom.h>
 
 #include "command.h"
+#include "print-utils.h"
 #include "debug.h"
 
 /*
  * Debugging
  */
-#ifdef DEBUG
-
-//uint8_t eeprom_read_byte (const uint8_t *__p)
 
-static void print_blanks(uint_fast8_t count)
-{
-	while(count--)
-		putchar(' ');
-}
-
-static uint8_t ram_read_byte(const uint8_t *p)
-{
-	return *p;
-}
+#ifdef DEBUG
 
-void dump_mem(const uint8_t *startaddr, int len, 
-		uint8_t (*readfkt)(const uint8_t *), char *title)
-{
-	uint8_t buf[16];
-	uint8_t llen = 16;
-	uint8_t pre = (size_t) startaddr % 16;
-	const uint8_t *addr = (uint8_t *) ((size_t) startaddr & ~0x0f);
-	len += pre;
-	uint8_t i;
-	
-	if (title && *title)
-		printf_P(PSTR("%s\n"),title);
-		
-	while (len) {
-		if (len < 16)
-			llen = len;
-
-		for (i = pre; i < llen; i++)
-			buf[i] = readfkt(addr + i);
-
-		printf_P(PSTR("%04x:"), addr);
-		for (i = 0; i < llen; i++) {
-			if ((i % 8) == 0)
-				putchar(' ');
-			if (i < pre)
-				printf_P(PSTR(".. "));
-			else
-				printf_P(PSTR("%.2x "), buf[i]);
-		}
-		/* fill line with whitespace for nice ASCII print */
-		print_blanks(3 * (16u - i) + (16u-i)/8 + 1 + pre);
-		/* Print data in ASCII characters */
-		for (i = pre; i < llen; i++)
-			printf_P(PSTR("%c"), isprint(buf[i]) ? buf[i] : '.');
-		putchar('\n');
-
-		pre = 0;
-		addr += 16;
-		len -= llen;
-	}
-}
 
-#if 0
-void dump_ram(const uint8_t *startaddr, int len, char *title)
-{
-	uint8_t llen = 16;
-	uint8_t pre = (size_t) startaddr % 16;
-	const uint8_t *addr = (uint8_t *) ((size_t) startaddr & ~0x0f);
-	len += pre;
-	uint8_t i;
-
-	if (title && *title)
-		printf_P(PSTR("%s\n"),title);
-
-	while (len) {
-		if (len < 16)
-			llen = len;
-
-		printf_P(PSTR("    %.4x:"), (size_t) addr);
-		print_blanks(3 * pre);
-		for (i = pre; i < llen; i++)
-			printf_P(PSTR(" %.2x"), addr[i]);
-		print_blanks(3 * (16 - i + 1) + pre);
-		for (i = pre; i < llen; i++)
-			printf_P(PSTR("%c"), isprint(addr[i]) ? addr[i] : '.');
-		putchar('\n');
-
-		pre = 0;
-		addr += 16;
-		len -= llen;
-	}
-}
-#endif
 #if 0
 void dump_heap(void)
 {
 	extern unsigned int __brkval;
 
-	dump_ram((uint8_t *) __malloc_heap_start,
+	dump_ram(__malloc_heap_start,
 		__brkval - (unsigned int) __malloc_heap_start,
 		"=== Heap:");
 }
 #endif
 
-#if 0
-/* TODO: combine with dump_ram() */
-void dump_eep(const uint8_t *addr, unsigned int len, 
-			uint8_t (*readfkt)(const uint8_t *))
-{
-	uint_fast8_t i;
-	uint8_t buf[16];
-
-	printf_P(PSTR("eeprom dump:"));
-	while (len) {
-		printf_P(PSTR("\n    0x%.4x:"), (unsigned int) addr);
-		for (i = 0; i<16; i++)
-			buf[i] = readfkt(addr + i);
-		for (i = 0; i<16; i++)
-			printf_P(PSTR(" %.2x"), buf[i]);
-		printf_P(PSTR("   "));
-		for (i = 0; i<16; i++)
-			printf_P(PSTR("%c"), isprint(buf[i]) ? buf[i] : '.');
-
-		addr += 16;
-		len -= len > 16 ? 16 : len;
-	}
-	putchar('\n');
-}
-#endif
-
 
 /*
- * EEPROM Display
+ * Memory Display
  *	md addr {len}
  */
 command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-//	static const uint8_t *addr;
-//	static uint16_t length = 128;
-	uint8_t (*readhow)(const uint8_t *);
-		
+	void (*readhow)(uint8_t *buf, uint32_t addr, uint8_t count);
+
 	(void) cmdtp; (void) flag;
 
 	if (argc < 2)
 		return CMD_RET_USAGE;
 
-	const uint8_t *addr;
-	uint16_t length = 128;
-	
-	if (strchr(argv[0],'r') != NULL)
-		readhow = ram_read_byte;
-	else if (strchr(argv[0],'e') != NULL)
-		readhow = eeprom_read_byte;
-	else
+	uint32_t addr;
+	uint32_t length = 128;
+
+	switch (argv[0][3]) {
+	case 'r':
+		readhow = ram_read_buf;
+		break;
+	case 'e':
+		readhow = eeprom_read_buf;
+		break;
+	case 'f':
+		readhow = flash_read_buf;
+		break;
+	default:
 		return CMD_RET_USAGE;
+	}
 
 	/* Address is specified since argc > 1 */
-	addr = (const uint8_t *) (size_t) strtoul(argv[1], NULL, 16);
+	addr =  strtoul(argv[1], NULL, 16);
 
 	/* If another parameter, it is the length to display. */
 	if (argc > 2)
 		length = (uint16_t) strtoul(argv[2], NULL, 16);
 
 	/* Print the lines. */
-	dump_mem(addr, length, readhow, NULL);
+	dump_mem(addr, addr, length, readhow, NULL);
 
 	return CMD_RET_SUCCESS;
 }
@@ -224,8 +126,10 @@ command_ret_t do_eep_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 	return CMD_RET_SUCCESS;
 }
 
+
 /*------------------------------------------------------------------------------*/
 
+#if 1
 
 struct __freelist {
 	size_t sz;
@@ -244,6 +148,8 @@ printfreelist(const char * title)
 	int i;
 	unsigned int freesum = 0;
 
+/* TODO: printf_P */
+
 	if (!__flp) {
 		printf("%s no free list\n", title ? title : "");
 	} else {
@@ -258,13 +164,13 @@ printfreelist(const char * title)
 			freesum += fp1->sz;
 		}
 	}
-	
+
 	freesum +=  (size_t) STACK_POINTER() - __malloc_margin - (size_t) __brkval;
 
 	printf("SP: %04x, __brkval: %04x, Total free: %04u\n",
 		(size_t) STACK_POINTER(), (size_t) __brkval, freesum);
 }
 
+#endif
 
 #endif /* DEBUG */
-