From owner-p4-projects@FreeBSD.ORG  Mon Apr 21 23:06:46 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 757CF37B404; Mon, 21 Apr 2003 23:06:45 -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 15A6437B401
	for <perforce@freebsd.org>; Mon, 21 Apr 2003 23:06:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B3DBF43F75
	for <perforce@freebsd.org>; Mon, 21 Apr 2003 23:06:44 -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 h3M66i0U015749
	for <perforce@freebsd.org>; Mon, 21 Apr 2003 23:06:44 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3M66ifr015744
	for perforce@freebsd.org; Mon, 21 Apr 2003 23:06:44 -0700 (PDT)
Date: Mon, 21 Apr 2003 23:06:44 -0700 (PDT)
Message-Id: <200304220606.h3M66ifr015744@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 29388 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, 22 Apr 2003 06:06:46 -0000

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

Change 29388 by marcel@marcel_nfs on 2003/04/21 23:06:34

	Fix 2 brainos relating NaT collections:
	o  Nat collections happen when the lower 9 bits are 0x1f8, not
	   0x1e8. We probably need to use a macro for this.
	o  To see if we have a NaT collection interleaving the syscall
	   arguments, check if the RSE backing store pointer is nargs
	   registers worth of bytes not 64 (=8 registers worth of bytes).

Affected files ...

.. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#13 edit

Differences ...

==== //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#13 (text+ko) ====

@@ -888,10 +888,10 @@
 	tfp = &tf->tf_scratch.gr16;
 	nargs = tf->tf_special.cfm & 0x7f;
 	bsp = (uint64_t*)(curthread->td_kstack + tf->tf_special.ndirty);
-	bsp -= (((uintptr_t)bsp & 0x1ff) < 64) ? (nargs + 1): nargs;
+	bsp -= (((uintptr_t)bsp & 0x1ff) < (nargs << 3)) ? (nargs + 1): nargs;
 	while (nargs--) {
 		*tfp++ = *bsp++;
-		if (((uintptr_t)bsp & 0x1ff) == 0x1e8)
+		if (((uintptr_t)bsp & 0x1ff) == 0x1f8)
 			bsp++;
 	}
 	error = syscall(tf->tf_scratch.gr15, &tf->tf_scratch.gr16, tf);