diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-06-03 18:46:03 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-06-03 18:46:03 +0000 |
| commit | 4eeaea52d7d16363e612d3380ecae29b86d07747 (patch) | |
| tree | 13d101f21ba545b09436c8cfda2c275090fd65b1 | |
| parent | 5415a8b3d4a7488733968e3d31a586c2457a8564 (diff) | |
Get rid of SYSCALL_G7RFLAG. It'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!
tested by & ok miod@
| -rw-r--r-- | sys/arch/sparc/include/trap.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/trap.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/sparc/include/trap.h b/sys/arch/sparc/include/trap.h index fcf25b4102e..cce5b33bf9a 100644 --- a/sys/arch/sparc/include/trap.h +++ b/sys/arch/sparc/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */ +/* $OpenBSD: trap.h,v 1.6 2013/06/03 18:46:02 kettenis Exp $ */ /* $NetBSD: trap.h,v 1.9 1996/05/16 15:57:04 abrown Exp $ */ /* @@ -135,7 +135,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/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c index 1c46e332fdc..e17766cc8be 100644 --- a/sys/arch/sparc/sparc/trap.c +++ b/sys/arch/sparc/sparc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.62 2012/12/31 06:46:14 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.63 2013/06/03 18:46:02 kettenis Exp $ */ /* $NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */ /* @@ -968,8 +968,8 @@ syscall(code, tf, 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; @@ -1030,8 +1030,8 @@ syscall(code, tf, pc) tf->tf_out[0] = rval[0]; tf->tf_out[1] = rval[1]; if (new) { - /* jmp %g2 (or %g7, deprecated) on success */ - i = tf->tf_global[new & SYSCALL_G2RFLAG ? 2 : 7]; + /* jmp %g2 on success */ + i = tf->tf_global[2]; if (i & 3) { error = EINVAL; goto bad; |