From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 15:13:17 2006
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 047AF16A4DF; Thu,  3 Aug 2006 15:13:17 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 CFEC216A4DA
	for <perforce@FreeBSD.org>; Thu,  3 Aug 2006 15:13:16 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ADD3E43D45
	for <perforce@FreeBSD.org>; Thu,  3 Aug 2006 15:13:16 +0000 (GMT)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73FDGmi037684
	for <perforce@FreeBSD.org>; Thu, 3 Aug 2006 15:13:16 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73FDG8u037681
	for perforce@freebsd.org; Thu, 3 Aug 2006 15:13:16 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 3 Aug 2006 15:13:16 GMT
Message-Id: <200608031513.k73FDG8u037681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103120 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: Thu, 03 Aug 2006 15:13:17 -0000

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

Change 103120 by gonzo@gonzo_hq on 2006/08/03 15:13:15

	o Disable switching to 64-bit mode in GeneralException code.
	o save_kdbaux should use 4-bytes offset of kdbaux array,
	    not 8 bytes. This was causing memory corruption.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/exception.S#7 edit

Differences ...

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

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#6 $
+ * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#7 $
  */
 
 #include "opt_ddb.h"
@@ -127,8 +127,10 @@
 	jal	save_kdbaux
 	nop
 #endif /* DDB */
+	/*
 	li	t0, MIPS_SR_KX
 	mtc0	t0, MIPS_COP_0_STATUS
+	*/
 
 	/*
 	 * If this is an interrupt, call cpu_intr() with the arguments:
@@ -480,16 +482,16 @@
 	 */
 	la	k0, kdbaux
 	sw	s0, 0x00(k0)
-	sw	s1, 0x08(k0)
-	sw	s2, 0x10(k0)
-	sw	s3, 0x18(k0)
-	sw	s4, 0x20(k0)
-	sw	s5, 0x28(k0)
-	sw	s6, 0x30(k0)
-	sw	s7, 0x38(k0)
-	sw	sp, 0x40(k0)
-	sw	s8, 0x48(k0)
-	sw	gp, 0x50(k0)
+	sw	s1, 0x04(k0)
+	sw	s2, 0x08(k0)
+	sw	s3, 0x0c(k0)
+	sw	s4, 0x10(k0)
+	sw	s5, 0x14(k0)
+	sw	s6, 0x18(k0)
+	sw	s7, 0x1c(k0)
+	sw	sp, 0x20(k0)
+	sw	s8, 0x24(k0)
+	sw	gp, 0x28(k0)
 
 	jr	ra
 	nop