fat cp: copy_dir (untested)

[z180-stamp.git] / avr / debug.c

diff --git a/avr/debug.c b/avr/debug.c
index 46e2ef668a0970ffe90882c9eb40e647826d125b..ea4aa21a9f0dce93b8eb7db501c20e02c54cc811 100644 (file)
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -22,24 +22,11 @@
 
 #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, uint_fast8_t flag, int argc, char * const argv[])
 {
        int (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count);
 
@@ -78,7 +65,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;
@@ -139,7 +126,7 @@ 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;
        int nbytes;
@@ -196,11 +183,11 @@ mod_mem_avr(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg
 }
 
 
-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);
 }
@@ -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)
 {
@@ -224,34 +216,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);
 }
 
-command_ret_t do_pr_free_avr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+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 */