From owner-svn-src-user@FreeBSD.ORG Fri Mar 5 20:51:41 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 C4D36106566C; Fri, 5 Mar 2010 20:51:41 +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 99C628FC1C; Fri, 5 Mar 2010 20:51:41 +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 o25Kpf6K008927; Fri, 5 Mar 2010 20:51:41 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25KpeTJ008896; Fri, 5 Mar 2010 20:51:40 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003052051.o25KpeTJ008896@svn.freebsd.org> From: Juli Mallett Date: Fri, 5 Mar 2010 20:51:40 +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: r204769 - 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: Fri, 05 Mar 2010 20:51:41 -0000 Author: jmallett Date: Fri Mar 5 20:51:40 2010 New Revision: 204769 URL: http://svn.freebsd.org/changeset/base/204769 Log: o) Add back old ABI support for syscalls. o) Zero args before use so that they aren't filled with garbage if something goes wrong in the syscall handling. 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 Fri Mar 5 20:31:29 2010 (r204768) +++ user/jmallett/octeon/sys/mips/mips/trap.c Fri Mar 5 20:51:40 2010 (r204769) @@ -608,6 +608,8 @@ dofault: int nargs, nsaved; register_t args[8]; + bzero(args, sizeof args); + /* * note: PCPU_LAZY_INC() can only be used if we can * afford occassional inaccuracy in the count. @@ -630,9 +632,17 @@ dofault: code = locr0->v0; switch (code) { - case SYS_syscall: +#if defined(__mips_n32) || defined(__mips_n64) case SYS___syscall: /* + * Quads fit in a single register in + * new ABIs. + * + * XXX o64? + */ +#endif + case SYS_syscall: + /* * Code is first argument, followed by * actual args. */ @@ -640,23 +650,47 @@ dofault: args[0] = locr0->a1; args[1] = locr0->a2; args[2] = locr0->a3; + nsaved = 3; +#if defined(__mips_n32) || defined(__mips_n64) args[3] = locr0->t4; args[4] = locr0->t5; args[5] = locr0->t6; args[6] = locr0->t7; - nsaved = 7; + nsaved += 4; +#endif + break; + +#if defined(__mips_o32) + 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; break; +#endif default: args[0] = locr0->a0; args[1] = locr0->a1; args[2] = locr0->a2; args[3] = locr0->a3; + nsaved = 4; +#if defined (__mips_n32) || defined(__mips_n64) args[4] = locr0->t4; args[5] = locr0->t5; args[6] = locr0->t6; args[7] = locr0->t7; - nsaved = 8; + nsaved += 4; +#endif } #ifdef TRAP_DEBUG printf("SYSCALL #%d pid:%u\n", code, p->p_pid); @@ -673,6 +707,15 @@ dofault: nargs = callp->sy_narg; if (nargs > nsaved) { +#if defined(__mips_n32) || defined(__mips_n64) + /* + * XXX + * Is this right for new ABIs? I think the 4 there + * should be 8, size there are 8 registers to skip, + * not 4, but I'm not certain. + */ + printf("SYSCALL #%u pid:%u, nargs > nsaved.\n", code, p->p_pid); +#endif i = copyin((caddr_t)(intptr_t)(locr0->sp + 4 * sizeof(register_t)), (caddr_t)&args[nsaved], (u_int)(nargs - nsaved) * sizeof(register_t));