Skip to content

Fixes to recent changes to Postmortem. #8925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2023
Merged

Fixes to recent changes to Postmortem. #8925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d330e
Fix for `dangerous relocation: j: cannot encode`
mhightower83 May 10, 2023
1bd56fb
Merge branch 'master' into pr-fix-pc-valid-j-long
mcspr Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cores/esp8266/core_esp8266_postmortem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ static void cut_here() {
ets_putc('\n');
}

static inline bool is_pc_valid(uint32_t pc) {
return pc >= XCHAL_INSTRAM0_VADDR && pc < (XCHAL_INSTROM0_VADDR + XCHAL_INSTROM0_SIZE);
}

/*
Add some assembly to grab the stack pointer and pass it as an argument before
it grows for the target function. Should stabilize the stack offsets, used to
Expand All @@ -125,7 +129,7 @@ asm(
"\n"
"__wrap_system_restart_local:\n\t"
"mov a2, a1\n\t"
"j postmortem_report\n\t"
"j.l postmortem_report, a3\n\t"
".size __wrap_system_restart_local, .-__wrap_system_restart_local\n\t"
);

Expand Down Expand Up @@ -183,7 +187,7 @@ static void postmortem_report(uint32_t sp_dump) {
else if (rst_info.reason == REASON_SOFT_WDT_RST) {
ets_printf_P(PSTR("\nSoft WDT reset"));
const char infinite_loop[] = { 0x06, 0xff, 0xff }; // loop: j loop
if (0 == memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1, 3u)) {
if (is_pc_valid(rst_info.epc1) && 0 == memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1, 3u)) {
// The SDK is riddled with these. They are usually preceded by an ets_printf.
ets_printf_P(PSTR(" - deliberate infinite loop detected"));
}
Expand Down