From owner-p4-projects@FreeBSD.ORG  Tue Jan 29 18:34:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EAEDB16A41B; Tue, 29 Jan 2008 18:34:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97CF116A419
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 18:34:36 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8876E13C457
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 18:34:36 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TIYaGR098040
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 18:34:36 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TIYapg098037
	for perforce@freebsd.org; Tue, 29 Jan 2008 18:34:36 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 29 Jan 2008 18:34:36 GMT
Message-Id: <200801291834.m0TIYapg098037@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134403 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, 29 Jan 2008 18:34:37 -0000

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

Change 134403 by rrs@rrs-mips2-jnpr on 2008/01/29 18:33:48

	Takes out some of my earlier Octeon changes and gets the
	       set down to the min that allow it to work.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#20 edit

Differences ...

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

@@ -93,11 +93,6 @@
 GLOBAL(topstack)
 
 	
-#if defined(TARGET_OCTEON)
-        .set mips3
-#endif
-	
-	
 	.set noreorder
 	
 	.text
@@ -143,12 +138,6 @@
 	mtc0	t2, COP_0_STATUS_REG
 	COP0_SYNC
 
-#if defined(TARGET_OCTEON)
-	/* Clear cause register. */
-	mtc0	zero, MIPS_COP_0_CAUSE
-	COP0_SYNC
-#endif
-	
 	/* Make sure KSEG0 is cached */
 	li	t0, CFG_K0_CACHED
 	mtc0	t0, MIPS_COP_0_CONFIG
@@ -230,14 +219,8 @@
 #endif
 
 
-#if defined(TARGET_OCTEON) /* Maybe this is mips32/64 generic? */
-	.set push
-	.set mips32r2
-	rdhwr	t0, $0
-	.set pop
-#else
 	move	t0, zero
-#endif
+
 	/* Stage the secondary cpu start until later */
 	bne	t0, zero, start_secondary
 	nop