[add] 打印全局变量

Middlewares/MCoreDump/arch/armv7m/armv7m.c

@@ -202,6 +202,7 @@ void mcd_multi_dump(void)
 
 #endif
 
+// 有架构区别
 void print_registers_armv7m(core_regset_type *reg, fp_regset_type *fp_reg, char *thread)
 {
     mcd_print("Registers@%s\n", thread);
@@ -224,35 +225,6 @@ void print_registers_armv7m(core_regset_type *reg, fp_regset_type *fp_reg, char
     mcd_print("xPSR: 0x%08x\n", reg->xpsr);
 }
 
-void print_mem_armv7m(uint32_t addr, uint32_t len)
-{
-    uint32_t *paddr;
-    uint32_t i;
-
-    if (len == 0)
-        return;
-
-    paddr = (uint32_t *)addr;
-    mcd_print("mem@0x%08x,0x%08x\n", addr, len);
-
-    for (i = 0; i < len;)
-    {
-        mcd_print("0x%08x", *paddr);
-        paddr++;
-
-        i += 4;
-        if (i % 16 == 0)
-            mcd_print("\n");
-        else
-            mcd_print(" ");
-    }
-
-    mcd_print("\n");
-
-    if (len % 16 != 0)
-        mcd_print("\n");
-}
-
 /**
  * @brief Collect ARM Cortex-M4 registers from RT-Thread stack frame
  *

Middlewares/MCoreDump/arch/mcd_arch_interface.h

@@ -11,8 +11,6 @@
 #ifndef __MCD_ARCH_INTERFACE_H__
 #define __MCD_ARCH_INTERFACE_H__
 
-#include <stdint.h>
-
 /**
  * @brief Architecture-specific hard fault exception handler
  *
@@ -39,13 +37,10 @@ void collect_registers_armv7m(uint32_t *stack_top, core_regset_type *core_regset
 
 // 打印寄存器
 void print_registers_armv7m(core_regset_type *reg, fp_regset_type *fp_reg, char *thread);
-// 打印一段内存
-void print_mem_armv7m(uint32_t addr, uint32_t len);
 
 /* Generic interface macro for architecture-agnostic code */
     #define collect_registers collect_registers_armv7m
     #define print_registers print_registers_armv7m
-    #define print_mem print_mem_armv7m
     #define arch_hard_fault_exception_hook armv7m_hard_fault_exception_hook
 
 #elif defined(PKG_USING_MCOREDUMP_ARCH_ARMV8M)
@@ -66,7 +61,6 @@ void collect_registers_armv8m(uint32_t *stack_top, core_regset_type *core_regset
 /* Generic interface macro for architecture-agnostic code */
     #define collect_registers collect_registers_armv8m
     #define print_registers
-    #define print_mem
     #define arch_hard_fault_exception_hook armv8m_hard_fault_exception_hook
 #else
     #error "MCoredump does not support this architecture"

Middlewares/MCoreDump/coredump.h

@@ -11,9 +11,13 @@
 #ifndef __COREDUMP_H__
 #define __COREDUMP_H__
 
+#include <stddef.h>
 #include "mcd_cfg.h"
 #include "arm/mcd_arm_define.h"
 
+#define MCD_SECTION(x) @ x
+#define MCD_USED __root
+
 /**
  * @brief Function pointer type for coredump data output
  *
@@ -139,6 +143,43 @@ void mcd_mini_dump(void);
 // 保存RTOS所有线程：更新当前寄存器到全局变量
 void mcd_multi_dump(void);
 
+// 打印一段内存
+void print_mem(uint32_t addr, uint32_t len);
+// 单独打印全局变量
+void print_variable(void *addr, int size);
+// 打印宏定义的所有全局变量
+int mcd_variable_dump(void);
+
+#define COREADUMP_PRINT_ITEM_SIZE 2
+// 打印一个变量
+#define COREADUMP_PRINT_VARIABLE_DEFINE(name) \
+MCD_USED const uint32_t __coreadump_rang_##name[COREADUMP_PRINT_ITEM_SIZE] MCD_SECTION(".coreadump_rang.1") = { (uint32_t)&name, sizeof(name) }
+
+// 打印一段内存
+#define COREADUMP_PRINT_RANGE_DEFINE(index, addr, size) \
+MCD_USED const uint32_t __coreadump_rang_##index[COREADUMP_PRINT_ITEM_SIZE] MCD_SECTION(".coreadump_rang.2") = { (uint32_t)addr, (uint32_t)size }
+
+#define COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM 3
+
+// 运行时动态打印全局变量
+inline int COREADUMP_PRINT_RANGE_DYNAMIC(void *addr, int size)
+{
+    extern void *sg_cd_variable_addr[COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM];
+    extern int sg_cd_variable_sizeof[COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM];
+
+    for (int i = 0; i < COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM; i++)
+    {
+        if (NULL == sg_cd_variable_addr[i] && 0 == sg_cd_variable_sizeof[i])
+        {
+            sg_cd_variable_addr[i] = addr;
+            sg_cd_variable_sizeof[i] = size;
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
 /**
  * @brief Generate coredump with all threads information
  *

Middlewares/MCoreDump/faultdump.c

@@ -22,7 +22,7 @@
 
 /* Static memory buffer for coredump storage */
 #ifndef PKG_MCOREDUMP_MEMORY_SIZE
-#define COREDUMP_MEMORY_SIZE        (8 * 1024)    /* Default 8KB buffer size */
+#define COREDUMP_MEMORY_SIZE        1//(8 * 1024)    /* Default 8KB buffer size */
 #else
 #define COREDUMP_MEMORY_SIZE        PKG_MCOREDUMP_MEMORY_SIZE
 #endif
@@ -504,3 +504,65 @@ static int mcd_dump_memory(void)
     return MCD_OK;
 }
 MCD_CMD_EXPORT(mcd_dump_memory, Print memory coredump via serial);
+
+
+// 自定义：和架构无关
+void print_mem(uint32_t addr, uint32_t len)
+{
+    uint32_t *paddr;
+    uint32_t i;
+
+    if (len == 0)
+        return;
+
+    paddr = (uint32_t *)addr;
+    mcd_print("mem@0x%08x,0x%08x\n", addr, len);
+
+    for (i = 0; i < len;)
+    {
+        mcd_print("0x%08x", *paddr);
+        paddr++;
+
+        i += 4;
+        if (i % 16 == 0)
+            mcd_print("\n");
+        else
+            mcd_print(" ");
+    }
+
+    mcd_print("\n");
+
+    if (len % 16 != 0)
+        mcd_print("\n");
+}
+
+#pragma section = ".data"
+#pragma section = ".bss"
+// 打印变量用
+void *sg_cd_variable_addr[COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM];
+int sg_cd_variable_sizeof[COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM];
+static const int __coreadump_variable_start[COREADUMP_PRINT_ITEM_SIZE]MCD_SECTION(".coreadump_rang.0") = {0};
+static const int __coreadump_variable_stop[COREADUMP_PRINT_ITEM_SIZE]MCD_SECTION(".coreadump_rang.end") = {0};
+
+void print_variable(void *addr, int size)
+{
+    mcd_print("Data segment:\n");
+    print_mem((uint32_t)addr, size);
+}
+
+int mcd_variable_dump(void)
+{
+    /* 打印变量 */
+    //  print_variable(&dev_property, sizeof(dev_property));
+
+    for (int i = 0; i < COREADUMP_PRINT_RANGE_DYNAMIC_MAX_NUM; i++)
+    {
+        if (sg_cd_variable_addr[i] && sg_cd_variable_sizeof[i])
+            print_variable(sg_cd_variable_addr[i], sg_cd_variable_sizeof[i]);
+    }
+
+    for (uint32_t *p = (uint32_t *)&__coreadump_variable_start + COREADUMP_PRINT_ITEM_SIZE; p < (uint32_t *)&__coreadump_variable_stop; p += COREADUMP_PRINT_ITEM_SIZE)
+        print_variable((void *)(p[0]), p[1]);
+
+    return 0;
+}

Middlewares/MCoreDump/rtthread_port.c

@@ -232,6 +232,7 @@ static int mcd_print_coredump_info_string(struct thread_info_ops *ops)
         }
     }
 
+    mcd_variable_dump();
     return 0;
 }
 #endif

Middlewares/rtthread/board.c

@@ -59,6 +59,9 @@ RT_WEAK void *rt_heap_end_get(void)
 }
 #endif
 
+#include "coredump.h"
+COREADUMP_PRINT_VARIABLE_DEFINE(rt_heap);
+
 /**
  * This function will initial your board.
  */