Merge patch from Jeremy Fitzhardinge:
14-hg-mmap-magic-virgin
This does two things:
1. change the signatures of the new_mem_mmap and change_mem_mprotect
functions to remove the pointless 'nn' argument. This makes them match
the signature of new_mem_startup...
2. change helgrind to mark memory created by mmap as if it were the
same as other magically pre-inited memory. Implement this by pointing
helgrind's new_mem_mmap function at new_mem_startup.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1263 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 42710b0..2484c13 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -889,10 +889,10 @@
static
void memcheck_set_perms (Addr a, UInt len,
- Bool nn, Bool rr, Bool ww, Bool xx)
+ Bool rr, Bool ww, Bool xx)
{
- DEBUG("memcheck_set_perms(%p, %u, nn=%u, rr=%u ww=%u, xx=%u)\n",
- a, len, nn, rr, ww, xx);
+ DEBUG("memcheck_set_perms(%p, %u, rr=%u ww=%u, xx=%u)\n",
+ a, len, rr, ww, xx);
if (rr) SK_(make_readable)(a, len);
else if (ww) SK_(make_writable)(a, len);
else SK_(make_noaccess)(a, len);