Index: head/lib/libc/riscv/gen/_setjmp.S =================================================================== --- head/lib/libc/riscv/gen/_setjmp.S (revision 336632) +++ head/lib/libc/riscv/gen/_setjmp.S (revision 336633) @@ -1,145 +1,145 @@ /*- * Copyright (c) 2015-2016 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the * University of Cambridge Computer Laboratory under DARPA/AFRL contract * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. * * Portions of this software were developed by the University of Cambridge * Computer Laboratory as part of the CTSRD Project, with support from the * UK Higher Education Innovation Fund (HEIF). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include ENTRY(_setjmp) /* Store the magic value and stack pointer */ la t0, .Lmagic ld t0, 0(t0) sd t0, (0 * 8)(a0) sd sp, (1 * 8)(a0) addi a0, a0, (2 * 8) /* Store the general purpose registers and ra */ sd s0, (0 * 8)(a0) sd s1, (1 * 8)(a0) sd s2, (2 * 8)(a0) sd s3, (3 * 8)(a0) sd s4, (4 * 8)(a0) sd s5, (5 * 8)(a0) sd s6, (6 * 8)(a0) sd s7, (7 * 8)(a0) sd s8, (8 * 8)(a0) sd s9, (9 * 8)(a0) sd s10, (10 * 8)(a0) sd s11, (11 * 8)(a0) sd ra, (12 * 8)(a0) addi a0, a0, (13 * 8) #if !defined(_STANDALONE) && defined(__riscv_float_abi_double) /* Store the fpe registers */ - fsd fs0, (0 * 16)(a0) - fsd fs1, (1 * 16)(a0) - fsd fs2, (2 * 16)(a0) - fsd fs3, (3 * 16)(a0) - fsd fs4, (4 * 16)(a0) - fsd fs5, (5 * 16)(a0) - fsd fs6, (6 * 16)(a0) - fsd fs7, (7 * 16)(a0) - fsd fs8, (8 * 16)(a0) - fsd fs9, (9 * 16)(a0) - fsd fs10, (10 * 16)(a0) - fsd fs11, (11 * 16)(a0) - addi a0, a0, (12 * 16) + fsd fs0, (0 * 8)(a0) + fsd fs1, (1 * 8)(a0) + fsd fs2, (2 * 8)(a0) + fsd fs3, (3 * 8)(a0) + fsd fs4, (4 * 8)(a0) + fsd fs5, (5 * 8)(a0) + fsd fs6, (6 * 8)(a0) + fsd fs7, (7 * 8)(a0) + fsd fs8, (8 * 8)(a0) + fsd fs9, (9 * 8)(a0) + fsd fs10, (10 * 8)(a0) + fsd fs11, (11 * 8)(a0) + addi a0, a0, (12 * 8) #endif /* Return value */ li a0, 0 ret .align 3 .Lmagic: .quad _JB_MAGIC__SETJMP END(_setjmp) ENTRY(_longjmp) /* Check the magic value */ ld t0, 0(a0) la t1, .Lmagic ld t1, 0(t1) bne t0, t1, botch /* Restore the stack pointer */ ld t0, 8(a0) mv sp, t0 addi a0, a0, (2 * 8) /* Restore the general purpose registers and ra */ ld s0, (0 * 8)(a0) ld s1, (1 * 8)(a0) ld s2, (2 * 8)(a0) ld s3, (3 * 8)(a0) ld s4, (4 * 8)(a0) ld s5, (5 * 8)(a0) ld s6, (6 * 8)(a0) ld s7, (7 * 8)(a0) ld s8, (8 * 8)(a0) ld s9, (9 * 8)(a0) ld s10, (10 * 8)(a0) ld s11, (11 * 8)(a0) ld ra, (12 * 8)(a0) addi a0, a0, (13 * 8) #if !defined(_STANDALONE) && defined(__riscv_float_abi_double) /* Restore the fpe registers */ - fld fs0, (0 * 16)(a0) - fld fs1, (1 * 16)(a0) - fld fs2, (2 * 16)(a0) - fld fs3, (3 * 16)(a0) - fld fs4, (4 * 16)(a0) - fld fs5, (5 * 16)(a0) - fld fs6, (6 * 16)(a0) - fld fs7, (7 * 16)(a0) - fld fs8, (8 * 16)(a0) - fld fs9, (9 * 16)(a0) - fld fs10, (10 * 16)(a0) - fld fs11, (11 * 16)(a0) - addi a0, a0, (12 * 16) + fld fs0, (0 * 8)(a0) + fld fs1, (1 * 8)(a0) + fld fs2, (2 * 8)(a0) + fld fs3, (3 * 8)(a0) + fld fs4, (4 * 8)(a0) + fld fs5, (5 * 8)(a0) + fld fs6, (6 * 8)(a0) + fld fs7, (7 * 8)(a0) + fld fs8, (8 * 8)(a0) + fld fs9, (9 * 8)(a0) + fld fs10, (10 * 8)(a0) + fld fs11, (11 * 8)(a0) + addi a0, a0, (12 * 8) #endif /* Load the return value */ mv a0, a1 ret botch: #ifdef _STANDALONE j botch #else call _C_LABEL(longjmperror) call _C_LABEL(abort) #endif END(_longjmp) Index: head/lib/libc/riscv/gen/setjmp.S =================================================================== --- head/lib/libc/riscv/gen/setjmp.S (revision 336632) +++ head/lib/libc/riscv/gen/setjmp.S (revision 336633) @@ -1,171 +1,171 @@ /*- * Copyright (c) 2015-2016 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the * University of Cambridge Computer Laboratory under DARPA/AFRL contract * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. * * Portions of this software were developed by the University of Cambridge * Computer Laboratory as part of the CTSRD Project, with support from the * UK Higher Education Innovation Fund (HEIF). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include ENTRY(setjmp) addi sp, sp, -(2 * 8) sd a0, 0(sp) sd ra, 8(sp) /* Store the signal mask */ addi a2, a0, (_JB_SIGMASK * 8) /* oset */ li a1, 0 /* set */ li a0, 1 /* SIG_BLOCK */ jal sigprocmask ld a0, 0(sp) ld ra, 8(sp) addi sp, sp, (2 * 8) /* Store the magic value and stack pointer */ la t0, .Lmagic ld t0, 0(t0) sd t0, (0 * 8)(a0) sd sp, (1 * 8)(a0) addi a0, a0, (2 * 8) /* Store the general purpose registers and ra */ sd s0, (0 * 8)(a0) sd s1, (1 * 8)(a0) sd s2, (2 * 8)(a0) sd s3, (3 * 8)(a0) sd s4, (4 * 8)(a0) sd s5, (5 * 8)(a0) sd s6, (6 * 8)(a0) sd s7, (7 * 8)(a0) sd s8, (8 * 8)(a0) sd s9, (9 * 8)(a0) sd s10, (10 * 8)(a0) sd s11, (11 * 8)(a0) sd ra, (12 * 8)(a0) addi a0, a0, (13 * 8) #ifdef __riscv_float_abi_double /* Store the fpe registers */ - fsd fs0, (0 * 16)(a0) - fsd fs1, (1 * 16)(a0) - fsd fs2, (2 * 16)(a0) - fsd fs3, (3 * 16)(a0) - fsd fs4, (4 * 16)(a0) - fsd fs5, (5 * 16)(a0) - fsd fs6, (6 * 16)(a0) - fsd fs7, (7 * 16)(a0) - fsd fs8, (8 * 16)(a0) - fsd fs9, (9 * 16)(a0) - fsd fs10, (10 * 16)(a0) - fsd fs11, (11 * 16)(a0) - addi a0, a0, (12 * 16) + fsd fs0, (0 * 8)(a0) + fsd fs1, (1 * 8)(a0) + fsd fs2, (2 * 8)(a0) + fsd fs3, (3 * 8)(a0) + fsd fs4, (4 * 8)(a0) + fsd fs5, (5 * 8)(a0) + fsd fs6, (6 * 8)(a0) + fsd fs7, (7 * 8)(a0) + fsd fs8, (8 * 8)(a0) + fsd fs9, (9 * 8)(a0) + fsd fs10, (10 * 8)(a0) + fsd fs11, (11 * 8)(a0) + addi a0, a0, (12 * 8) #endif /* Return value */ li a0, 0 ret .align 3 .Lmagic: .quad _JB_MAGIC_SETJMP END(setjmp) ENTRY(longjmp) addi sp, sp, -(4 * 8) sd a0, (0 * 8)(sp) sd ra, (1 * 8)(sp) sd a1, (2 * 8)(sp) /* Restore the signal mask */ li a2, 0 /* oset */ addi a1, a0, (_JB_SIGMASK * 8) /* set */ li a0, 3 /* SIG_BLOCK */ jal sigprocmask ld a1, (2 * 8)(sp) ld ra, (1 * 8)(sp) ld a0, (0 * 8)(sp) addi sp, sp, (4 * 8) /* Check the magic value */ ld t0, 0(a0) la t1, .Lmagic ld t1, 0(t1) bne t0, t1, botch /* Restore the stack pointer */ ld t0, 8(a0) mv sp, t0 addi a0, a0, (2 * 8) /* Restore the general purpose registers and ra */ ld s0, (0 * 8)(a0) ld s1, (1 * 8)(a0) ld s2, (2 * 8)(a0) ld s3, (3 * 8)(a0) ld s4, (4 * 8)(a0) ld s5, (5 * 8)(a0) ld s6, (6 * 8)(a0) ld s7, (7 * 8)(a0) ld s8, (8 * 8)(a0) ld s9, (9 * 8)(a0) ld s10, (10 * 8)(a0) ld s11, (11 * 8)(a0) ld ra, (12 * 8)(a0) addi a0, a0, (13 * 8) #ifdef __riscv_float_abi_double /* Restore the fpe registers */ - fld fs0, (0 * 16)(a0) - fld fs1, (1 * 16)(a0) - fld fs2, (2 * 16)(a0) - fld fs3, (3 * 16)(a0) - fld fs4, (4 * 16)(a0) - fld fs5, (5 * 16)(a0) - fld fs6, (6 * 16)(a0) - fld fs7, (7 * 16)(a0) - fld fs8, (8 * 16)(a0) - fld fs9, (9 * 16)(a0) - fld fs10, (10 * 16)(a0) - fld fs11, (11 * 16)(a0) - addi a0, a0, (12 * 16) + fld fs0, (0 * 8)(a0) + fld fs1, (1 * 8)(a0) + fld fs2, (2 * 8)(a0) + fld fs3, (3 * 8)(a0) + fld fs4, (4 * 8)(a0) + fld fs5, (5 * 8)(a0) + fld fs6, (6 * 8)(a0) + fld fs7, (7 * 8)(a0) + fld fs8, (8 * 8)(a0) + fld fs9, (9 * 8)(a0) + fld fs10, (10 * 8)(a0) + fld fs11, (11 * 8)(a0) + addi a0, a0, (12 * 8) #endif /* Load the return value */ mv a0, a1 ret botch: call _C_LABEL(longjmperror) call _C_LABEL(abort) END(longjmp) Index: head/sys/riscv/include/setjmp.h =================================================================== --- head/sys/riscv/include/setjmp.h (revision 336632) +++ head/sys/riscv/include/setjmp.h (revision 336633) @@ -1,63 +1,63 @@ /*- * Copyright (c) 2015 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the * University of Cambridge Computer Laboratory under DARPA/AFRL contract * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. * * Portions of this software were developed by the University of Cambridge * Computer Laboratory as part of the CTSRD Project, with support from the * UK Higher Education Innovation Fund (HEIF). * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _MACHINE_SETJMP_H_ #define _MACHINE_SETJMP_H_ #include #define _JBLEN 63 /* sp, ra, [f]s0-11, magic val, sigmask */ -#define _JB_SIGMASK 21 +#define _JB_SIGMASK 27 #ifdef __ASSEMBLER__ #define _JB_MAGIC__SETJMP 0xbe87fd8a2910af00 #define _JB_MAGIC_SETJMP 0xbe87fd8a2910af01 #endif /* !__ASSEMBLER__ */ #ifndef __ASSEMBLER__ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force * compile-time diagnostics for mismatches. The structs are the same * internally to avoid some run-time errors for mismatches. */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1] __aligned(16); } sigjmp_buf[1]; #endif typedef struct _jmp_buf { long _jb[_JBLEN + 1] __aligned(16); } jmp_buf[1]; #endif /* __ASSEMBLER__ */ #endif /* !_MACHINE_SETJMP_H_ */