From owner-p4-projects@FreeBSD.ORG  Thu May  8 23:40:52 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EFC737B405; Thu,  8 May 2003 23:40:51 -0700 (PDT)
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 357AD37B404
	for <perforce@freebsd.org>; Thu,  8 May 2003 23:40:51 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9598043F85
	for <perforce@freebsd.org>; Thu,  8 May 2003 23:40:50 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h496eo0U024790
	for <perforce@freebsd.org>; Thu, 8 May 2003 23:40:50 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h496eoca024787
	for perforce@freebsd.org; Thu, 8 May 2003 23:40:50 -0700 (PDT)
Date: Thu, 8 May 2003 23:40:50 -0700 (PDT)
Message-Id: <200305090640.h496eoca024787@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 30839 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: Fri, 09 May 2003 06:40:53 -0000

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

Change 30839 by marcel@marcel_nfs on 2003/05/08 23:40:17

	Fix the calculation of the number of nat collections between BSP
	and BSP-regs. The regs term is in bytes...

Affected files ...

.. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#7 edit

Differences ...

==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#7 (text+ko) ====

@@ -235,7 +235,7 @@
 	bsp = ddb_regs.tf_special.bspstore + ddb_regs.tf_special.ndirty;
 	regno = (db_expr_t)vp->valuep - 32;
 	sof = ddb_regs.tf_special.cfm & 0x7f;
-	nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63;
+	nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63;
 
 	reg = (void*)(bsp - ((sof - regno + nats) << 3));
 
@@ -469,7 +469,7 @@
 		bsp = regs->tf_special.bspstore + regs->tf_special.ndirty;
 		regno -= 32;
 		sof = regs->tf_special.cfm & 0x7f;
-		nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63;
+		nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63;
 		rsp = (void*)(bsp - ((sof - regno + nats) << 3));
 		if (regno < sof)
 			return (*rsp);