Wed Aug 16 22:49:05 2017 UTC ()

add cpu_set_onfault glue


(nisimura)

diff -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/locore.S

--- src/sys/arch/aarch64/aarch64/locore.S 2014/08/10 05:47:37	1.1
+++ src/sys/arch/aarch64/aarch64/locore.S 2017/08/16 22:49:05	1.2

 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
+/* $NetBSD: locore.S,v 1.2 2017/08/16 22:49:05 nisimura Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -24,27 +24,30 @@
  * 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 <aarch64/asm.h>
 #include "assym.h"
 #include "opt_ddb.h"
-RCSID("$NetBSD: locore.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
+RCSID("$NetBSD: locore.S,v 1.2 2017/08/16 22:49:05 nisimura Exp $")
 // XXX:AARCH64
 lr	.req	x30
 /*
  * At IPL_SCHED:
  *	x0 = oldlwp (maybe be NULL)
  *	x1 = newlwp
  *	x2 = returning
  * returns x0-x2 unchanged
  */
 ENTRY_NP(cpu_switchto)
 	cbz	x0, .Lrestore_lwp
 	/*
 	 * Store the callee saved register on the stack in a trapframe
 @@ -106,26 +109,38 @@ ENTRY_NP(cpu_switchto)
 	 */
 	ldp	x19, x20, [sp, #TF_X19]
 	ldp	x21, x22, [sp, #TF_X21]
 	ldp	x23, x24, [sp, #TF_X23]
 	ldp	x25, x26, [sp, #TF_X25]
 	ldp	x27, x28, [sp, #TF_X27]
 	ldp	x29, x30, [sp, #TF_X29]
 	add	sp, sp, #TF_SIZE	/* pop trapframe from stack */
 	ret
 END(cpu_switchto)
 /*
  *	x0 = lwp
  *	x1 = ipl
  */
 ENTRY_NP(cpu_switchto_softint)
 //
 //XXXAARCH64
 //
 	ret
 END(cpu_switchto_softint)
 /*
  * Called at IPL_SCHED
  *	x0 = old lwp (from cpu_switchto)
  *	x1 = new lwp (from cpu_switchto)
  *	x27 = func
  *	x28 = arg
  */
 ENTRY_NP(lwp_trampoline)
 #if defined(MULTIPROCESSOR)
 	mov	x19, x0
 	mov	x20, x1
 	bl	_C_LABEL(proc_trampoline_mp)
 	mov	x1, x20
 	mov	x0, x19
 @@ -180,26 +195,49 @@ exception_syscall_exit:
 	 * Don't adjust the stack for the trapframe since we would
 	 * just add subtract it again upon exception entry.
 	 */
 	eret
 END(exception_trap_exit)
 #ifdef DDB
 ENTRY(cpu_Debugger)
 	brk	#0xffff
 	ret
 END(cpu_Debugger)
 #endif /* DDB */
 /*
  * int cpu_set_onfault(struct faultbuf *fb, register_t retval)
  */
 ENTRY(cpu_set_onfault)
 	mov	x9, sp
 	stp	x19, x20, [x0, #0]
 	stp	x21, x22, [x0, #16]
 	stp	x23, x24, [x0, #32]
 	stp	x25, x26, [x0, #48]
 	stp	x27, x28, [x0, #64]
 	stp	x29, x9, [x0, #80]
 	stp	lr, x1, [x0, #96]
 	mrs	x3, tpidr_el1		/* curcpu */
 	ldr	x2, [x3, #CI_CURLWP]	/* curlwp */
 	str	x0, [x2, #L_MD_ONFAULT] /* l_md.md_onfault = fb */
 	mov	x0, #0
 END(cpu_set_onfault)
 /*
  * setjmp(9)
  * int setjmp(label_t *label);
  * void longjmp(label_t *label);
  */
 ENTRY(setjmp)
 	stp	x19, x20, [x0, #0]
 	stp	x21, x22, [x0, #16]
 	stp	x23, x24, [x0, #32]
 	stp	x25, x26, [x0, #48]
 	stp	x27, x28, [x0, #64]
 	stp	x29, x30, [x0, #80]
 	mov	x1, sp
 	str	x1, [x0, #96]
 	mov	x0, #0
 	ret
 END(setjmp)