Re-factor trap0 (system calls) into trap_subr.s. Here we pick the flavor

that has the in-line astpending check bcause it's a few cycles faster in
the (common) case where no AST is pending at the end of a system call.

Author: thorpej

sys/arch/amiga/amiga/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.178 2026/03/18 14:44:09 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.179 2026/03/18 15:50:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -178,20 +178,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	%d0-%d7/%a0-%a7,%sp@-	| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,%d0-%d7/%a0-%a6	| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	jra	_ASM_LABEL(rei)		| all done
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall"
  *	cachectl(command, addr, length)

sys/arch/atari/atari/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.133 2026/03/18 14:44:09 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.134 2026/03/18 15:50:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -317,20 +317,6 @@ ENTRY_NOPROFILE(badmfpint)
 	subql	#1,_C_LABEL(intr_depth)
 	jra	_ASM_LABEL(rei)		|  all done
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			|  stack adjust count
-	moveml	#0xFFFF,%sp@-		|  save user registers
-	movl	%usp,%a0		|  save the user SP
-	movl	%a0,%sp@(FR_SP)		|    in the savearea
-	movl	%d0,%sp@-		|  push syscall number
-	jbsr	_C_LABEL(syscall)	|  handle it
-	addql	#4,%sp			|  pop syscall arg
-	movl	%sp@(FR_SP),%a0		|  grab and restore
-	movl	%a0,%usp		|    user SP
-	moveml	%sp@+,#0x7FFF		|  restore most registers
-	addql	#8,%sp			|  pop SP and stack adjust
-	jra	_ASM_LABEL(rei)		|  all done
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall"
  *	cachectl(command, addr, length)

sys/arch/cesfic/cesfic/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.57 2026/03/18 14:44:09 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.58 2026/03/18 15:50:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -449,22 +449,6 @@ Lfptnull:
 	jra	_ASM_LABEL(faultstkadj) | call trap and deal with stack cleanup
 
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)

sys/arch/hp300/hp300/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.204 2026/03/18 14:44:09 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.205 2026/03/18 15:50:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -621,22 +621,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| yes, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)

sys/arch/luna68k/luna68k/locore.s

@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.100 2026/03/18 14:44:10 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.101 2026/03/18 15:50:08 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -366,22 +366,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)

sys/arch/m68k/m68k/trap_subr.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: trap_subr.s,v 1.22 2026/03/18 14:44:10 thorpej Exp $	*/
+/*	$NetBSD: trap_subr.s,v 1.23 2026/03/18 15:50:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -214,6 +214,23 @@ ENTRY_NOPROFILE(badtrap)
 	addql	#8,%sp			| pop stack adjust count and %sp
 	jra	_ASM_LABEL(rei)		| all done
 
+/* trap #0 -- system calls */
+ENTRY_NOPROFILE(trap0)
+	clrl	-(%sp)			| stack adjust count
+	moveml	#0xFFFF,-(%sp)		| save user registers
+	movl	%usp,%a0		| save the user SP
+	movl	%a0,%sp@(FR_SP)		|   in the savearea
+	movl	%d0,-(%sp)		| push syscall number
+	jbsr	_C_LABEL(syscall)	| handle it
+	addql	#4,%sp			| pop syscall arg
+	tstl	_C_LABEL(astpending)	| AST pending?
+	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
+	movl	%sp@(FR_SP),%a0		| grab and restore
+	movl	%a0,%usp		|   user SP
+	moveml	(%sp)+,#0x7FFF		| restore most registers
+	addql	#8,%sp			| pop SP and stack adjust
+	rte				| all done
+
 /*
  * Emulation of VAX REI instruction.
  *

sys/arch/mac68k/mac68k/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.195 2026/03/18 14:44:10 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.196 2026/03/18 15:50:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -545,22 +545,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| pad SR to longword
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save %USP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   %USP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SSP and align word
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HP-UX & BSD)
  *	cachectl(command, addr, length)

sys/arch/mvme68k/mvme68k/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.153 2026/03/18 14:44:10 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.154 2026/03/18 15:50:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -722,22 +722,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)

sys/arch/news68k/news68k/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.102 2026/03/18 14:44:10 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.103 2026/03/18 15:50:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -448,22 +448,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)

sys/arch/next68k/next68k/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.100 2026/03/18 14:44:10 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.101 2026/03/18 15:50:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -459,22 +459,6 @@ Lfptnull:
  * no post-trap stack adjustment.
  */
 
-ENTRY_NOPROFILE(trap0)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0xFFFF,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%d0,%sp@-		| push syscall number
-	jbsr	_C_LABEL(syscall)	| handle it
-	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	_ASM_LABEL(doast)	| Yup, go deal with it.
-	movl	%sp@(FR_SP),%a0		| grab and restore
-	movl	%a0,%usp		|   user SP
-	moveml	%sp@+,#0x7FFF		| restore most registers
-	addql	#8,%sp			| pop SP and stack adjust
-	rte
-
 /*
  * Trap 12 is the entry point for the cachectl "syscall" (both HPUX & BSD)
  *	cachectl(command, addr, length)