commit bc7b4f438d00634e0e150fc2e6e1350342df430c
author nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Jul 26 12:44:35 2004 +0000
committer nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Jul 26 12:44:35 2004 +0000
tree 209b218c9f3185b45d76c8735ca41b4843b27228
parent 361a14e240ee9c0ee79b9e55e51ad94e58cdcc4d

Remove accidental double assignment.  Also don't assume that VG_(client_base)
is zero.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2528 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_main.c

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 9b5bd81..3393ff3 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -506,10 +506,9 @@
    addr_t shadow_size = PGROUNDUP(client_size * ratio);
 
    VG_(client_end)     = VG_(client_base) + client_size;
-   VG_(client_mapbase) = PGROUNDDN((client_size/4)*3); /* where !FIXED mmap goes */
-
    /* where !FIXED mmap goes */
-   VG_(client_mapbase) = PGROUNDDN((addr_t)(client_size * CLIENT_HEAP_PROPORTION)); 
+   VG_(client_mapbase) = VG_(client_base) +
+         PGROUNDDN((addr_t)(client_size * CLIENT_HEAP_PROPORTION));
 
    VG_(shadow_base) = VG_(client_end) + REDZONE_SIZE;
    VG_(shadow_end)  = VG_(shadow_base) + shadow_size;