From owner-p4-projects@FreeBSD.ORG  Mon May  7 16:21:57 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 76A4C16A408; Mon,  7 May 2007 16:21:57 +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 490FA16A406
	for <perforce@freebsd.org>; Mon,  7 May 2007 16:21:57 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C92113C43E
	for <perforce@freebsd.org>; Mon,  7 May 2007 16:21:57 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l47GLvKR059244
	for <perforce@freebsd.org>; Mon, 7 May 2007 16:21:57 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l47GLvRt059241
	for perforce@freebsd.org; Mon, 7 May 2007 16:21:57 GMT
	(envelope-from bms@incunabulum.net)
Date: Mon, 7 May 2007 16:21:57 GMT
Message-Id: <200705071621.l47GLvRt059241@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@incunabulum.net using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119423 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: Mon, 07 May 2007 16:21:57 -0000

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

Change 119423 by bms@bms_anglepoise on 2007/05/07 16:21:10

	Add CFE specific code to locore.
	Make YAMON locore variables conditional on YAMON.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/locore.S#17 edit

Differences ...

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

@@ -35,10 +35,21 @@
 #include "assym.s"
 
 	.data
-#if 1
+
+#ifdef YAMON
 GLOBAL(fenvp)
 	.space 4
 #endif
+
+#ifdef CFE		/* assumes MIPS32 */
+GLOBAL(cfe_present)
+	.space 4
+GLOBAL(cfe_handle)
+	.space 4
+GLOBAL(cfe_vector)
+	.space 4
+#endif
+
 GLOBAL(stackspace)
 	.space PAGE_SIZE /* Smaller than it should be since it's temp. */
 .align 8
@@ -109,6 +120,19 @@
 	sw	a2, fenvp
 #endif
 
+#ifdef CFE
+	/*
+	 * Save the CFE context passed to us by the loader.
+	 */
+	li	t1, 0x43464531
+	bne	a3, t1, no_cfe		/* Check for "CFE1" signature */
+	li	t1, 0x1
+	sw	t1, cfe_present
+	sw	a0, cfe_handle		/* Firmware data segment */
+	sw	a2, cfe_vector		/* Firmware entry vector */
+no_cfe:
+#endif
+
 	/* Call the platform-specific startup code. */
 	jal	platform_start
 	nop