New debug command: dump heap

3 files changed, 31 insertions, 18 deletions

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 07c9684..eb63d68 100644
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -64,9 +64,14 @@ CMD_TBL_ITEM(
 	"address"
 ),
 CMD_TBL_ITEM(
-	!prfree,	2,	1,	do_pr_free_avr,
+	!prfree,	1,	1,	do_pr_free_avr,
 	"print avr heap free list",
-	"address"
+	""
+),
+CMD_TBL_ITEM(
+	!prheap,	1,	1,	do_pr_heap_avr,
+	"dump avr heap",
+	""
 ),
 #endif
 CMD_TBL_ITEM(
diff --git a/avr/debug.c b/avr/debug.c
index 21dd242..7ff7aea 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -22,19 +22,6 @@
 
 #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}
@@ -212,11 +199,16 @@ struct __freelist {
 	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)
 {
@@ -241,7 +233,7 @@ printfreelist(const char * title)
 		}
 	}
 
-	freesum +=  (size_t) STACK_POINTER() - __malloc_margin - (size_t) __brkval;
+	freesum += get_freemem();
 
 	printf("SP: %04x, __brkval: %04x, Total free: %04u\n",
 		(size_t) STACK_POINTER(), (size_t) __brkval, freesum);
@@ -254,4 +246,19 @@ command_ret_t do_pr_free_avr(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
 	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 */
diff --git a/include/debug.h b/include/debug.h
index 0d60177..ae6f28a 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -18,6 +18,7 @@ command_ret_t do_mem_mm_avr(cmd_tbl_t *, uint_fast8_t, int, char * const []);
 command_ret_t do_mem_nm_avr(cmd_tbl_t *, uint_fast8_t, int, char * const []);
 command_ret_t do_eep_cp(cmd_tbl_t *, uint_fast8_t, int, char * const []);
 command_ret_t do_pr_free_avr(cmd_tbl_t *, uint_fast8_t, int, char * const []);
+command_ret_t do_pr_heap_avr(cmd_tbl_t *, uint_fast8_t, int, char * const []);
 
 void printfreelist(const char * title);