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

Merge branch 'bugfix/ocd_stop_on_unhandled_exception' into 'master'

Browse Source 
Fix: Return after setting breakpoint when ocd is detected instead of continuing …

…into the panic routine

Made a small thinko when refactoring the panic handler code. This fixes it.

See merge request !36
This commit is contained in:
Jeroen Domburg 2016-08-31 12:15:04 +08:00
commit 0f42f017e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/panic.c
View File

@ -150,7 +150,6 @@ static void setFirstBreakpoint(uint32_t pc) {
"or a4, a4, a3\n" \
"wsr.ibreakenable a4\n" \
::"r"(pc):"a3","a4");
return;
}
void xt_unhandled_exception(XtExcFrame *frame) {
@ -170,6 +169,7 @@ void xt_unhandled_exception(XtExcFrame *frame) {
//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.
setFirstBreakpoint(regs[1]);
return;
}
panicPutStr(". Exception was unhandled.\r\n");
commonErrorHandler(frame);