Module Name: src
Committed By: matt
Date: Fri Sep 5 18:09:37 UTC 2014
Modified Files:
src/lib/libc/arch/or1k: Makefile.inc SYS.h
Added Files:
src/lib/libc/arch/or1k: syscallargs.awk
Log Message:
The OpenRISC calling standard only passes 6 parameters by register. Any
others are passed on the stack. NetBSD syscalls use up to 8 parameters
so that could mean two left on the stack for the kernel to access. It's
easier for the kernel if userland could fetch into registers beforehand.
So we generate sysassym.h which contains the number of arguments for each
syscall and then use that to determine how many arguments need to be fetched
from the stack.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/Makefile.inc \
src/lib/libc/arch/or1k/SYS.h
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/or1k/syscallargs.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/or1k/Makefile.inc
diff -u src/lib/libc/arch/or1k/Makefile.inc:1.1 src/lib/libc/arch/or1k/Makefile.inc:1.2
--- src/lib/libc/arch/or1k/Makefile.inc:1.1 Wed Sep 3 19:34:25 2014
+++ src/lib/libc/arch/or1k/Makefile.inc Fri Sep 5 18:09:37 2014
@@ -1,9 +1,24 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:25 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/09/05 18:09:37 matt Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
SRCS+= mulsi3.S
-CPPFLAGS+= -I. -isystem ${DESTDIR}/usr/include/c++
+CPPFLAGS+= -I.
+
+DPSRCS+= sysassym.h
+CLEANFILES+= sysassym.h sysassym.h.tmp
+
+sysassym.h: ${DESTDIR}/usr/include/sys/syscall.h \
+ ${DESTDIR}/usr/include/sys/syscallargs.h ${ARCHDIR}/syscallargs.awk
+ ${_MKTARGET_CREATE}
+ ${TOOL_CAT} \
+ ${DESTDIR}/usr/include/sys/syscall.h \
+ ${DESTDIR}/usr/include/sys/syscallargs.h | \
+ ${TOOL_AWK} -f ${ARCHDIR}/syscallargs.awk | \
+ ${TOOL_GENASSYM} -- ${CC} -ffreestanding ${CFLAGS:N-Wa,*} \
+ ${CPPFLAGS:N-D*} -D_KMEMUSER \
+ ${GENASSYM_CPPFLAGS} > $@.tmp && \
+ mv -f $@.tmp $@
.if ${MKSOFTFLOAT} != "no"
.include <softfloat/Makefile.inc>
Index: src/lib/libc/arch/or1k/SYS.h
diff -u src/lib/libc/arch/or1k/SYS.h:1.1 src/lib/libc/arch/or1k/SYS.h:1.2
--- src/lib/libc/arch/or1k/SYS.h:1.1 Wed Sep 3 19:34:25 2014
+++ src/lib/libc/arch/or1k/SYS.h Fri Sep 5 18:09:37 2014
@@ -1,23 +1,53 @@
-/* $NetBSD: SYS.h,v 1.1 2014/09/03 19:34:25 matt Exp $ */
+/* $NetBSD: SYS.h,v 1.2 2014/09/05 18:09:37 matt Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
#include <machine/asm.h>
#include <sys/syscall.h>
+#include "sysassym.h"
#define _DOSYSCALL(x) l.addi r13,r0,(SYS_ ## x) ;\
l.sys 0 ;\
l.nop
-#define _SYSCALL_NOERROR(x,y) .text ;\
- .p2align 2 ;\
- ENTRY(x) ;\
+#define _SYSCALL_NOERROR(x,y) ENTRY(x) ;\
+ .if NSYSARGS_##y > 6 ;\
+ l.lwz r11, 0(r1) ;\
+ .endif ;\
+ .if NSYSARGS_##y > 7 ;\
+ l.lwz r12, 4(r1) ;\
+ .endif ;\
_DOSYSCALL(y)
-#define _SYSCALL(x,y) .text ;\
- .align 2 ;\
- 2: l.j _C_LABEL(__cerror) ;\
- l.nop ;\
- _SYSCALL_NOERROR(x,y) ;\
- l.bf 2b ;\
+#define _SYSCALL(x,y) _SYSCALL_NOERROR(x,y) ;\
+ l.bf _C_LABEL(__cerror) ;\
l.nop
#define SYSCALL_NOERROR(x) _SYSCALL_NOERROR(x,x)
Added files:
Index: src/lib/libc/arch/or1k/syscallargs.awk
diff -u /dev/null src/lib/libc/arch/or1k/syscallargs.awk:1.1
--- /dev/null Fri Sep 5 18:09:37 2014
+++ src/lib/libc/arch/or1k/syscallargs.awk Fri Sep 5 18:09:37 2014
@@ -0,0 +1,56 @@
+# $NetBSD: syscallargs.awk,v 1.1 2014/09/05 18:09:37 matt Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Matt Thomas of 3am Software Foundry.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+BEGIN {
+}
+
+/#define.SYS_MAXSYS.*/ { next; }
+
+/#define.SYS_.*/ {
+ x = substr($2, 5);
+ syscall[x] = "0";
+}
+
+/^check_syscall_args/ {
+ l = length() - 20;
+ x = substr($0, 20, l);
+ y = gensub("sys_", "", 1, x);
+ syscall[y] = sprintf("sizeof(struct %s_args) / sizeof(register_t)", x);
+}
+
+END {
+ print "include <sys/types.h>"
+ print "include <sys/lwp.h>"
+ print "include <sys/ucontext.h>"
+ print "include <sys/syscallargs.h>"
+ print;
+ for (i in syscall) {
+ printf "define NSYSARGS_%s %s\n", i, syscall[i];
+ }
+}
