alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

panic handler: access exception frame members via struct fields

Browse Source
This commit is contained in:
Ivan Grokhotkov 2017-04-12 17:48:14 +08:00
parent aae441951b
commit a8f1918d88
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/esp32/panic.c
View File

@ -167,7 +167,6 @@ static void setFirstBreakpoint(uint32_t pc)
void panicHandler(XtExcFrame *frame) void panicHandler(XtExcFrame *frame)
{ {
int *regs = (int *)frame;
int core_id = xPortGetCoreID(); int core_id = xPortGetCoreID();
//Please keep in sync with PANIC_RSN_* defines //Please keep in sync with PANIC_RSN_* defines
const char *reasons[] = { const char *reasons[] = {
@ -182,8 +181,8 @@ void panicHandler(XtExcFrame *frame)
}; };
const char *reason = reasons[0]; const char *reason = reasons[0];
//The panic reason is stored in the EXCCAUSE register. //The panic reason is stored in the EXCCAUSE register.
if (regs[20] <= PANIC_RSN_MAX) { if (frame->exccause <= PANIC_RSN_MAX) {
reason = reasons[regs[20]]; reason = reasons[frame->exccause];
} }
if (frame->exccause == PANIC_RSN_CACHEERR && esp_cache_err_get_cpuid() != core_id) { if (frame->exccause == PANIC_RSN_CACHEERR && esp_cache_err_get_cpuid() != core_id) {
// Cache error interrupt will be handled by the panic handler // Cache error interrupt will be handled by the panic handler
@ -197,7 +196,7 @@ void panicHandler(XtExcFrame *frame)
if (!abort_called) { if (!abort_called) {
panicPutStr(reason); panicPutStr(reason);
panicPutStr(")\r\n"); panicPutStr(")\r\n");
if (regs[20]==PANIC_RSN_DEBUGEXCEPTION) { if (frame->exccause == PANIC_RSN_DEBUGEXCEPTION) {
int debugRsn; int debugRsn;
asm("rsr.debugcause %0":"=r"(debugRsn)); asm("rsr.debugcause %0":"=r"(debugRsn));
panicPutStr("Debug exception reason: "); panicPutStr("Debug exception reason: ");
@ -227,7 +226,7 @@ void panicHandler(XtExcFrame *frame)
} }
if (esp_cpu_in_ocd_debug_mode()) { if (esp_cpu_in_ocd_debug_mode()) {
setFirstBreakpoint(regs[1]); setFirstBreakpoint(frame->pc);
return; return;
} }
commonErrorHandler(frame); commonErrorHandler(frame);
@ -235,14 +234,11 @@ void panicHandler(XtExcFrame *frame)
void xt_unhandled_exception(XtExcFrame *frame) void xt_unhandled_exception(XtExcFrame *frame)
{ {
int *regs = (int *)frame;
int x;
haltOtherCore(); haltOtherCore();
panicPutStr("Guru Meditation Error of type "); panicPutStr("Guru Meditation Error of type ");
x = regs[20]; int exccause = frame->exccause;
if (x < 40) { if (exccause < 40) {
panicPutStr(edesc[x]); panicPutStr(edesc[exccause]);
} else { } else {
panicPutStr("Unknown"); panicPutStr("Unknown");
} }
@ -250,11 +246,11 @@ void xt_unhandled_exception(XtExcFrame *frame)
panicPutDec(xPortGetCoreID()); panicPutDec(xPortGetCoreID());
if (esp_cpu_in_ocd_debug_mode()) { if (esp_cpu_in_ocd_debug_mode()) {
panicPutStr(" at pc="); panicPutStr(" at pc=");
panicPutHex(regs[1]); panicPutHex(frame->pc);
panicPutStr(". Setting bp and returning..\r\n"); panicPutStr(". Setting bp and returning..\r\n");
//Stick a hardware breakpoint on the address the handler returns to. This way, the OCD debugger //Stick a hardware breakpoint on the address the handler returns to. This way, the OCD debugger
//will kick in exactly at the context the error happened. //will kick in exactly at the context the error happened.
setFirstBreakpoint(regs[1]); setFirstBreakpoint(frame->pc);
return; return;
} }
panicPutStr(". Exception was unhandled.\r\n"); panicPutStr(". Exception was unhandled.\r\n");