|
From: <sv...@va...> - 2006-12-01 02:35:08
|
Author: sewardj
Date: 2006-12-01 02:35:02 +0000 (Fri, 01 Dec 2006)
New Revision: 6375
Log:
When being an 'inner valgrind' on 64-bit platforms, ensure the stack
is allocated below the magic 32G mark as it would be normally.
Modified:
trunk/coregrind/m_aspacemgr/aspacemgr-linux.c
Modified: trunk/coregrind/m_aspacemgr/aspacemgr-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_aspacemgr/aspacemgr-linux.c 2006-11-28 00:15:35 UTC=
(rev 6374)
+++ trunk/coregrind/m_aspacemgr/aspacemgr-linux.c 2006-12-01 02:35:02 UTC=
(rev 6375)
@@ -1545,7 +1545,10 @@
# if VG_WORDSIZE =3D=3D 8
aspacem_maxAddr =3D (Addr)0x800000000 - 1; // 32G
# ifdef ENABLE_INNER
- aspacem_maxAddr =3D VG_PGROUNDDN( sp_at_startup ) - 1;
+ { Addr cse =3D VG_PGROUNDDN( sp_at_startup ) - 1;
+ if (aspacem_maxAddr > cse)
+ aspacem_maxAddr =3D cse;
+ }
# endif
# else
aspacem_maxAddr =3D VG_PGROUNDDN( sp_at_startup ) - 1;
|