Fixed bug #1251.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16122 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

os/common/ports/ARMv6-M-RP2/chcore.c

@@ -53,6 +53,7 @@
  *          does not call the port hook again.
  */
 void port_local_halt(void) {
+  const char *reason = "remote panic";
 
   port_disable();
 
@@ -60,7 +61,7 @@ void port_local_halt(void) {
   __trace_halt("remote panic");
 
   /* Pointing to the passed message.*/
-  currcore->dbg.panic_msg = "remote panic";
+  currcore->dbg.panic_msg = reason;
 
   /* Halt hook code, usually empty.*/
   CH_CFG_SYSTEM_HALT_HOOK(reason);

os/nil/src/ch.c

@@ -837,7 +837,7 @@ void chThdExit(msg_t msg) {
   chSysLock();
 
   /* Exit handler hook.*/
-  CH_CFG_THREAD_EXIT_HOOK(tp);
+  CH_CFG_THREAD_EXIT_HOOK(nil.current);
 
 #if CH_CFG_USE_WAITEXIT == TRUE
   {

os/rt/src/chthreads.c

@@ -513,7 +513,7 @@ void chThdExitS(msg_t msg) {
   currtp->u.exitcode = msg;
 
   /* Exit handler hook.*/
-  CH_CFG_THREAD_EXIT_HOOK(tp);
+  CH_CFG_THREAD_EXIT_HOOK(currtp);
 
 #if CH_CFG_USE_WAITEXIT == TRUE
   /* Waking up any waiting thread.*/

readme.txt

@@ -107,6 +107,8 @@
        instead of a simple size.
 - NEW: RT and NIL upgraded to support the enhanced OSLIB.
 - NEW: Memory areas/pointers checker functions added to OSLIB.
+- FIX: Fixed wrong use of hooks in RT/NIL (bug #1251)
+       (backported to 20.3.5)(backported to 21.11.4).
 - FIX: Fixed SPI_MMC driver broken in 21.11.3 (bug #1249)
        (backported to 21.11.3).
 - FIX: Fixed broken support for STM32 UART9 and USART10 (bug #1248)