From owner-p4-projects@FreeBSD.ORG  Tue Feb 12 12:49:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1EAF16A468; Tue, 12 Feb 2008 12:49:30 +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 6440D16A419
	for <perforce@freebsd.org>; Tue, 12 Feb 2008 12:49:30 +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 4BD8313C4EA
	for <perforce@freebsd.org>; Tue, 12 Feb 2008 12:49:30 +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 m1CCnUlv077491
	for <perforce@freebsd.org>; Tue, 12 Feb 2008 12:49:30 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1CCnTUh077488
	for perforce@freebsd.org; Tue, 12 Feb 2008 12:49:29 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 12 Feb 2008 12:49:29 GMT
Message-Id: <200802121249.m1CCnTUh077488@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 135250 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, 12 Feb 2008 12:49:31 -0000

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

Change 135250 by rrs@rrs-mips2-jnpr on 2008/02/12 12:48:41

	Fix the AST code so that k1 is not used and
	       only k0 to get the pcb, use only a0 and t1
	       which should be saved from the events that led
	       us here. This may still be wrong but with these
	       changes I get through many of the sigaction sets
	       before dying.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#11 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#11 (text+ko) ====

@@ -307,18 +307,18 @@
  * Call ast if required
  */
 #define DO_AST							\
-	GET_CPU_PCPU(k1)					\
-	lw	k1, PC_CURTHREAD(k1);				\
-	lw	t0, TD_FLAGS(k1);				\
+	GET_CPU_PCPU(k0)					\
+	move	a0, k0;						\
+	lw	a0, PC_CURTHREAD(a0);				\
+	lw	t0, TD_FLAGS(a0);			        \
 	and	t0, t0, (TDF_ASTPENDING|TDF_NEEDRESCHED);	\
 	beq	t0, zero, 27f;					\
 	nop;							\
-	lw	k1, TD_FRAME(k1);				\
-	lw	t0, TF_REG_SR(k1);				\
+	lw	a0, TD_FRAME(a0);				\
+	lw	t0, TF_REG_SR(a0);				\
 	and	t0, t0, SR_KSU_USER;				\
 	beq	t0, zero, 27f;					\
 	nop;							\
-	move	a0, k1;						\
 	jal	ast;						\
 	nop;							\
 27: