diff options
| -rw-r--r-- | sys/arch/luna88k/luna88k/locore.S | 30 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/subr.S | 30 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/locore.S | 30 |
3 files changed, 31 insertions, 59 deletions
diff --git a/sys/arch/luna88k/luna88k/locore.S b/sys/arch/luna88k/luna88k/locore.S index b4da0dcc803..79c0a1ebf04 100644 --- a/sys/arch/luna88k/luna88k/locore.S +++ b/sys/arch/luna88k/luna88k/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.8 2005/10/12 19:05:39 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.9 2005/10/12 19:32:17 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -472,31 +472,3 @@ GLOBAL(proc0paddr) */ GLOBAL(curpcb) word _ASM_LABEL(u0) /* curpcb = &u0 */ - -/* - * Trampoline code. Gets copied to the top of - * user stack in exec. - */ -GLOBAL(sigcode) /* r31 points to sigframe */ - ld r3, r31, 4 /* siginfo_t* */ - ld r4, r31, 8 /* sigcontext* */ - ld r5, r31, 12 /* handler */ - jsr.n r5 - ld r2, r31, 0 /* signo */ - ld r2, r31, 8 /* sigcontext* */ - or r13, r0, SYS_sigreturn - tb0 0, r0, 128 /* syscall trap, calling sigreturn */ - NOP | failure return -#if 0 - NOP | success return -#endif - /* sigreturn will not return unless it fails */ - or r13, r0, SYS_exit - tb0 0, r0, 128 /* syscall trap, exit */ - /* - * this never returns, but we need to provide fetchable instructions - * for the 88100 pipeline. - */ - NOP - NOP -GLOBAL(esigcode) diff --git a/sys/arch/m88k/m88k/subr.S b/sys/arch/m88k/m88k/subr.S index 6ef3811da64..a7a21a05554 100644 --- a/sys/arch/m88k/m88k/subr.S +++ b/sys/arch/m88k/m88k/subr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.S,v 1.6 2005/05/15 16:23:45 miod Exp $ */ +/* $OpenBSD: subr.S,v 1.7 2005/10/12 19:32:19 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -1595,3 +1595,31 @@ ENTRY(set_cpu_number) data 9: string "set_cpu_number: bad CPU number %x\0" #endif + +/* + * Trampoline code. Gets copied to the top of + * user stack in exec. + */ +GLOBAL(sigcode) /* r31 points to sigframe */ + ld r3, r31, 4 /* siginfo_t* */ + ld r4, r31, 8 /* sigcontext* */ + ld r5, r31, 12 /* handler */ + jsr.n r5 + ld r2, r31, 0 /* signo */ + ld r2, r31, 8 /* sigcontext* */ + or r13, r0, SYS_sigreturn + tb0 0, r0, 128 /* syscall trap, calling sigreturn */ + NOP | failure return +#if 0 + NOP | success return +#endif + /* sigreturn will not return unless it fails */ + or r13, r0, SYS_exit + tb0 0, r0, 128 /* syscall trap, exit */ + /* + * this never returns, but we need to provide fetchable instructions + * for the 88100 pipeline. + */ + NOP + NOP +GLOBAL(esigcode) diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S index 793fe7169ea..28eb135208f 100644 --- a/sys/arch/mvme88k/mvme88k/locore.S +++ b/sys/arch/mvme88k/mvme88k/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.42 2005/10/12 19:05:44 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.43 2005/10/12 19:32:19 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -507,31 +507,3 @@ GLOBAL(proc0paddr) */ GLOBAL(curpcb) word _ASM_LABEL(u0) /* curpcb = &u0 */ - -/* - * Trampoline code. Gets copied to the top of - * user stack in exec. - */ -GLOBAL(sigcode) /* r31 points to sigframe */ - ld r3, r31, 4 /* siginfo_t* */ - ld r4, r31, 8 /* sigcontext* */ - ld r5, r31, 12 /* handler */ - jsr.n r5 - ld r2, r31, 0 /* signo */ - ld r2, r31, 8 /* sigcontext* */ - or r13, r0, SYS_sigreturn - tb0 0, r0, 128 /* syscall trap, calling sigreturn */ - NOP | failure return -#if 0 - NOP | success return -#endif - /* sigreturn will not return unless it fails */ - or r13, r0, SYS_exit - tb0 0, r0, 128 /* syscall trap, exit */ - /* - * this never returns, but we need to provide fetchable instructions - * for the 88100 pipeline. - */ - NOP - NOP -GLOBAL(esigcode) |