From owner-p4-projects@FreeBSD.ORG  Sat Mar 20 20:48:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6FD2E16A4D0; Sat, 20 Mar 2004 20:48:24 -0800 (PST)
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 4A89516A4CE
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:48:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 429A843D31
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:48:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L4mOGe062501
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:48:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4mN3o062498
	for perforce@freebsd.org; Sat, 20 Mar 2004 20:48:23 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 20 Mar 2004 20:48:23 -0800 (PST)
Message-Id: <200403210448.i2L4mN3o062498@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49431 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 21 Mar 2004 04:48:24 -0000

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

Change 49431 by jmallett@jmallett_oingo on 2004/03/20 20:47:39

	Rework to return the trapframe.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/trap.c#18 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/trap.c#18 (text+ko) ====

@@ -87,9 +87,9 @@
 #define	MAXTRAPID	31
 
 /* XXX belongs in a header some day? */
-void trap(struct trapframe *, u_int, void *);
+struct trapframe *trap(struct trapframe *, u_int, void *);
 
-void
+struct trapframe *
 trap(struct trapframe *tf, u_int cause, void *badvaddr)
 {
 	struct trap_identifier *tid;
@@ -99,6 +99,10 @@
 
 	code = (cause & MIPS_CR_EXC_CODE) >> MIPS_CR_EXC_CODE_SHIFT;
 	kernelmode = (tf->tf_regs[TF_SR] & MIPS_SR_KSU_USER) == 0;
+	
+	if (curthread != NULL) {
+		curthread->td_frame = tf;
+	}
 
 	/*
 	 * Handle that which we can.
@@ -108,13 +112,17 @@
 		/* XXX Kernel only. */
 		tlb_modified(badvaddr);
 		platform_trap_exit();
-		return;
+		if (curthread)
+			tf = curthread->td_frame;
+		return (tf);
 	case TrInt:
 		platform_trap_exit();
 		atomic_add_int(&curthread->td_intr_nesting_level, 1);
 		platform_intr(tf);
 		atomic_subtract_int(&curthread->td_intr_nesting_level, 1);
-		return;
+		if (curthread)
+			tf = curthread->td_frame;
+		return (tf);
 	default:
 		/* Fatal! */
 		break;
@@ -154,14 +162,12 @@
 #if	DDB
 	default:
 		kdb_trap(code, tf);
-		break;
+		goto done;
 #else
 	default:
 		goto dopanic;
 #endif
 	}
-	platform_trap_exit();
-	return;
 #ifndef	DDB
 dopanic:
 	if (panicstr != NULL) {
@@ -169,6 +175,10 @@
 		cpu_reset();
 	}
 	panic("trap");
+#endif
+done:
 	platform_trap_exit();
-#endif
+	if (curthread)
+		tf = curthread->td_frame;
+	return (tf);
 }