From owner-p4-projects@FreeBSD.ORG  Tue Sep 19 23:29:58 2006
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 82FF216A407; Tue, 19 Sep 2006 23:29:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0FEA016A49E
	for <perforce@freebsd.org>; Tue, 19 Sep 2006 23:29:58 +0000 (UTC)
	(envelope-from ssouhlal@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B1B1D43D5D
	for <perforce@freebsd.org>; Tue, 19 Sep 2006 23:29:51 +0000 (GMT)
	(envelope-from ssouhlal@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 k8JNTp6i021451
	for <perforce@freebsd.org>; Tue, 19 Sep 2006 23:29:51 GMT
	(envelope-from ssouhlal@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JNTpb7021448
	for perforce@freebsd.org; Tue, 19 Sep 2006 23:29:51 GMT
	(envelope-from ssouhlal@freebsd.org)
Date: Tue, 19 Sep 2006 23:29:51 GMT
Message-Id: <200609192329.k8JNTpb7021448@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ssouhlal@freebsd.org using -f
From: Suleiman Souhlal <ssouhlal@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106368 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: Tue, 19 Sep 2006 23:29:58 -0000

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

Change 106368 by ssouhlal@ssouhlal-maho on 2006/09/19 23:29:38

	- Implement exec_setregs().
	- Make fork_trampoline() return to userland.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/machdep.c#21 edit
.. //depot/projects/mips2/src/sys/mips/mips/swtch.S#4 edit

Differences ...

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

@@ -279,7 +279,11 @@
 void
 exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings)
 {
+	struct trapframe *tf = td->td_frame;
 
+	tf->tf_regs[TF_EPC] = (register_t)entry;
+	tf->tf_regs[TF_SP] = (register_t)stack;
+	/* XXX tf->tf_regs[TF_SR] |= MIPS_SR_KSU_USER; ? */
 }
 
 intptr_t

==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#4 (text+ko) ====

@@ -72,7 +72,6 @@
 	li	v0, 1
 	jr	ra
 	nop
-
 END(cpu_throw)
 
 /*
@@ -109,7 +108,21 @@
 	move	a0, s0
 	move	a1, s1
 	move	a2, s2
-	j	fork_exit
+	jal	fork_exit
+	nop
+
+	/* XXX AST */
+
+	.set at
+	lw	t2, pcpup
+	.set noat
+	lw	t3, PC_CURTHREAD(t2)
+	lw	t0, TD_FRAME(t3)
+
+	move	k1, t0
+	jal	exception_restore_registers
 	nop
+	addu	sp, sp, TF_SIZE
+	eret
 
 END(fork_trampoline)