From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 11:36:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEA88106567D; Tue, 28 Oct 2008 11:36:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A183E1065679
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:36:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 916038FC0C
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:36:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBatY8098153
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:36:55 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBatKU098151
	for perforce@freebsd.org; Tue, 28 Oct 2008 11:36:55 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Tue, 28 Oct 2008 11:36:55 GMT
Message-Id: <200810281136.m9SBatKU098151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152094 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: Tue, 28 Oct 2008 11:36:56 -0000

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

Change 152094 by peter@peter_overcee on 2008/10/28 11:36:10

	Fix (?) mmap offset truncation.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#3 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#3 (text+ko) ====

@@ -159,11 +159,14 @@
         || defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
    res = VG_(do_syscall6)(__NR_mmap, (UWord)start, length, 
                          prot, flags, fd, offset);
-#  elif defined(VGO_freebsd)
+#  elif defined(VGP_x86_freebsd)
+   if (flags & VKI_MAP_ANONYMOUS && fd == 0)
+      fd = -1;
+   res = VG_(do_syscall8)(__NR_mmap, (UWord)start, length,
+			  prot, flags, fd, 0, offset, offset >> 32ul);
+#  elif defined(VGP_amd64_freebsd)
    if (flags & VKI_MAP_ANONYMOUS && fd == 0)
       fd = -1;
-   // AAA: fix 64 bit start
-   // QQQ: truncates to 32 bit offset!!
    res = VG_(do_syscall7)(__NR_mmap, (UWord)start, length,
 			  prot, flags, fd, 0, offset);
 #  else