You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/09/08 01:15:30 UTC
[incubator-nuttx] branch master updated: telink: add custom setjmp implementation for tlsr82.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang 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 4e1097280a telink: add custom setjmp implementation for tlsr82.
4e1097280a is described below
commit 4e1097280a357599caa4a67a8a8ba8d1b5dc9467
Author: wangbowen6 <wa...@xiaomi.com>
AuthorDate: Mon Sep 5 15:41:44 2022 +0800
telink: add custom setjmp implementation for tlsr82.
Signed-off-by: wangbowen6 <wa...@xiaomi.com>
---
.../tlsr82/tlsr8278adk80d/configs/nsh/defconfig | 2 +
libs/libc/machine/arm/Make.defs | 4 +
libs/libc/machine/arm/gnu/tc32_setjmp.S | 148 +++++++++++++++++++++
3 files changed, 154 insertions(+)
diff --git a/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig b/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig
index d179dcc210..0c536c0595 100644
--- a/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig
+++ b/boards/arm/tlsr82/tlsr8278adk80d/configs/nsh/defconfig
@@ -34,6 +34,7 @@ CONFIG_ARCH_CHIP="tlsr82"
CONFIG_ARCH_CHIP_TLSR8278=y
CONFIG_ARCH_CHIP_TLSR82=y
CONFIG_ARCH_INTERRUPTSTACK=384
+CONFIG_ARCH_SETJMP_H=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARDCTL=y
CONFIG_BOARD_LATE_INITIALIZE=y
@@ -72,6 +73,7 @@ CONFIG_SIG_PREALLOC_IRQ_ACTIONS=8
CONFIG_STACK_COLORATION=y
CONFIG_SYSLOG_TIMESTAMP=y
CONFIG_SYSTEM_NSH=y
+CONFIG_TESTING_OSTEST=y
CONFIG_TIMER=y
CONFIG_TLSR82_FLASH=y
CONFIG_TLSR82_FLASH_FS_OFFSET=0x00000000
diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
index 5663cfc7a5..ca536d7c63 100644
--- a/libs/libc/machine/arm/Make.defs
+++ b/libs/libc/machine/arm/Make.defs
@@ -56,8 +56,12 @@ CSRCS += gnu_unwind_find_exidx.c
endif
ifeq ($(CONFIG_ARCH_SETJMP_H),y)
+ifeq ($(CONFIG_ARCH_CHIP_TLSR82),y)
+ASRCS += tc32_setjmp.S
+else
ASRCS += arch_setjmp.S
endif
+endif
ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
DEPPATH += --dep-path machine/arm/gnu
diff --git a/libs/libc/machine/arm/gnu/tc32_setjmp.S b/libs/libc/machine/arm/gnu/tc32_setjmp.S
new file mode 100644
index 0000000000..e36d5ab3e6
--- /dev/null
+++ b/libs/libc/machine/arm/gnu/tc32_setjmp.S
@@ -0,0 +1,148 @@
+/****************************************************************************
+ * libs/libc/machine/arm/gnu/tc32_setjmp.S
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Symbols
+ ****************************************************************************/
+
+ .globl setjmp
+ .globl longjmp
+
+ .file "tc32_setjmp.S"
+
+/****************************************************************************
+ * Macros
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: setjmp
+ *
+ * Description:
+ * Given the pointer to a register save area (in R0), save the state of the
+ * all callee-saved registers
+ *
+ * C Function Prototype:
+ * int setjmp(jmp_buf env);
+ *
+ * Input Parameters:
+ * env - A pointer to the register save area in which to save the floating point
+ * registers and core registers. Since setjmp() can not be inlined, we
+ * only need to save the ABI-specified callee-saved registers.
+ *
+ * Returned Value:
+ * 0 setjmp called directly
+ * non-0 we justed returned from a longjmp()
+ *
+ ****************************************************************************/
+
+ .type setjmp, function
+setjmp:
+
+ /* Store callee-saved Core registers */
+
+ tstorer r4, [r0, #0] /* Save R4 */
+ tstorer r5, [r0, #4] /* Save R5 */
+ tstorer r6, [r0, #8] /* Save R6 */
+ tstorer r7, [r0, #12] /* Save R7 */
+
+ tmov r2, r8 /* Save R8 */
+ tmov r3, r9 /* Save R9 */
+ tmov r4, r10 /* Save R10 */
+ tmov r5, r11 /* Save R11 */
+ tmov r6, sp /* Save SP/R13 */
+ tmov r7, lr /* Save LR/R14 */
+
+ tstorer r2, [r0, #16] /* Save R8 */
+ tstorer r3, [r0, #20] /* Save R9 */
+ tstorer r4, [r0, #24] /* Save R10 */
+ tstorer r5, [r0, #28] /* Save R11 */
+ tstorer r6, [r0, #32] /* Save SP/R13 */
+ tstorer r7, [r0, #36] /* Save LR/R14 */
+
+ tmovs r0, #0
+ tjex lr
+
+ .size setjmp, .-setjmp
+
+/****************************************************************************
+ * Name: longjmp
+ *
+ * Description:
+ * The longjmp() function used the information saved in env to transfer control
+ * control back to the point where setjmp() was called and to restore ("rewind")
+ * the stack to its state at the time of the setjmp() call. When control is
+ * passed back to where setjmp() had been called, setjmp() will return with
+ * 'val', the second parameter passed to longjmp().
+ *
+ * C Function Prototype:
+ * void longjmp(jmp_buf env, int val);
+ *
+ * Input Parameters:
+ * jmp_buf env
+ * int val
+ *
+ * Returned Value:
+ * This function does not return anything explicitly.
+ *
+ ****************************************************************************/
+
+ .type longjmp, function
+longjmp:
+
+ /* Load callee-saved Core registers */
+
+ tloadr r2, [r0, #16] /* Restore R8 */
+ tloadr r3, [r0, #20] /* Restore R9 */
+ tloadr r4, [r0, #24] /* Restore R10 */
+ tloadr r5, [r0, #28] /* Restore R11 */
+ tloadr r6, [r0, #32] /* Restore SP/R13 */
+ tloadr r7, [r0, #36] /* Restore LR/R14 */
+
+ tmov r8, r2 /* Restore R8 */
+ tmov r9, r3 /* Restore R9 */
+ tmov r10, r4 /* Restore R10 */
+ tmov r11, r5 /* Restore R11 */
+ tmov sp, r6 /* Restore SP/R13 */
+ tmov lr, r7 /* Restore LR/R14 */
+
+ tloadr r4, [r0, #0] /* Restore R4 */
+ tloadr r5, [r0, #4] /* Restore R5 */
+ tloadr r6, [r0, #8] /* Restore R6 */
+ tloadr r7, [r0, #12] /* Restore R7 */
+
+ tmov r0, r1 /* return val */
+ tjex lr
+
+ .size longjmp, .-longjmp
+ .end