Merge branch 'bugfix/backtrace_formatting_add_missing_space' into 'master'

Reverts Backtrace: format to what it used to be

Closes IDFGH-7580

See merge request espressif/esp-idf!18783
This commit is contained in:
Guillaume Souchere
2022-07-07 16:51:47 +08:00

View File

@@ -36,12 +36,12 @@ bool IRAM_ATTR esp_backtrace_get_next_frame(esp_backtrace_frame_t *frame)
static void IRAM_ATTR print_entry(uint32_t pc, uint32_t sp, bool panic) static void IRAM_ATTR print_entry(uint32_t pc, uint32_t sp, bool panic)
{ {
if (panic) { if (panic) {
panic_print_str("0x"); panic_print_str(" 0x");
panic_print_hex(pc); panic_print_hex(pc);
panic_print_str(":0x"); panic_print_str(":0x");
panic_print_hex(sp); panic_print_hex(sp);
} else { } else {
esp_rom_printf("0x%08X:0x%08X", pc, sp); esp_rom_printf(" 0x%08X:0x%08X", pc, sp);
} }
} }
@@ -80,7 +80,6 @@ esp_err_t IRAM_ATTR esp_backtrace_print_from_frame(int depth, const esp_backtrac
corrupted = true; corrupted = true;
} }
print_entry(esp_cpu_process_stack_pc(stk_frame.pc), stk_frame.sp, panic); print_entry(esp_cpu_process_stack_pc(stk_frame.pc), stk_frame.sp, panic);
print_str(" ", panic);
} }
//Print backtrace termination marker //Print backtrace termination marker