|
|
@@ -29,7 +29,7 @@ static inline uint32_t esp_core_dump_get_tcb_len(void)
|
|
|
return COREDUMP_TCB_SIZE;
|
|
|
}
|
|
|
|
|
|
-static inline uint32_t esp_core_dump_get_stack_len(uint32_t stack_start, uint32_t stack_end)
|
|
|
+static inline uint32_t esp_core_dump_get_memory_len(uint32_t stack_start, uint32_t stack_end)
|
|
|
{
|
|
|
uint32_t len = stack_end - stack_start;
|
|
|
// Take stack padding into account
|
|
|
@@ -43,7 +43,7 @@ static esp_err_t esp_core_dump_save_task(core_dump_write_config_t *write_cfg,
|
|
|
uint32_t stk_vaddr, stk_len;
|
|
|
uint32_t stk_paddr = esp_core_dump_get_stack(task, &stk_vaddr, &stk_len);
|
|
|
|
|
|
- stk_len = esp_core_dump_get_stack_len(stk_vaddr, stk_vaddr+stk_len);
|
|
|
+ stk_len = esp_core_dump_get_memory_len(stk_vaddr, stk_vaddr+stk_len);
|
|
|
|
|
|
// Save TCB address, stack base and stack top addr
|
|
|
err = write_cfg->write(write_cfg->priv, (void*)task, sizeof(core_dump_task_header_t));
|
|
|
@@ -114,6 +114,7 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
ESP_COREDUMP_LOGI("Found tasks: %d!", task_num);
|
|
|
|
|
|
// Verifies all tasks in the snapshot
|
|
|
+
|
|
|
for (task_id = 0; task_id < task_num; task_id++) {
|
|
|
bool is_current_task = false, stack_is_valid = false;
|
|
|
bool tcb_is_valid = esp_core_dump_check_task(frame, tasks[task_id], &is_current_task, &stack_is_valid);
|
|
|
@@ -131,21 +132,21 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
// Increase core dump size by task stack size
|
|
|
uint32_t stk_vaddr, stk_len;
|
|
|
esp_core_dump_get_stack(tasks[task_id], &stk_vaddr, &stk_len);
|
|
|
- data_len += esp_core_dump_get_stack_len(stk_vaddr, stk_vaddr+stk_len);
|
|
|
+ data_len += esp_core_dump_get_memory_len(stk_vaddr, stk_vaddr+stk_len);
|
|
|
// Add tcb size
|
|
|
data_len += (tcb_sz + sizeof(core_dump_task_header_t));
|
|
|
}
|
|
|
|
|
|
if (esp_core_dump_in_isr_context()) {
|
|
|
interrupted_task_stack.start = tasks[curr_task_index]->stack_start;
|
|
|
- interrupted_task_stack.size = esp_core_dump_get_stack_len(tasks[curr_task_index]->stack_start, tasks[curr_task_index]->stack_end);
|
|
|
+ interrupted_task_stack.size = esp_core_dump_get_memory_len(tasks[curr_task_index]->stack_start, tasks[curr_task_index]->stack_end);
|
|
|
// size of the task's stack has been already taken into account, also addresses have also been checked
|
|
|
data_len += sizeof(core_dump_mem_seg_header_t);
|
|
|
tasks[curr_task_index]->stack_start = (uint32_t)frame;
|
|
|
tasks[curr_task_index]->stack_end = esp_core_dump_get_isr_stack_end();
|
|
|
ESP_COREDUMP_LOG_PROCESS("Add ISR stack %lu to %lu", tasks[curr_task_index]->stack_end - tasks[curr_task_index]->stack_start, data_len);
|
|
|
// take into account size of the ISR stack
|
|
|
- data_len += esp_core_dump_get_stack_len(tasks[curr_task_index]->stack_start, tasks[curr_task_index]->stack_end);
|
|
|
+ data_len += esp_core_dump_get_memory_len(tasks[curr_task_index]->stack_start, tasks[curr_task_index]->stack_end);
|
|
|
}
|
|
|
|
|
|
// Check if current task TCB is broken
|
|
|
@@ -154,6 +155,22 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
curr_task_index = 0;
|
|
|
}
|
|
|
|
|
|
+ // Add user memory region header size
|
|
|
+ data_len += esp_core_dump_get_user_ram_segments() * sizeof(core_dump_mem_seg_header_t);
|
|
|
+ for (coredump_region_t i = COREDUMP_MEMORY_START; i < COREDUMP_MEMORY_MAX; i++) {
|
|
|
+ uint32_t start = 0;
|
|
|
+ int data_sz = esp_core_dump_get_user_ram_info(i, &start);
|
|
|
+
|
|
|
+ if (data_sz < 0) {
|
|
|
+ ESP_COREDUMP_LOGE("Invalid memory segment size");
|
|
|
+ return ESP_FAIL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (data_sz > 0) {
|
|
|
+ data_len += esp_core_dump_get_memory_len(start, start + data_sz);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// Add core dump header size
|
|
|
data_len += sizeof(core_dump_header_t);
|
|
|
|
|
|
@@ -185,6 +202,7 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
if (xPortInterruptedFromISRContext()) {
|
|
|
hdr.mem_segs_num++; // stack of interrupted task
|
|
|
}
|
|
|
+ hdr.mem_segs_num += esp_core_dump_get_user_ram_segments(); // stack of user mapped memory
|
|
|
hdr.tcb_sz = tcb_sz;
|
|
|
err = write_cfg->write(write_cfg->priv, &hdr, sizeof(core_dump_header_t));
|
|
|
if (err != ESP_OK) {
|
|
|
@@ -221,6 +239,30 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // save user memory regions
|
|
|
+ if (esp_core_dump_get_user_ram_segments() > 0) {
|
|
|
+ core_dump_mem_seg_header_t user_ram_stack_size;
|
|
|
+ for (coredump_region_t i = COREDUMP_MEMORY_START; i < COREDUMP_MEMORY_MAX; i++) {
|
|
|
+ uint32_t start = 0;
|
|
|
+ int data_sz = esp_core_dump_get_user_ram_info(i, &start);
|
|
|
+
|
|
|
+ if (data_sz < 0) {
|
|
|
+ ESP_COREDUMP_LOGE("Invalid memory segment size");
|
|
|
+ return ESP_FAIL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (data_sz > 0) {
|
|
|
+ user_ram_stack_size.start = start;
|
|
|
+ user_ram_stack_size.size = esp_core_dump_get_memory_len(start, start + data_sz);;
|
|
|
+ err = esp_core_dump_save_mem_segment(write_cfg, &user_ram_stack_size);
|
|
|
+ if (err != ESP_OK) {
|
|
|
+ ESP_COREDUMP_LOGE("Failed to save user memory data, error=%d!", err);
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// Write end
|
|
|
if (write_cfg->end) {
|
|
|
err = write_cfg->end(write_cfg->priv);
|
|
|
@@ -234,6 +276,7 @@ static esp_err_t esp_core_dump_write_binary(void *frame, core_dump_write_config_
|
|
|
}
|
|
|
return err;
|
|
|
}
|
|
|
+
|
|
|
#endif
|
|
|
|
|
|
inline void esp_core_dump_write(void *frame, core_dump_write_config_t *write_cfg)
|