Module Name: src
Committed By: martin
Date: Sun Mar 27 18:47:09 UTC 2011
Modified Files:
src/sys/arch/sparc/include: trap.h
src/sys/arch/sparc/sparc: syscall.c
src/sys/arch/sparc64/include: trap.h
src/sys/arch/sparc64/sparc64: syscall.c
Log Message:
On second thought do not use bit 13 as a flag for syscall numbers, userland
typically sets those from a 13bit signed integer immediate field in the
instruction, so would need to jump through hoops (ok, small hoops) to
avoid sign extension.
Use a combination of the existing syscall flags instead.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/include/trap.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/sparc/syscall.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/include/trap.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sparc64/sparc64/syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/trap.h
diff -u src/sys/arch/sparc/include/trap.h:1.17 src/sys/arch/sparc/include/trap.h:1.18
--- src/sys/arch/sparc/include/trap.h:1.17 Wed Mar 23 20:41:30 2011
+++ src/sys/arch/sparc/include/trap.h Sun Mar 27 18:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.17 2011/03/23 20:41:30 martin Exp $ */
+/* $NetBSD: trap.h,v 1.18 2011/03/27 18:47:08 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -131,7 +131,7 @@
/* 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) */
-#define SYSCALL_G5RFLAG 0x1000 /* use %g5 as above (only ABI compatible way) */
+#define SYSCALL_G5RFLAG 0xc00 /* use %g5 as above (only ABI compatible way) */
/*
* `software trap' macros to keep people happy (sparc v8 manual says not
Index: src/sys/arch/sparc/sparc/syscall.c
diff -u src/sys/arch/sparc/sparc/syscall.c:1.24 src/sys/arch/sparc/sparc/syscall.c:1.25
--- src/sys/arch/sparc/sparc/syscall.c:1.24 Wed Mar 23 20:41:31 2011
+++ src/sys/arch/sparc/sparc/syscall.c Sun Mar 27 18:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.24 2011/03/23 20:41:31 martin Exp $ */
+/* $NetBSD: syscall.c,v 1.25 2011/03/27 18:47:09 martin Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.24 2011/03/23 20:41:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.25 2011/03/27 18:47:09 martin Exp $");
#include "opt_sparc_arch.h"
#include "opt_multiprocessor.h"
@@ -250,7 +250,8 @@
tf->tf_out[1] = rval.o[1];
if (new) {
/* jmp %g5, (or %g2 or %g7, deprecated) on success */
- if (new & SYSCALL_G5RFLAG)
+ if (__predict_true((new & SYSCALL_G5RFLAG)
+ == SYSCALL_G5RFLAG))
i = tf->tf_global[5];
else if (new & SYSCALL_G2RFLAG)
i = tf->tf_global[2];
@@ -340,7 +341,8 @@
tf->tf_out[1] = rval.o[1];
if (new) {
/* jmp %g5, (or %g2 or %g7, deprecated) on success */
- if (new & SYSCALL_G5RFLAG)
+ if (__predict_true((new & SYSCALL_G5RFLAG) ==
+ SYSCALL_G5RFLAG))
i = tf->tf_global[5];
else if (new & SYSCALL_G2RFLAG)
i = tf->tf_global[2];
Index: src/sys/arch/sparc64/include/trap.h
diff -u src/sys/arch/sparc64/include/trap.h:1.8 src/sys/arch/sparc64/include/trap.h:1.9
--- src/sys/arch/sparc64/include/trap.h:1.8 Wed Mar 23 20:41:31 2011
+++ src/sys/arch/sparc64/include/trap.h Sun Mar 27 18:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.8 2011/03/23 20:41:31 martin Exp $ */
+/* $NetBSD: trap.h,v 1.9 2011/03/27 18:47:09 martin Exp $ */
/*
* Copyright (c) 1996-1999 Eduardo Horvath
@@ -142,7 +142,7 @@
/* 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) */
-#define SYSCALL_G5RFLAG 0x1000 /* use %g5 as above (only ABI compatible way) */
+#define SYSCALL_G5RFLAG 0xc00 /* use %g5 as above (only ABI compatible way) */
/*
* `software trap' macros to keep people happy (sparc v8 manual says not
Index: src/sys/arch/sparc64/sparc64/syscall.c
diff -u src/sys/arch/sparc64/sparc64/syscall.c:1.38 src/sys/arch/sparc64/sparc64/syscall.c:1.39
--- src/sys/arch/sparc64/sparc64/syscall.c:1.38 Wed Mar 23 20:41:31 2011
+++ src/sys/arch/sparc64/sparc64/syscall.c Sun Mar 27 18:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.38 2011/03/23 20:41:31 martin Exp $ */
+/* $NetBSD: syscall.c,v 1.39 2011/03/27 18:47:09 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.38 2011/03/23 20:41:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.39 2011/03/27 18:47:09 martin Exp $");
#include "opt_sa.h"
@@ -130,7 +130,8 @@
int new = *code & (SYSCALL_G7RFLAG|SYSCALL_G2RFLAG|SYSCALL_G5RFLAG);
*code &= ~(SYSCALL_G7RFLAG|SYSCALL_G2RFLAG|SYSCALL_G5RFLAG);
if (new) {
- if (new & SYSCALL_G5RFLAG)
+ /* note that G5RFLAG is multiple bits! */
+ if (__predict_true((new & SYSCALL_G5RFLAG) == SYSCALL_G5RFLAG))
tf->tf_pc = tf->tf_global[5];
else if (new & SYSCALL_G7RFLAG)
tf->tf_pc = tf->tf_global[7];
