From owner-svn-src-user@FreeBSD.ORG  Thu Apr  8 06:48:20 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 DB4B0106566C;
	Thu,  8 Apr 2010 06:48:20 +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 CAABB8FC0A;
	Thu,  8 Apr 2010 06:48:20 +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 o386mKE3042062;
	Thu, 8 Apr 2010 06:48:20 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o386mKnr042060;
	Thu, 8 Apr 2010 06:48:20 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004080648.o386mKnr042060@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 8 Apr 2010 06:48:20 +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: r206392 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Apr 2010 06:48:20 -0000

Author: jmallett
Date: Thu Apr  8 06:48:20 2010
New Revision: 206392
URL: http://svn.freebsd.org/changeset/base/206392

Log:
  Hide quad syscall calling convention behind __mips_o32.

Modified:
  user/jmallett/octeon/sys/mips/mips/vm_machdep.c

Modified: user/jmallett/octeon/sys/mips/mips/vm_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/vm_machdep.c	Thu Apr  8 06:42:19 2010	(r206391)
+++ user/jmallett/octeon/sys/mips/mips/vm_machdep.c	Thu Apr  8 06:48:20 2010	(r206392)
@@ -265,19 +265,29 @@ cpu_set_syscall_retval(struct thread *td
 {
 	struct trapframe *locr0 = td->td_frame;
 	unsigned int code;
+#if defined(__mips_o32)
 	int quad_syscall;
+#endif
 
 	code = locr0->v0;
+#if defined(__mips_o32)
 	quad_syscall = 0;
+#endif
+
 	if (code == SYS_syscall)
 		code = locr0->a0;
 	else if (code == SYS___syscall) {
+#if defined(__mips_o32)
 		code = _QUAD_LOWWORD ? locr0->a1 : locr0->a0;
 		quad_syscall = 1;
+#else
+		code = locr0->a0;
+#endif
 	}
 
 	switch (error) {
 	case 0:
+#if defined(__mips_o32)
 		if (quad_syscall && code != SYS_lseek) {
 			/*
 			 * System call invoked through the
@@ -290,10 +300,13 @@ cpu_set_syscall_retval(struct thread *td
 				locr0->v1 = td->td_retval[0];
 			locr0->a3 = 0;
 		} else {
+#endif
 			locr0->v0 = td->td_retval[0];
 			locr0->v1 = td->td_retval[1];
 			locr0->a3 = 0;
+#if defined(__mips_o32)
 		}
+#endif
 		break;
 
 	case ERESTART:
@@ -304,15 +317,19 @@ cpu_set_syscall_retval(struct thread *td
 		break;	/* nothing to do */
 
 	default:
+#if defined(__mips_o32)
 		if (quad_syscall && code != SYS_lseek) {
 			locr0->v0 = error;
 			if (_QUAD_LOWWORD)
 				locr0->v1 = error;
 			locr0->a3 = 1;
 		} else {
+#endif
 			locr0->v0 = error;
 			locr0->a3 = 1;
+#if defined(__mips_o32)
 		}
+#endif
 	}
 }