Merge branch 'bugfix/abort_log_error_v3.0' into 'release/v3.0'

donghengqaz · donghengqaz · commit b1f01f53a6c4 · 2019-11-29T15:29:15.000+08:00
newlib: fix abort function cause critical error (backport v3.0)

See merge request sdk/ESP8266_RTOS_SDK!1203
diff --git a/components/freertos/port/esp8266/include/freertos/portmacro.h b/components/freertos/port/esp8266/include/freertos/portmacro.h
@@ -167,6 +167,8 @@ void PortEnableInt_NoNest( void );
 #define portENTER_CRITICAL()                vPortEnterCritical()
 #define portEXIT_CRITICAL()                 vPortExitCritical()
 
+#define xPortGetCoreID()                    0
+
 // no need to disable/enable lvl1 isr again in ISR
 //#define  portSET_INTERRUPT_MASK_FROM_ISR()		PortDisableInt_NoNest()
 //#define  portCLEAR_INTERRUPT_MASK_FROM_ISR(x)		PortEnableInt_NoNest()
diff --git a/components/newlib/newlib/port/syscall.c b/components/newlib/newlib/port/syscall.c
@@ -135,6 +135,10 @@ void _exit(int status)
 
 void abort(void)
 {
-    ESP_LOGE("ABORT","Error found and abort!");
-    while(1);
+    ets_printf("abort() was called at PC %p on core %d\r\n", __builtin_return_address(0) - 3, xPortGetCoreID());
+
+    /* cause a exception to jump into panic function */
+    while (1) {
+        *((int *)NULL) = 0;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ void _exit(int status)`
`135`	`135`
`136`	`136`	`void abort(void)`
`137`	`137`	`{`
`138`		`- ESP_LOGE("ABORT","Error found and abort!");`
`139`		`- while(1);`
	`138`	`+ ets_printf("abort() was called at PC %p on core %d\r\n", __builtin_return_address(0) - 3, xPortGetCoreID());`
	`139`	`+`
	`140`	`+ /* cause a exception to jump into panic function */`
	`141`	`+ while (1) {`
	`142`	`+ ((int )NULL) = 0;`
	`143`	`+ }`
`140`	`144`	`}`