blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'save_isr_ctx_to_coredump' into 'master'

Browse Source 
feat(coredump): save isr context to coredump elf file

Closes IDF-7790

See merge request espressif/esp-idf!27182
This commit is contained in:
Erhan Kurubas 2023-11-28 23:40:11 +08:00
commit 4b0da52aa8
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/espcoredump/include_core_dump/esp_core_dump_port.h
View File

@ -40,8 +40,10 @@ uint16_t esp_core_dump_get_arch_id(void);
* *
* @param info Pointer to the panic information. It contains the execution * @param info Pointer to the panic information. It contains the execution
* frame. * frame.
* @param isr_context A flag indicating whether the crash happened within an ISR context.
* Set to 1 if the crash occurred in an ISR, and 0 otherwise.
*/ */
void esp_core_dump_port_init(panic_info_t *info); void esp_core_dump_port_init(panic_info_t *info, bool isr_context);
/** /**
* @brief Reset fake stacks allocator, if any. * @brief Reset fake stacks allocator, if any.

4
components/espcoredump/src/core_dump_common.c
View File

@ -151,8 +151,10 @@ inline void esp_core_dump_write(panic_info_t *info, core_dump_write_config_t *wr
esp_err_t err = ESP_ERR_NOT_SUPPORTED; esp_err_t err = ESP_ERR_NOT_SUPPORTED;
s_exc_frame = (void*) info->frame; s_exc_frame = (void*) info->frame;
bool isr_context = esp_core_dump_in_isr_context();
esp_core_dump_setup_stack(); esp_core_dump_setup_stack();
esp_core_dump_port_init(info); esp_core_dump_port_init(info, isr_context);
#if CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN #if CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN
err = esp_core_dump_write_binary(write_cfg); err = esp_core_dump_write_binary(write_cfg);
#elif CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF #elif CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF

4
components/espcoredump/src/port/riscv/core_dump_port.c
View File

@ -141,6 +141,7 @@ _Static_assert(sizeof(riscv_prstatus) == PRSTATUS_SIZE,
*/ */
typedef struct { typedef struct {
uint32_t crashed_task_tcb; uint32_t crashed_task_tcb;
uint32_t isr_context;
} riscv_extra_info_t; } riscv_extra_info_t;
@ -157,9 +158,10 @@ static uint32_t s_fake_stacks_num = 0;
/* Statically initialize the extra information structure. */ /* Statically initialize the extra information structure. */
static riscv_extra_info_t s_extra_info = { 0 }; static riscv_extra_info_t s_extra_info = { 0 };
inline void esp_core_dump_port_init(panic_info_t *info) inline void esp_core_dump_port_init(panic_info_t *info, bool isr_context)
{ {
s_extra_info.crashed_task_tcb = COREDUMP_CURR_TASK_MARKER; s_extra_info.crashed_task_tcb = COREDUMP_CURR_TASK_MARKER;
s_extra_info.isr_context = isr_context;
} }
/** /**

4
components/espcoredump/src/port/xtensa/core_dump_port.c
View File

@ -95,6 +95,7 @@ typedef struct
core_dump_reg_pair_t exccause; core_dump_reg_pair_t exccause;
core_dump_reg_pair_t excvaddr; core_dump_reg_pair_t excvaddr;
core_dump_reg_pair_t extra_regs[COREDUMP_EXTRA_REG_NUM]; core_dump_reg_pair_t extra_regs[COREDUMP_EXTRA_REG_NUM];
uint32_t isr_context;
} __attribute__((packed)) xtensa_extra_info_t; } __attribute__((packed)) xtensa_extra_info_t;
// Xtensa Program Status for GDB // Xtensa Program Status for GDB
@ -259,7 +260,7 @@ static esp_err_t esp_core_dump_get_regs_from_stack(void* stack_addr,
return ESP_OK; return ESP_OK;
} }
inline void esp_core_dump_port_init(panic_info_t *info) inline void esp_core_dump_port_init(panic_info_t *info, bool isr_context)
{ {
s_extra_info.crashed_task_tcb = COREDUMP_CURR_TASK_MARKER; s_extra_info.crashed_task_tcb = COREDUMP_CURR_TASK_MARKER;
// Initialize exccause register to default value (required if current task corrupted) // Initialize exccause register to default value (required if current task corrupted)
@ -271,6 +272,7 @@ inline void esp_core_dump_port_init(panic_info_t *info)
if (info->pseudo_excause) { if (info->pseudo_excause) {
s_exc_frame->exccause += XCHAL_EXCCAUSE_NUM; s_exc_frame->exccause += XCHAL_EXCCAUSE_NUM;
} }
s_extra_info.isr_context = isr_context;
} }
/** /**