Commit521ae60

authored

Fix fordangerous relocation: j: cannot encode (esp8266#8925)

Fixes to recent changes to Postmortem to cover large jump offsets, use relaxed jump (J.L) in __wrap_system_restart_local.Also add check that epc1 is a valid code address before reading.

1 parent8b33e2e commit521ae60Copy full SHA for 521ae60

File tree

1 file changed

-2

lines changed

cores/esp8266
- core_esp8266_postmortem.cpp

1 file changed

-2

lines changed

`‎cores/esp8266/core_esp8266_postmortem.cpp‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ static void cut_here() {`
`110`	`110`	`ets_putc('\n');`
`111`	`111`	`}`
`112`	`112`
	`113`	`+staticinlineboolis_pc_valid(uint32_t pc) {`
	`114`	`+return pc >= XCHAL_INSTRAM0_VADDR && pc < (XCHAL_INSTROM0_VADDR + XCHAL_INSTROM0_SIZE);`
	`115`	`+}`
	`116`	`+`
`113`	`117`	`/*`
`114`	`118`	`Add some assembly to grab the stack pointer and pass it as an argument before`
`115`	`119`	`it grows for the target function. Should stabilize the stack offsets, used to`
`@@ -125,7 +129,7 @@ asm(`
`125`	`129`	`"\n"`
`126`	`130`	`"__wrap_system_restart_local:\n\t"`
`127`	`131`	`"mov a2, a1\n\t"`
`128`		`-"jpostmortem_report\n\t"`
	`132`	`+"j.l postmortem_report, a3\n\t"`
`129`	`133`	`".size __wrap_system_restart_local, .-__wrap_system_restart_local\n\t"`
`130`	`134`	`);`
`131`	`135`
`@@ -183,7 +187,7 @@ static void postmortem_report(uint32_t sp_dump) {`
`183`	`187`	`elseif (rst_info.reason == REASON_SOFT_WDT_RST) {`
`184`	`188`	`ets_printf_P(PSTR("\nSoft WDT reset"));`
`185`	`189`	`constchar infinite_loop[] = {0x06,0xff,0xff };// loop: j loop`
`186`		`-if (0 ==memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1,3u)) {`
	`190`	`+if (is_pc_valid(rst_info.epc1) &&0 ==memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1,3u)) {`
`187`	`191`	`// The SDK is riddled with these. They are usually preceded by an ets_printf.`
`188`	`192`	`ets_printf_P(PSTR(" - deliberate infinite loop detected"));`
`189`	`193`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit521ae60

File tree

1 file changed

1 file changed

`‎cores/esp8266/core_esp8266_postmortem.cpp‎`

0 commit comments