[incubator-nuttx] branch master updated: arch/arm/src/common/up_exit.c: _exit should call arm_fullcontextrestore for armv8-m

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 55ff12a  arch/arm/src/common/up_exit.c: _exit should call arm_fullcontextrestore for armv8-m
55ff12a is described below

commit 55ff12ad663fe4fa752b5f7d24354075c22ea9ea
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Apr 30 12:17:44 2020 +0800

    arch/arm/src/common/up_exit.c: _exit should call arm_fullcontextrestore for armv8-m
    
    Since armv8-m now uses arm_fullcontextrestore instead of up_fullcontextrestore, _exit
    should call arm_fullcontextrestore for armv8-m accordingly.
    
    Signed-off-by: liuhaitao <li...@xiaomi.com>
---
 arch/arm/src/common/up_exit.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 0e7be57..9fe3fda 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -187,5 +187,9 @@ void _exit(int status)
 
   /* Then switch contexts */
 
+#ifdef CONFIG_ARCH_ARMV8M
+  arm_fullcontextrestore(tcb->xcp.regs);
+#else
   up_fullcontextrestore(tcb->xcp.regs);
+#endif
 }