From owner-svn-src-head@FreeBSD.ORG  Wed Apr 24 18:00:29 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 89B8D785;
 Wed, 24 Apr 2013 18:00:29 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CEBA136F;
 Wed, 24 Apr 2013 18:00:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OI0Tnc048301;
 Wed, 24 Apr 2013 18:00:29 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OI0TVA048300;
 Wed, 24 Apr 2013 18:00:29 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201304241800.r3OI0TVA048300@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 24 Apr 2013 18:00:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249847 - head/sys/mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2013 18:00:29 -0000

Author: imp
Date: Wed Apr 24 18:00:28 2013
New Revision: 249847
URL: http://svnweb.freebsd.org/changeset/base/249847

Log:
  Fix N32/N64 ABIs to use proper registers after recent changes.
  
  Pointy Hat to: imp

Modified:
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Wed Apr 24 17:20:45 2013	(r249846)
+++ head/sys/mips/mips/trap.c	Wed Apr 24 18:00:28 2013	(r249847)
@@ -363,10 +363,10 @@ cpu_fetch_syscall_args(struct thread *td
 			/*
 			 * Non-o32 ABIs support more arguments in registers.
 			 */
-			sa->args[3] = locr0->t0;
-			sa->args[4] = locr0->t1;
-			sa->args[5] = locr0->t2;
-			sa->args[6] = locr0->t3;
+			sa->args[3] = locr0->a4;
+			sa->args[4] = locr0->a5;
+			sa->args[5] = locr0->a6;
+			sa->args[6] = locr0->a7;
 			nsaved += 4;
 #ifdef COMPAT_FREEBSD32
 		}
@@ -389,10 +389,10 @@ cpu_fetch_syscall_args(struct thread *td
 			/*
 			 * Non-o32 ABIs support more arguments in registers.
 			 */
-			sa->args[4] = locr0->t0;
-			sa->args[5] = locr0->t1;
-			sa->args[6] = locr0->t2;
-			sa->args[7] = locr0->t3;
+			sa->args[4] = locr0->a4;
+			sa->args[5] = locr0->a5;
+			sa->args[6] = locr0->a6;
+			sa->args[7] = locr0->a7;
 			nsaved += 4;
 #ifdef COMPAT_FREEBSD32
 		}