[add] PRINT_COREDUMP_ELF 0 // 直接打印elf格式

Middlewares/MCoreDump/coredump.c

@@ -199,6 +199,9 @@ void mcd_init(mcd_writeout_func_t func)
 
 static void fill_one_threads_regset(core_regset_type *core_regset, fp_regset_type *fp_regset)
 {
+    if (NULL == m_ctx.writeout_func)
+        return;
+
     fill_note_prstatus(&m_ctx.tmp.prstatus, core_regset);
     m_ctx.writeout_func((uint8_t *)&m_ctx.tmp.prstatus, sizeof(elf_note_prstatus_t));
 
@@ -218,6 +221,10 @@ static void addr_align(uint32_t *addr, uint32_t *memlen)
 // 生成.elf格式
 void mcd_gen_coredump(struct thread_info_ops *ops)
 {
+    if (NULL == ops || NULL == ops->get_memarea_count || NULL == ops->get_memarea
+        || NULL == ops->get_thread_regset || NULL == m_ctx.writeout_func)
+        return;
+
     int note_size;
     uint32_t addr, memlen;
 
@@ -265,6 +272,9 @@ void mcd_gen_coredump(struct thread_info_ops *ops)
 
 int32_t mcd_corefile_size(struct thread_info_ops *ops)
 {
+    if (NULL == ops || NULL == ops->get_memarea_count || NULL == ops->get_memarea)
+        return 0;
+
     int elf_size = 0;
     int segment_count;
     uint32_t addr, memlen;
@@ -337,6 +347,7 @@ static int32_t minidump_memarea(struct thread_info_ops *ops, int32_t idx,
 
 void mcd_mini_dump_ops(struct thread_info_ops *ops)
 {
+    memset(ops, 0, sizeof(struct thread_info_ops));
     ops->get_threads_count = minidump_thr_cnts;
     ops->get_current_thread_idx = minidump_cur_idx;
     ops->get_thread_regset = minidump_thr_rset;

Middlewares/MCoreDump/rtthread_port.c

@@ -13,10 +13,18 @@
 #include "arch/mcd_arch_interface.h"
 #include "addr2line/addr2line.h"
 
+#define PRINT_COREDUMP_ELF 0 // 直接打印elf格式
 #define PRINT_COREDUMP_INFO_STRING 1 // 打印字符串格式的coredump信息
 #define STACK_CORE_REG_SIZE (17 * 4) // 16个自动+手动压栈寄存器 + exe_return
 #define STACK_FPU_REG_SIZE (17 * 4) // 17个自动压栈的浮点寄存器
 
+static rt_int32_t is_thread_object(rt_thread_t thread)
+{
+    /* Check if the object is a thread (both static and dynamic) */
+    return ((thread->type & ~RT_Object_Class_Static) == RT_Object_Class_Thread);
+}
+
+#if PRINT_COREDUMP_ELF
 /*
  * RT-Thread OS abstraction layer implementation for MCoreDump
  */
@@ -26,12 +34,6 @@ typedef struct
     rt_int32_t cur_idx;
 } rtthread_ti_priv_t;
 
-static rt_int32_t is_thread_object(rt_thread_t thread)
-{
-    /* Check if the object is a thread (both static and dynamic) */
-    return ((thread->type & ~RT_Object_Class_Static) == RT_Object_Class_Thread);
-}
-
 static int32_t rtthread_thread_cnts(struct thread_info_ops *ops)
 {
     rtthread_ti_priv_t *priv = (rtthread_ti_priv_t *)ops->priv;
@@ -196,11 +198,12 @@ static int32_t rtthread_get_memarea(struct thread_info_ops *ops, int32_t idx,
     }
     return 0;
 }
+#endif
 
 #if PRINT_COREDUMP_INFO_STRING
 static int mcd_print_coredump_info_string(struct thread_info_ops *ops)
 {
-    rt_int32_t current_idx = rtthread_cur_index(ops);
+    rt_thread_t current_thread = rt_thread_self();
     rt_int32_t idx_l = 0;
     struct rt_object_information *information;
     struct rt_object *object;
@@ -220,7 +223,7 @@ static int mcd_print_coredump_info_string(struct thread_info_ops *ops)
         if (is_thread_object(thread))
         {
             /* If this is the current thread, use current stack pointer */
-            if (idx_l == current_idx)
+            if (thread == current_thread)
             {
                 uint32_t fpu_flag = 0;
                 addr = (rt_uint32_t)get_cur_core_regset_address()->sp;      // 异常中填充
@@ -273,18 +276,22 @@ static int mcd_print_coredump_info_string(struct thread_info_ops *ops)
 
 void mcd_rtos_thread_ops(struct thread_info_ops *ops)
 {
+    memset(ops, 0, sizeof(struct thread_info_ops));
+#if PRINT_COREDUMP_ELF
     static rtthread_ti_priv_t priv;
     ops->get_threads_count = rtthread_thread_cnts;
     ops->get_current_thread_idx = rtthread_cur_index;
     ops->get_thread_regset = rtthread_thread_register;
     ops->get_memarea_count = rtthread_get_mem_cnts;
     ops->get_memarea = rtthread_get_memarea;
-#if PRINT_COREDUMP_INFO_STRING
-    ops->print_info_string = mcd_print_coredump_info_string;
-#endif
     ops->priv = &priv;
     priv.cur_idx = -1;
     priv.thr_cnts = -1;
+#endif
+#if PRINT_COREDUMP_INFO_STRING
+    ops->print_info_string = mcd_print_coredump_info_string;
+#endif
+
 }
 
 MCD_WEAK rt_err_t rtt_hard_fault_exception_hook(void *context)