From owner-p4-projects@FreeBSD.ORG  Tue Jul  6 01:29:52 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 35C8D16A4D0; Tue,  6 Jul 2004 01:29:52 +0000 (GMT)
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 07DBE16A4CE
	for <perforce@freebsd.org>; Tue,  6 Jul 2004 01:29:52 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0240643D39
	for <perforce@freebsd.org>; Tue,  6 Jul 2004 01:29:52 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i661Tp7X098547
	for <perforce@freebsd.org>; Tue, 6 Jul 2004 01:29:51 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i661TpIO098544
	for perforce@freebsd.org; Tue, 6 Jul 2004 01:29:51 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 6 Jul 2004 01:29:51 GMT
Message-Id: <200407060129.i661TpIO098544@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>
Subject: PERFORCE change 56563 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 06 Jul 2004 01:29:53 -0000

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

Change 56563 by marcel@marcel_nfs on 2004/07/06 01:29:30

	Get the slot from PSR, not ISR. Getting it from ISR is
	unreliable.

Affected files ...

.. //depot/projects/gdb/sys/ia64/ia64/unwind.c#7 edit

Differences ...

==== //depot/projects/gdb/sys/ia64/ia64/unwind.c#7 (text+ko) ====

@@ -326,7 +326,7 @@
 
 	bsp = tf->tf_special.bspstore + tf->tf_special.ndirty;
 	bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOF(tf->tf_special.cfm));
-	ip = tf->tf_special.iip + ((tf->tf_special.isr >> 41) & 3);
+	ip = tf->tf_special.iip + ((tf->tf_special.psr >> 41) & 3);
 
 	uwxerr = uwx_init_context(rs->env, ip, tf->tf_special.sp, bsp,
 	    tf->tf_special.cfm);
@@ -353,7 +353,7 @@
 
 	bsp = pcb->pcb_special.bspstore;
 	if (pcb->pcb_special.__spare == ~0UL) {
-		ip = pcb->pcb_special.iip + ((pcb->pcb_special.isr >> 41) & 3);
+		ip = pcb->pcb_special.iip + ((pcb->pcb_special.psr >> 41) & 3);
 		cfm = pcb->pcb_special.cfm;
 		bsp += pcb->pcb_special.ndirty;
 	} else {