|
From: <sv...@va...> - 2006-06-16 21:39:14
|
Author: sewardj
Date: 2006-06-16 22:39:08 +0100 (Fri, 16 Jun 2006)
New Revision: 5973
Log:
Fix copy-n-paste error to do with ppc64-linux stack redzone handling
(from r5791).
Modified:
trunk/memcheck/mc_main.c
Modified: trunk/memcheck/mc_main.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/memcheck/mc_main.c 2006-06-09 11:44:03 UTC (rev 5972)
+++ trunk/memcheck/mc_main.c 2006-06-16 21:39:08 UTC (rev 5973)
@@ -1872,7 +1872,7 @@
if (EXPECTED_TAKEN( len =3D=3D 128 && VG_IS_8_ALIGNED(base) )) {
/* Now we know the address range is suitably sized and aligned. */
UWord a_lo =3D (UWord)(base);
- UWord a_hi =3D (UWord)(base + 127);
+ UWord a_hi =3D (UWord)(base + 128 - 1);
tl_assert(a_lo < a_hi); // paranoia: detect overflow
if (a_hi < MAX_PRIMARY_ADDRESS) {
// Now we know the entire range is within the main primary map.
@@ -1907,10 +1907,10 @@
}
=20
/* 288 bytes (36 ULongs) is the magic value for ELF ppc64. */
- if (EXPECTED_TAKEN( len =3D=3D 128 && VG_IS_8_ALIGNED(base) )) {
+ if (EXPECTED_TAKEN( len =3D=3D 288 && VG_IS_8_ALIGNED(base) )) {
/* Now we know the address range is suitably sized and aligned. */
UWord a_lo =3D (UWord)(base);
- UWord a_hi =3D (UWord)(base + 127);
+ UWord a_hi =3D (UWord)(base + 288 - 1);
tl_assert(a_lo < a_hi); // paranoia: detect overflow
if (a_hi < MAX_PRIMARY_ADDRESS) {
// Now we know the entire range is within the main primary map.
|