From owner-p4-projects@FreeBSD.ORG  Thu Jan  3 03:45:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B54316A420; Thu,  3 Jan 2008 03:45:17 +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 6052316A417
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 03:45:17 +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 4FCC313C457
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 03:45:17 +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 m033jGYH042256
	for <perforce@freebsd.org>; Thu, 3 Jan 2008 03:45:16 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m033jGqG042251
	for perforce@freebsd.org; Thu, 3 Jan 2008 03:45:16 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 3 Jan 2008 03:45:16 GMT
Message-Id: <200801030345.m033jGqG042251@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 132364 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 Jan 2008 03:45:18 -0000

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

Change 132364 by imp@imp_paco-paco on 2008/01/03 03:44:50

	Get stack_machdep.c building.  This was never in the jnpr port,
	so we needed to translate the differing trapframe format between
	that port and the mips2 port.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/stack_machdep.c#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/stack_machdep.c#2 (text+ko) ====

@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -38,8 +39,6 @@
 #include <machine/pcb.h>
 #include <machine/regnum.h>
 
-extern char btext[];
-
 static u_register_t
 stack_register_fetch(u_register_t sp, u_register_t stack_pos)
 {
@@ -135,8 +134,8 @@
 	if (TD_IS_RUNNING(td))
 		panic("stack_save_td: running");
 
-	pc = td->td_pcb->pcb_regs[PCB_REG_PC];
-	sp = td->td_pcb->pcb_regs[PCB_REG_SP];
+	pc = td->td_pcb->pcb_regs.pc;
+	sp = td->td_pcb->pcb_regs.sp;
 	stack_capture(st, pc, sp);
 }
 
@@ -148,7 +147,7 @@
 	if (curthread == NULL)
 		panic("stack_save: curthread == NULL)");
 
-	pc = curthread->td_pcb->pcb_regs[PCB_REG_PC];
-	sp = curthread->td_pcb->pcb_regs[PCB_REG_SP];
+	pc = curthread->td_pcb->pcb_regs.pc;
+	sp = curthread->td_pcb->pcb_regs.sp;
 	stack_capture(st, pc, sp);
 }