Now that all of the m68k copies of the "rei" function are functionally

equivalent, pick the one that uses the fewest cycles in the "no AST
pending" case and re-factor it into trap_subr.s.

Author: thorpej

sys/arch/amiga/amiga/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.176 2026/03/18 04:15:30 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.177 2026/03/18 13:56:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -515,63 +515,6 @@ ENTRY_NOPROFILE(lev7intr)
 	 */
 	rte				| all done
 
-
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing ASTs
- * (profiling, scheduling) and software interrupts (network, softclock).
- * We check for ASTs first, just like the VAX.  To avoid excess overhead
- * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifying that we need an AST we
- * drop the IPL to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.  A cleanup should only be needed at this
- * point for coprocessor mid-instruction frames (type 9), but we also test
- * for bus error frames (type 10 and 11).
- */
-ASENTRY_NOPROFILE(rei)
-#ifdef DEBUG
-	tstl	_C_LABEL(panicstr)	| have we panicked?
-	jne	Ldorte			| yes, do not make matters worse
-#endif
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jeq	Ldorte			| no, done
-Lrei1:
-	btst	#5,%sp@			| yes, are we returning to user mode?
-	jne	Ldorte			| no, done
-	movw	#PSL_LOWIPL,%sr		| lower SPL
-	clrl	%sp@-			| stack adjust
-	moveml	%d0-%d7/%a0-%a7,%sp@-	| save all registers
-	movl	%usp,%a1		| including
-	movl	%a1,%sp@(FR_SP)		|    the users SP
-	clrl	%sp@-			| VA == none
-	clrl	%sp@-			| code == none
-	movl	#T_ASTFLT,%sp@-		| type == async system trap
-	pea	%sp@(12)		| fp == address of trap frame
-	jbsr	_C_LABEL(trap)		| go handle it
-	lea	%sp@(16),%sp		| pop value args
-	movl	%sp@(FR_SP),%a0		| restore user SP
-	movl	%a0,%usp		|   from save area
-	movw	%sp@(FR_ADJ),%d0	| need to adjust stack?
-	jne	Laststkadj		| yes, go to it
-	moveml	%sp@+,%d0-%d7/%a0-%a6	| no, restore most user regs
-	addql	#8,%sp			| toss SP and stack adjust
-	rte				| and do real RTE
-Laststkadj:
-	lea	%sp@(FR_HW),%a1		| pointer to HW frame
-	addql	#8,%a1			| source pointer
-	movl	%a1,%a0			| source
-	addw	%d0,%a0			|  + hole size = dest pointer
-	movl	%a1@-,%a0@-		| copy
-	movl	%a1@-,%a0@-		|  8 bytes
-	movl	%a0,%sp@(FR_SP)		| new SSP
-	moveml	%sp@+,%d0-%d7/%a0-%a6	| restore user registers
-	movl	%sp@,%sp		| and our SP
-Ldorte:
-	rte				| real return
-
 /*
  * Kernel access to the current processes kernel stack is via a fixed
  * virtual address.  It is at the same address as in the users VA space.

sys/arch/atari/atari/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.131 2026/03/18 04:15:31 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.132 2026/03/18 13:56:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -592,63 +592,6 @@ ENTRY_NOPROFILE(lev7intr)
 
 #endif /* _ATARIHW_ */
 
-
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing ASTs
- * (profiling, scheduling) and software interrupts (network, softclock).
- * We check for ASTs first, just like the VAX.  To avoid excess overhead
- * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifying that we need an AST we
- * drop the IPL to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.  A cleanup should only be needed at this
- * point for coprocessor mid-instruction frames (type 9), but we also test
- * for bus error frames (type 10 and 11).
- */
-ASENTRY_NOPROFILE(rei)
-#ifdef DEBUG
-	tstl	_C_LABEL(panicstr)	|  have we panicked?
-	jne	Ldorte			|  yes, do not make matters worse
-#endif
-	tstl	_C_LABEL(astpending)	|  AST pending?
-	jeq	Ldorte			|  Nope. Just return.
-Lrei1:
-	btst	#5,%sp@			|  yes, are we returning to user mode?
-	jne	Ldorte			|  Nope. Just return.
-	movw	#PSL_LOWIPL,%sr		|  lower SPL
-	clrl	%sp@-			|  stack adjust
-	moveml	#0xFFFF,%sp@-		|  save all registers
-	movl	%usp,%a1		|  including
-	movl	%a1,%sp@(FR_SP)		|     the users SP
-	clrl	%sp@-			|  VA == none
-	clrl	%sp@-			|  code == none
-	movl	#T_ASTFLT,%sp@-		|  type == async system trap
-	pea	%sp@(12)		|  fp == address of trap frame
-	jbsr	_C_LABEL(trap)		|  go handle it
-	lea	%sp@(16),%sp		|  pop value args
-	movl	%sp@(FR_SP),%a0		|  restore user SP
-	movl	%a0,%usp		|    from save area
-	movw	%sp@(FR_ADJ),%d0	|  need to adjust stack?
-	jne	Laststkadj		|  yes, go to it
-	moveml	%sp@+,#0x7FFF		|  no, restore most user regs
-	addql	#8,%sp			|  toss SP and stack adjust
-	rte				|  and do real RTE
-Laststkadj:
-	lea	%sp@(FR_HW),%a1		|  pointer to HW frame
-	addql	#8,%a1			|  source pointer
-	movl	%a1,%a0			|  source
-	addw	%d0,%a0			|   + hole size = dest pointer
-	movl	%a1@-,%a0@-		|  copy
-	movl	%a1@-,%a0@-		|   8 bytes
-	movl	%a0,%sp@(FR_SP)		|  new SSP
-	moveml	%sp@+,#0x7FFF		|  restore user registers
-	movl	%sp@,%sp		|  and our SP
-Ldorte:
-	rte				|  and do real RTE
-
 /*
  * Initialization
  *

sys/arch/cesfic/cesfic/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.55 2026/03/18 04:15:31 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.56 2026/03/18 13:56:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -467,8 +467,8 @@ ENTRY_NOPROFILE(trap0)
 	movl	%d0,%sp@-		| push syscall number
 	jbsr	_C_LABEL(syscall)	| handle it
 	addql	#4,%sp			| pop syscall arg
-	tstl	_C_LABEL(astpending)
-	jne	Lrei2
+	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
@@ -611,57 +611,6 @@ ENTRY_NOPROFILE(lev7intr)	/* level 7: parity errors, reset key */
 	addql	#8,%sp			| pop SP and stack adjust
 	jra	_ASM_LABEL(rei)		| all done
 
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing ASTs
- * (profiling, scheduling) and software interrupts (network, softclock).
- * We check for ASTs first, just like the VAX.  To avoid excess overhead
- * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifying that we need an AST we
- * drop the IPL to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.
- */
-ASENTRY_NOPROFILE(rei)
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jeq	Ldorte			| Nope. Just return.
-Lrei1:
-	btst	#5,%sp@			| Are we returning to user mode?
-	jne	Ldorte			| Nope. Just return.
-	movw	#PSL_LOWIPL,%sr		| lower SPL
-	clrl	%sp@-			| stack adjust
-	moveml	#0xFFFF,%sp@-		| save all registers
-	movl	%usp,%a1		| including
-	movl	%a1,%sp@(FR_SP)		|    the users SP
-Lrei2:
-	clrl	%sp@-			| VA == none
-	clrl	%sp@-			| code == none
-	movl	#T_ASTFLT,%sp@-		| type == async system trap
-	pea	%sp@(12)		| fp == address of trap frame
-	jbsr	_C_LABEL(trap)		| go handle it
-	lea	%sp@(16),%sp		| pop value args
-	movl	%sp@(FR_SP),%a0		| restore user SP
-	movl	%a0,%usp			|   from save area
-	movw	%sp@(FR_ADJ),%d0		| need to adjust stack?
-	jne	Laststkadj		| yes, go to it
-	moveml	%sp@+,#0x7FFF		| no, restore most user regs
-	addql	#8,%sp			| toss SP and stack adjust
-	rte				| and do real RTE
-Laststkadj:
-	lea	%sp@(FR_HW),%a1		| pointer to HW frame
-	addql	#8,%a1			| source pointer
-	movl	%a1,%a0			| source
-	addw	%d0,%a0			|  + hole size = dest pointer
-	movl	%a1@-,%a0@-		| copy
-	movl	%a1@-,%a0@-		|  8 bytes
-	movl	%a0,%sp@(FR_SP)		| new SSP
-	moveml	%sp@+,#0x7FFF		| restore user registers
-	movl	%sp@,%sp			| and our SP
-Ldorte:
-	rte				| and do real RTE
-
 /*
  * Primitives
  */ 

sys/arch/hp300/hp300/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.202 2026/03/18 04:15:31 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.203 2026/03/18 13:56:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -640,7 +640,7 @@ ENTRY_NOPROFILE(trap0)
 	jbsr	_C_LABEL(syscall)	| handle it
 	addql	#4,%sp			| pop syscall arg
 	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	Lrei			| yes, handle it via trap
+	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
@@ -869,58 +869,6 @@ ENTRY_NOPROFILE(lev7intr)	/* level 7: parity errors, reset key */
 	addql	#8,%sp			| pop SP and stack adjust
 	jra	_ASM_LABEL(rei)		| all done
 
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing
- * ASTs (profiling, scheduling).
- * After identifying that we need an AST we drop the IPL
- * to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.
- */
-
-ASENTRY_NOPROFILE(rei)
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	1f			| no, done
-	rte
-1:
-	btst	#5,%sp@			| yes, are we returning to user mode?
-	jeq	2f			| no, done
-	rte
-2:
-	movw	#PSL_LOWIPL,%sr		| lower SPL
-	clrl	%sp@-			| stack adjust
-	moveml	#0xFFFF,%sp@-		| save all registers
-	movl	%usp,%a1		| including
-	movl	%a1,%sp@(FR_SP)		|    the users SP
-Lrei:
-	clrl	%sp@-			| VA == none
-	clrl	%sp@-			| code == none
-	movl	#T_ASTFLT,%sp@-		| type == async system trap
-	pea	%sp@(12)		| fp == address of trap frame
-	jbsr	_C_LABEL(trap)		| go handle it
-	lea	%sp@(16),%sp		| pop value args
-	movl	%sp@(FR_SP),%a0		| restore user SP
-	movl	%a0,%usp		|   from save area
-	movw	%sp@(FR_ADJ),%d0	| need to adjust stack?
-	jne	Laststkadj		| yes, go to it
-	moveml	%sp@+,#0x7FFF		| no, restore most user regs
-	addql	#8,%sp			| toss SP and stack adjust
-	rte				| and do real RTE
-Laststkadj:
-	lea	%sp@(FR_HW),%a1		| pointer to HW frame
-	addql	#8,%a1			| source pointer
-	movl	%a1,%a0			| source
-	addw	%d0,%a0			|  + hole size = dest pointer
-	movl	%a1@-,%a0@-		| copy
-	movl	%a1@-,%a0@-		|  8 bytes
-	movl	%a0,%sp@(FR_SP)		| new SSP
-	moveml	%sp@+,#0x7FFF		| restore user registers
-	movl	%sp@,%sp		| and our SP
-	rte				| and do real RTE
-
 /*
  * Primitives
  */

sys/arch/luna68k/luna68k/locore.s

@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.98 2026/03/18 04:15:31 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.99 2026/03/18 13:56:07 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -385,7 +385,7 @@ ENTRY_NOPROFILE(trap0)
 	jbsr	_C_LABEL(syscall)	| handle it
 	addql	#4,%sp			| pop syscall arg
 	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	Lrei			| yes, handle it via trap
+	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
@@ -553,60 +553,6 @@ ENTRY_NOPROFILE(lev5intr)
 	jbra	_C_LABEL(intrstub_autovec)
 #endif
 
-/*
- * Emulation of VAX REI instruction.
- *
- * This code deals with checking for and servicing ASTs
- * (profiling, scheduling) and software interrupts (network, softclock).
- * We check for ASTs first, just like the VAX.  To avoid excess overhead
- * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifying that we need an AST we
- * drop the IPL to allow device interrupts.
- *
- * This code is complicated by the fact that sendsig may have been called
- * necessitating a stack cleanup.
- */
-
-ASENTRY_NOPROFILE(rei)
-	tstl	_C_LABEL(astpending)	| AST pending?
-	jne	1f			| no, done
-	rte
-1:
-	btst	#5,%sp@			| yes, are we returning to user mode?
-	jeq	2f			| no, done
-	rte
-2:
-	movw	#PSL_LOWIPL,%sr		| lower SPL
-	clrl	%sp@-			| stack adjust
-	moveml	#0xFFFF,%sp@-		| save all registers
-	movl	%usp,%a1		| including
-	movl	%a1,%sp@(FR_SP)		|    the users SP
-Lrei:
-	clrl	%sp@-			| VA == none
-	clrl	%sp@-			| code == none
-	movl	#T_ASTFLT,%sp@-		| type == async system trap
-	pea	%sp@(12)		| fp == address of trap frame
-	jbsr	_C_LABEL(trap)		| go handle it
-	lea	%sp@(16),%sp		| pop value args
-	movl	%sp@(FR_SP),%a0		| restore user SP
-	movl	%a0,%usp		|   from save area
-	movw	%sp@(FR_ADJ),%d0	| need to adjust stack?
-	jne	Laststkadj		| yes, go to it
-	moveml	%sp@+,#0x7FFF		| no, restore most user regs
-	addql	#8,%sp			| toss SP and stack adjust
-	rte				| and do real RTE
-Laststkadj:
-	lea	%sp@(FR_HW),%a1		| pointer to HW frame
-	addql	#8,%a1			| source pointer
-	movl	%a1,%a0			| source
-	addw	%d0,%a0			|  + hole size = dest pointer
-	movl	%a1@-,%a0@-		| copy
-	movl	%a1@-,%a0@-		|  8 bytes
-	movl	%a0,%sp@(FR_SP)		| new SSP
-	moveml	%sp@+,#0x7FFF		| restore user registers
-	movl	%sp@,%sp		| and our SP
-	rte				| and do real RTE
-
 /*
  * Primitives
  */