diff --git a/lib/libc/aarch64/gen/makecontext.c b/lib/libc/aarch64/gen/makecontext.c index ae23ad87d3a2..d4dcffa6cd6f 100644 --- a/lib/libc/aarch64/gen/makecontext.c +++ b/lib/libc/aarch64/gen/makecontext.c @@ -1,83 +1,83 @@ /*- * Copyright (c) 2015 The FreeBSD Foundation * * This software was developed by Andrew Turner under * sponsorship from the FreeBSD Foundation. * * 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 #include #include #include #include #include #include void _ctx_start(void); void ctx_done(ucontext_t *ucp) -{ - +{ + if (ucp->uc_link == NULL) { exit(0); - } else { + } else { setcontext((const ucontext_t *)ucp->uc_link); abort(); - } + } } - + __weak_reference(__makecontext, makecontext); void __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) { struct gpregs *gp; va_list ap; int i; /* A valid context is required. */ if (ucp == NULL) return; if ((argc < 0) || (argc > 8)) return; gp = &ucp->uc_mcontext.mc_gpregs; va_start(ap, argc); /* Pass up to eight arguments in x0-7. */ for (i = 0; i < argc && i < 8; i++) gp->gp_x[i] = va_arg(ap, uint64_t); va_end(ap); /* Set the stack */ gp->gp_sp = STACKALIGN(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size); /* Arrange for return via the trampoline code. */ gp->gp_elr = (__register_t)_ctx_start; gp->gp_x[19] = (__register_t)func; gp->gp_x[20] = (__register_t)ucp; } diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c index bf24e1f741c9..1051d4e4de15 100644 --- a/lib/libc/arm/gen/makecontext.c +++ b/lib/libc/arm/gen/makecontext.c @@ -1,89 +1,89 @@ /* $NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Klaus Klein. * * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 #include #include #include #include #include extern void _ctx_start(void); void ctx_done(ucontext_t *ucp) -{ - +{ + if (ucp->uc_link == NULL) exit(0); - else { + else { setcontext((const ucontext_t *)ucp->uc_link); abort(); - } -} + } +} __weak_reference(__makecontext, makecontext); void __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) { __greg_t *gr = ucp->uc_mcontext.__gregs; int i; unsigned int *sp; va_list ap; /* Compute and align stack pointer. */ sp = (unsigned int *) (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size - sizeof(double)) & ~7); /* Allocate necessary stack space for arguments exceeding r0-3. */ if (argc > 4) sp -= argc - 4; gr[_REG_SP] = (__greg_t)sp; /* Wipe out frame pointer. */ gr[_REG_FP] = 0; /* Arrange for return via the trampoline code. */ gr[_REG_PC] = (__greg_t)_ctx_start; gr[_REG_R4] = (__greg_t)func; gr[_REG_R5] = (__greg_t)ucp; va_start(ap, argc); /* Pass up to four arguments in r0-3. */ for (i = 0; i < argc && i < 4; i++) gr[_REG_R0 + i] = va_arg(ap, int); /* Pass any additional arguments on the stack. */ for (argc -= i; argc > 0; argc--) *sp++ = va_arg(ap, int); va_end(ap); }