From 5728fe325ea17c14c2c749d1cf08a4a40b5741f1 Mon Sep 17 00:00:00 2001 From: Mitch Bradley Date: Fri, 10 Jun 2022 18:33:46 -1000 Subject: [PATCH] Reverts Backtrace: format to what it used to be Was: Backtrace: N:M N:M N:M ... Now: Backtrace:N:MN:M N:M ... The problem with the new format is that it is hard to parse and breaks the parser that is used by PlatformIO. The old format is much more reasonable. I do not see how the pattern in IDFDUT.py can work with the new format, due to the missing space after the : --- components/esp_system/port/arch/xtensa/debug_helpers.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/esp_system/port/arch/xtensa/debug_helpers.c b/components/esp_system/port/arch/xtensa/debug_helpers.c index 0a819d5d73..68f0665a13 100644 --- a/components/esp_system/port/arch/xtensa/debug_helpers.c +++ b/components/esp_system/port/arch/xtensa/debug_helpers.c @@ -44,12 +44,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) { if (panic) { - panic_print_str("0x"); + panic_print_str(" 0x"); panic_print_hex(pc); panic_print_str(":0x"); panic_print_hex(sp); } else { - esp_rom_printf("0x%08X:0x%08X", pc, sp); + esp_rom_printf(" 0x%08X:0x%08X", pc, sp); } } @@ -88,7 +88,6 @@ esp_err_t IRAM_ATTR esp_backtrace_print_from_frame(int depth, const esp_backtrac corrupted = true; } print_entry(esp_cpu_process_stack_pc(stk_frame.pc), stk_frame.sp, panic); - print_str(" ", panic); } //Print backtrace termination marker