From owner-p4-projects@FreeBSD.ORG  Thu Sep  3 22:00:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E236610656A3; Thu,  3 Sep 2009 22:00:31 +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 A781E1065697
	for <perforce@freebsd.org>; Thu,  3 Sep 2009 22:00:31 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 96A518FC1B
	for <perforce@freebsd.org>; Thu,  3 Sep 2009 22:00:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n83M0Vqh040803
	for <perforce@freebsd.org>; Thu, 3 Sep 2009 22:00:31 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n83M0VUh040800
	for perforce@freebsd.org; Thu, 3 Sep 2009 22:00:31 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 3 Sep 2009 22:00:31 GMT
Message-Id: <200909032200.n83M0VUh040800@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168130 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: Thu, 03 Sep 2009 22:00:32 -0000

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

Change 168130 by stas@stas_orion on 2009/09/03 21:59:37

	- Track changes in the address space by implementing mprotect(2) handler.
	  This fixes excessive FP in memchek on HEAD.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_main.c#4 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_main.c#4 (text+ko) ====

@@ -1606,7 +1606,6 @@
    make_mem_undefined_w_tid_and_okind ( a, len, tid, MC_OKIND_UNKNOWN );
 }
 
-
 void MC_(make_mem_defined) ( Addr a, SizeT len )
 {
    PROF_EVENT(42, "MC_(make_mem_defined)");
@@ -1636,6 +1635,15 @@
    }
 }
 
+/* Track changes in the virtual memory space. */
+static void track_perms_change( Addr a, SizeT len,
+                      Bool rr, Bool ww, Bool xx )
+{
+   if (!(rr || ww))
+      MC_(make_mem_noaccess) ( a, len );
+   MC_(make_mem_defined) ( a, len );
+}
+
 
 /* --- Block-copy permissions (needed for implementing realloc() and
        sys_mremap). --- */
@@ -5806,7 +5814,7 @@
    // happen if the program catches the signal, though, which is bad.  If we
    // had two A bits (for readability and writability) that were completely
    // distinct from V bits, then we could handle all this properly.
-   VG_(track_change_mem_mprotect) ( NULL );
+   VG_(track_change_mem_mprotect) ( track_perms_change );
       
    VG_(track_die_mem_stack_signal)( MC_(make_mem_noaccess) ); 
    VG_(track_die_mem_brk)         ( MC_(make_mem_noaccess) );