From owner-p4-projects@FreeBSD.ORG  Fri Mar 14 04:07:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB3301065671; Fri, 14 Mar 2008 04:07:49 +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 6A136106566C
	for <perforce@freebsd.org>; Fri, 14 Mar 2008 04:07:49 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 552358FC15
	for <perforce@freebsd.org>; Fri, 14 Mar 2008 04:07:49 +0000 (UTC)
	(envelope-from marcel@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 m2E47nSC080756
	for <perforce@freebsd.org>; Fri, 14 Mar 2008 04:07:49 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E47nBX080754
	for perforce@freebsd.org; Fri, 14 Mar 2008 04:07:49 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 14 Mar 2008 04:07:49 GMT
Message-Id: <200803140407.m2E47nBX080754@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137678 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, 14 Mar 2008 04:07:50 -0000

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

Change 137678 by marcel@marcel_xcllnt on 2008/03/14 04:07:16

	Install rstcode at the EXC_RST vector. It now saves
	some critical information and goes into an infinite
	loop, but will be fleshed out to get the AP into a
	usable state.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#7 edit
.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#3 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/machdep.c#7 (text+ko) ====

@@ -241,6 +241,7 @@
 
 extern char	kernel_text[], _end[];
 
+extern void	*rstcode, *rstsize;
 extern void	*trapcode, *trapsize;
 extern void	*alitrap, *alisize;
 extern void	*dsitrap, *dsisize;
@@ -326,7 +327,7 @@
 	 */
 	mtmsr(mfmsr() & ~(PSL_IR | PSL_DR));
 	isync();
-	bcopy(&trapcode, (void *)EXC_RST,  (size_t)&trapsize);
+	bcopy(&rstcode, (void *)EXC_RST,  (size_t)&rstsize);
 	bcopy(&trapcode, (void *)EXC_MCHK, (size_t)&trapsize);
 	bcopy(&dsitrap,  (void *)EXC_DSI,  (size_t)&dsisize);
 	bcopy(&trapcode, (void *)EXC_ISI,  (size_t)&trapsize);
@@ -343,7 +344,6 @@
 	bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize);
 	bcopy(&trapcode, (void *)EXC_BPT,  (size_t)&trapsize);
 #ifdef KDB
-	bcopy(&dblow,	 (void *)EXC_RST,  (size_t)&dbsize);
 	bcopy(&dblow,	 (void *)EXC_MCHK, (size_t)&dbsize);
 	bcopy(&dblow,   (void *)EXC_PGM,  (size_t)&dbsize);
 	bcopy(&dblow,   (void *)EXC_TRC,  (size_t)&dbsize);

==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#3 (text+ko) ====

@@ -242,6 +242,26 @@
  * (except ISI/DSI, ALI, and the interrupts)
  */
 	.text
+
+	.globl	CNAME(rstcode), CNAME(rstsize)
+CNAME(rstcode):
+	bl	1f
+
+	.long	0
+	.long	0
+	.long	0
+	.long	0
+
+1:
+	mflr	%r3
+	stw	%r3, 0(%r3)
+	stw	%r1, 4(%r3)
+	stw	%r2, 8(%r3)
+	mfmsr	%r4
+	stw	%r4, 12(%r3)
+9:	b	9b
+CNAME(rstsize) = . - CNAME(rstcode)
+
 	.globl	CNAME(trapcode),CNAME(trapsize)
 CNAME(trapcode):
 	mtsprg1	%r1			/* save SP */