From owner-p4-projects@FreeBSD.ORG  Sat Jan  6 19:37:07 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77DCD16A412; Sat,  6 Jan 2007 19:37:07 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 53B0316A407
	for <perforce@FreeBSD.org>; Sat,  6 Jan 2007 19:37:07 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 43AFC13C44C
	for <perforce@FreeBSD.org>; Sat,  6 Jan 2007 19:37:07 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l06Jb7n9049665
	for <perforce@FreeBSD.org>; Sat, 6 Jan 2007 19:37:07 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l06Jb6eA049662
	for perforce@freebsd.org; Sat, 6 Jan 2007 19:37:06 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 6 Jan 2007 19:37:06 GMT
Message-Id: <200701061937.l06Jb6eA049662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 112617 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jan 2007 19:37:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=112617

Change 112617 by gonzo@gonzo_hq on 2007/01/06 19:36:40

	o Implement SYS___syscall. Handle byte order for mips32eb.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/trap.c#14 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/trap.c#14 (text+ko) ====

@@ -354,6 +354,7 @@
 	struct sysent *callp;
 	int locked = 0;
 	int args_shift = 0;
+	int quad_syscall = 0;
 
 	PCPU_LAZY_INC(cnt.v_syscall);
 	td->td_pticks = 0;
@@ -384,7 +385,12 @@
 
 	/* TODO: implement */
 	if(code == SYS___syscall)
-		panic("SYS___syscall: to implement");
+	{
+		code = frame->tf_regs[TF_A0 + _QUAD_LOWWORD];
+		args_shift = 2;
+		quad_syscall = 1;
+	}
+
 
 	if (p->p_sysent->sv_mask)
 		code &= p->p_sysent->sv_mask;
@@ -433,14 +439,24 @@
 		KASSERT(td->td_ar == NULL, 
 		    ("returning from syscall with td_ar set!"));
 	}
+
 	switch (error) {
 	case 0: 
+#ifdef __MIPSEB__
+		if(quad_syscall && (code != SYS_lseek)) {
+			/*
+			 * 64-bit return, 32-bit syscall. Fixup byte order
+			 */
+			frame->tf_regs[TF_V0] = 0;
+			frame->tf_regs[TF_V1] = td->td_retval[0];
+		} else {
+			frame->tf_regs[TF_V0] = td->td_retval[0];
+			frame->tf_regs[TF_V1] = td->td_retval[1];
+		}
+#else
 		frame->tf_regs[TF_V0] = td->td_retval[0];
-		/* 
-		 * XXXMIPS: should we consider this case for 32-bit or
-		 * only for 64bits?
-		 */ 
 		frame->tf_regs[TF_V1] = td->td_retval[1];
+#endif
 		frame->tf_regs[TF_A3] = 0;
 		break;