From owner-p4-projects@FreeBSD.ORG  Sat Jul 10 17:07:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC7DF16A4D0; Sat, 10 Jul 2004 17:07:23 +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 9173E16A4CE
	for <perforce@freebsd.org>; Sat, 10 Jul 2004 17:07:23 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E07E43D3F
	for <perforce@freebsd.org>; Sat, 10 Jul 2004 17:07:23 +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 i6AH7Nqb032351
	for <perforce@freebsd.org>; Sat, 10 Jul 2004 17:07:23 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6AH7NFA032348
	for perforce@freebsd.org; Sat, 10 Jul 2004 17:07:23 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 10 Jul 2004 17:07:23 GMT
Message-Id: <200407101707.i6AH7NFA032348@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 56971 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: Sat, 10 Jul 2004 17:07:24 -0000

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

Change 56971 by marcel@marcel_nfs on 2004/07/10 17:07:21

	Fix braino: The BSP is after the frame on interruption (because
	we need to preserve the out registers and do so with a cover),
	but only after the locals on a context switch (the out registers
	are are the locals (=inputs) to swapctx() and don't need to be
	preserved).
	Adjust BSP accordingly.

Affected files ...

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

Differences ...

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

@@ -356,11 +356,12 @@
 		ip = pcb->pcb_special.iip + ((pcb->pcb_special.psr >> 41) & 3);
 		cfm = pcb->pcb_special.cfm;
 		bsp += pcb->pcb_special.ndirty;
+		bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOF(cfm));
 	} else {
 		ip = pcb->pcb_special.rp;
 		cfm = pcb->pcb_special.pfs;
+		bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOL(cfm));
 	}
-	bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOL(cfm));
 	uwxerr = uwx_init_context(rs->env, ip, pcb->pcb_special.sp, bsp, cfm);
 
 	return ((uwxerr) ? EINVAL : 0);		/* XXX */