From 8d99e73db34fe13afe5c9d80bd18306a480db089 Mon Sep 17 00:00:00 2001 From: Robert Sipka Date: Wed, 19 Apr 2017 00:10:05 +0200 Subject: [PATCH] Add `setjmp` and `longjmp` functions for nuttx-stm32f4 target. (#1743) JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com --- targets/nuttx-stm32f4/Makefile | 2 +- targets/nuttx-stm32f4/jerry_main.c | 25 ------------ targets/nuttx-stm32f4/setjmp.S | 65 ++++++++++++++++++++++++++++++ targets/nuttx-stm32f4/setjmp.h | 25 ++++++++++++ 4 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 targets/nuttx-stm32f4/setjmp.S create mode 100644 targets/nuttx-stm32f4/setjmp.h diff --git a/targets/nuttx-stm32f4/Makefile b/targets/nuttx-stm32f4/Makefile index 55d4a888d..ecc95c547 100644 --- a/targets/nuttx-stm32f4/Makefile +++ b/targets/nuttx-stm32f4/Makefile @@ -48,7 +48,7 @@ jerry_core_allin.c: echo '#include "jerryscript/jerry-libm/nextafter.c"' > jerry_core_allin.c find $(ROOT_DIR)/jerryscript/jerry-core -name "*.c" | sed -r -e 's/(\.\.\/)*(.+)/#include "\2"/g' >> jerry_core_allin.c -ASRCS = +ASRCS = setjmp.S CSRCS = jerry_core_allin.c MAINSRC = jerry_main.c diff --git a/targets/nuttx-stm32f4/jerry_main.c b/targets/nuttx-stm32f4/jerry_main.c index fd8b15ba9..660afa7c4 100644 --- a/targets/nuttx-stm32f4/jerry_main.c +++ b/targets/nuttx-stm32f4/jerry_main.c @@ -376,28 +376,3 @@ jerry_port_get_current_time (void) { return 0; } /* jerry_port_get_current_time */ - -/** - * Compiler built-in setjmp function. - * - * @return 0 when called the first time - * 1 when returns from a longjmp call - */ -int -setjmp (jmp_buf buf) -{ - return __builtin_setjmp (buf); -} /* setjmp */ - -/** - * Compiler built-in longjmp function. - * - * Note: - * ignores value argument - */ -void -longjmp (jmp_buf buf, int value) -{ - /* Must be called with 1. */ - __builtin_longjmp (buf, 1); -} /* longjmp */ diff --git a/targets/nuttx-stm32f4/setjmp.S b/targets/nuttx-stm32f4/setjmp.S new file mode 100644 index 000000000..783d87c9f --- /dev/null +++ b/targets/nuttx-stm32f4/setjmp.S @@ -0,0 +1,65 @@ +/* Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed 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. + */ + +.syntax unified + +.macro func _name +.global \_name +.type \_name, %function +\_name: +.endm +.macro endfunc _name +.size \_name, .-\_name +.endm + +/** + * setjmp (jmp_buf env) + * + * See also: + * longjmp + * + * @return 0 - if returns from direct call, + * nonzero - if returns after longjmp. + */ +func setjmp + stmia r0!, {r4 - r11, lr} + str sp, [r0], #4 + vstm r0, {s16 - s31} + mov r0, #0 + bx lr +endfunc setjmp + +/** + * longjmp (jmp_buf env, int val) + * + * Note: + * if val is not 0, then it would be returned from setjmp, + * otherwise - 0 would be returned. + * + * See also: + * setjmp + */ +func longjmp + ldmia r0!, {r4 - r11, lr} + ldr sp, [r0] + add r0, r0, #4 + vldm r0, {s16 - s31} + mov r0, r1 + cmp r0, #0 + bne 1f + mov r0, #1 + 1: + bx lr +endfunc longjmp diff --git a/targets/nuttx-stm32f4/setjmp.h b/targets/nuttx-stm32f4/setjmp.h new file mode 100644 index 000000000..aad7f934a --- /dev/null +++ b/targets/nuttx-stm32f4/setjmp.h @@ -0,0 +1,25 @@ +/* Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed 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. + */ +#ifndef SETJMP_H +#define SETJMP_H + +#include + +typedef uint64_t jmp_buf[14]; + +int setjmp (jmp_buf env); +void longjmp (jmp_buf env, int val); + +#endif /* !SETJMP_H */