From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 13:39:20 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 BDA0916A4E2; Mon, 17 Jul 2006 13:39:20 +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 99E1116A4E0
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 13:39:20 +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 44E0243D4C
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 13:39:20 +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 k6HDdKLL095833
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 13:39:20 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HDdJX8095830
	for perforce@freebsd.org; Mon, 17 Jul 2006 13:39:19 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 17 Jul 2006 13:39:19 GMT
Message-Id: <200607171339.k6HDdJX8095830@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 101762 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: Mon, 17 Jul 2006 13:39:21 -0000

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

Change 101762 by gonzo@gonzo_hq on 2006/07/17 13:38:28

	o Add PC register to pcb block. It is required for detection
	    of breakpoint location in trap handler and for stack 
	    unwinding.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/db_machdep.h#3 edit
.. //depot/projects/mips2/src/sys/mips/include/pcb.h#3 edit
.. //depot/projects/mips2/src/sys/mips/mips/machdep.c#16 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/db_machdep.h#3 (text+ko) ====

@@ -54,7 +54,7 @@
 
 extern db_regs_t	ddb_regs;	/* register state */
 
-#define	PC_REGS()	((db_addr_t)ddb_regs.f_regs[PC])
+#define	PC_REGS()	((db_addr_t)kdb_thrctx->pcb_regs[PCB_REG_PC])
 
 #define PC_ADVANCE() do {						\
 	if ((db_get_value(ddb_regs.f_regs[PC], sizeof(int), FALSE) &	\

==== //depot/projects/mips2/src/sys/mips/include/pcb.h#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * Process Control Block.
  */
 struct pcb {
-	__register_t	pcb_regs[12];
+	__register_t	pcb_regs[13];
 };
 
 #define	PCB_REG_S0	(0)
@@ -49,6 +49,7 @@
 #define	PCB_REG_SP	(9)
 #define	PCB_REG_SR	(10)
 #define	PCB_REG_RA	(11)
+#define	PCB_REG_PC	(12)
 
 #ifdef _KERNEL
 #define	PCB_FSR(pcb)	(0)

==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#16 (text+ko) ====

@@ -193,6 +193,7 @@
 	pcb->pcb_regs[PCB_REG_SR] = tf->tf_regs[TF_SR];
 	pcb->pcb_regs[PCB_REG_RA] = tf->tf_regs[TF_RA];
 	pcb->pcb_regs[PCB_REG_SP] = tf->tf_regs[TF_SP];
+	pcb->pcb_regs[PCB_REG_PC] = tf->tf_regs[TF_EPC];
 }