diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-04-02 13:24:58 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-04-02 13:24:58 +0000 |
| commit | 519b6be9837dad441b6d1e61fab7a563bae6730b (patch) | |
| tree | e966b4e70c37bf4bee22fdd575026c28214a67ff /sys/arch | |
| parent | f4a82e159fcfb90e908e4035a99b9b355e5cfe31 (diff) | |
Get rid of SYSCALL_G7RFLAG. iIt's been deprecated for a long time already,
and we've started using %g7 as a per-thread register now. If you have any
binaries left that use this flag they'll probably crash and burn!
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/include/trap.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/trap.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/sparc64/include/trap.h b/sys/arch/sparc64/include/trap.h index ca7dd92cc6a..4e898cfd005 100644 --- a/sys/arch/sparc64/include/trap.h +++ b/sys/arch/sparc64/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.4 2008/07/04 22:04:37 kettenis Exp $ */ +/* $OpenBSD: trap.h,v 1.5 2013/04/02 13:24:57 kettenis Exp $ */ /* $NetBSD: trap.h,v 1.4 1999/06/07 05:28:04 eeh Exp $ */ /* @@ -146,7 +146,6 @@ /* flags to system call (flags in %g1 along with syscall number) */ #define SYSCALL_G2RFLAG 0x400 /* on success, return to %g2 rather than npc */ -#define SYSCALL_G7RFLAG 0x800 /* use %g7 as above (deprecated) */ /* * `software trap' macros to keep people happy (sparc v8 manual says not diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c index 80209b7ac84..75c11621e25 100644 --- a/sys/arch/sparc64/sparc64/trap.c +++ b/sys/arch/sparc64/sparc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.77 2012/12/31 06:46:14 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.78 2013/04/02 13:24:57 kettenis Exp $ */ /* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */ /* @@ -1238,8 +1238,8 @@ syscall(tf, code, pc) panic("syscall: trapframe"); #endif p->p_md.md_tf = tf; - new = code & (SYSCALL_G7RFLAG | SYSCALL_G2RFLAG); - code &= ~(SYSCALL_G7RFLAG | SYSCALL_G2RFLAG); + new = code & SYSCALL_G2RFLAG; + code &= ~SYSCALL_G2RFLAG; callp = p->p_emul->e_sysent; nsys = p->p_emul->e_nsysent; @@ -1320,8 +1320,8 @@ syscall(tf, code, pc) tf->tf_out[0] = rval[0]; tf->tf_out[1] = rval[1]; if (new) { - /* jmp %g2 (or %g7, deprecated) on success */ - dest = tf->tf_global[new & SYSCALL_G2RFLAG ? 2 : 7]; + /* jmp %g2 on success */ + dest = tf->tf_global[2]; if (dest & 3) { error = EINVAL; goto bad; |