From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 17:03:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4B5216A421; Fri, 18 Jan 2008 17:03:44 +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 99EA816A46C
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 17:03:44 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 73CCD13C4E5
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 17:03:44 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IH3ica096319
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 17:03:44 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IH3iPS096316
	for perforce@freebsd.org; Fri, 18 Jan 2008 17:03:44 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 18 Jan 2008 17:03:44 GMT
Message-Id: <200801181703.m0IH3iPS096316@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133558 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: Fri, 18 Jan 2008 17:03:45 -0000

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

Change 133558 by imp@imp_paco-paco on 2008/01/18 17:03:31

	Add a needed nop before an 'la' instruction.
	Also, allow AT to be stored in the pcb by telling the compiler that
	we're not using AT at that point in the code.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#4 edit

Differences ...

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

@@ -453,7 +453,10 @@
 	mtlo	t0
 	mthi	t1
 	RESTORE_U_PCB_REG(a0, PC, a1)
+	.set	push
+	.set	noat
 	RESTORE_U_PCB_REG(AT, AST, a1)
+	.set	pop
 	RESTORE_U_PCB_REG(v0, V0, a1)
 	dmtc0	a0, COP_0_EXC_PC	# set return address
 
@@ -658,6 +661,7 @@
 	jalr	s0
 	nop
 	beq	s2, zero, 4f
+	nop
 	la	s0, _C_LABEL(ast)
 	jalr	s0
 	addu	a0, s3, U_PCB_REGS	# only arg is frame