From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 20:42:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 452581065677; Mon, 1 Mar 2010 20:42:30 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A24A8FC21; Mon, 1 Mar 2010 20:42:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21KgT73011864; Mon, 1 Mar 2010 20:42:29 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21KgT7j011862; Mon, 1 Mar 2010 20:42:29 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003012042.o21KgT7j011862@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 20:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204534 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Mar 2010 20:42:30 -0000 Author: jmallett Date: Mon Mar 1 20:42:29 2010 New Revision: 204534 URL: http://svn.freebsd.org/changeset/base/204534 Log: Add support for N32 and N64 syscalls -- take additional arguments from ta[0-4]. XXX I did this by breaking O32 support, but I only care about N32 right now. Modified: user/jmallett/octeon/sys/mips/mips/trap.c Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 1 20:41:27 2010 (r204533) +++ user/jmallett/octeon/sys/mips/mips/trap.c Mon Mar 1 20:42:29 2010 (r204534) @@ -286,7 +286,6 @@ trap(struct trapframe *trapframe) pt_entry_t *pte; unsigned int entry; pmap_t pmap; - int quad_syscall = 0; int access_type; ksiginfo_t ksi; char *msg = NULL; @@ -632,6 +631,7 @@ dofault: switch (code) { case SYS_syscall: + case SYS___syscall: /* * Code is first argument, followed by * actual args. @@ -640,24 +640,11 @@ dofault: args[0] = locr0->a1; args[1] = locr0->a2; args[2] = locr0->a3; - nsaved = 3; - break; - - case SYS___syscall: - /* - * Like syscall, but code is a quad, so as - * to maintain quad alignment for the rest - * of the arguments. - */ - if (_QUAD_LOWWORD == 0) { - code = locr0->a0; - } else { - code = locr0->a1; - } - args[0] = locr0->a2; - args[1] = locr0->a3; - nsaved = 2; - quad_syscall = 1; + args[3] = locr0->t4; + args[4] = locr0->t5; + args[5] = locr0->t6; + args[6] = locr0->t7; + nsaved = 7; break; default: @@ -665,7 +652,11 @@ dofault: args[1] = locr0->a1; args[2] = locr0->a2; args[3] = locr0->a3; - nsaved = 4; + args[4] = locr0->t4; + args[5] = locr0->t5; + args[6] = locr0->t6; + args[7] = locr0->t7; + nsaved = 8; } #ifdef TRAP_DEBUG printf("SYSCALL #%d pid:%u\n", code, p->p_pid); @@ -695,6 +686,11 @@ dofault: goto done; } } +#ifdef TRAP_DEBUG + for (i = 0; i < nargs; i++) { + printf("args[%d] = %#llx\n", i, args[i]); + } +#endif #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, nargs, args);