From owner-p4-projects@FreeBSD.ORG  Thu Jan 31 07:41:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E01016A419; Thu, 31 Jan 2008 07:41:04 +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 2B1E516A417
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:41:04 +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 12BDA13C442
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:41:04 +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 m0V7f3XK079735
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:41:03 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V7f3TI079732
	for perforce@freebsd.org; Thu, 31 Jan 2008 07:41:03 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 31 Jan 2008 07:41:03 GMT
Message-Id: <200801310741.m0V7f3TI079732@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 134534 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, 31 Jan 2008 07:41:04 -0000

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

Change 134534 by imp@imp_lighthouse on 2008/01/31 07:40:11

	Make sure that frame.h and regnum.h match.  There were two registers
	defiend in regnum.h that weren't in frame.h, which meant we were
	overwriting the FPU part of the frame structure.  Since we had
	CPU_NOFPU defined, this didn't matter...  It is still a bug and
	the down side of doing things the juniper way in frame.h.  It
	looks prettier elsewere...

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#4 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#4 edit

Differences ...

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

@@ -79,8 +79,12 @@
 	/*
 	 * FREEBSD_DEVELOPERS_FIXME:
 	 * Include any other registers which are CPU-Specific and
-	 * need to be part of the frame here
+	 * need to be part of the frame here.
+	 * 
+	 * Also, be sure this matches what is defined in regnum.h
 	 */
+	register_t	ic;	/* RM7k and RM9k specific */
+	register_t	dummy;	/* Alignment for 32-bit case */
 
 /* From here and on, only saved user processes. */
 
@@ -117,6 +121,12 @@
 	f_register_t	f30;
 	f_register_t	f31;
 	register_t	fsr;
+
+	/*
+	 * COP2 registers may need to be saved here based on the CPU, and those
+	 * might need to be per process, or even for the kernel, so we need
+	 * some thought here.
+	 */
 };
 
 /* REVISIT */

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

@@ -48,7 +48,7 @@
 
 /*
  * Location of the saved registers relative to ZERO.
- * Usage is p->p_regs[XX].
+ * This must match struct trapframe defined in frame.h exactly.
  */
 #define	ZERO	0
 #define	AST	1