From: Julian Seward <jseward@acm.org>
Date: Mon, 28 Aug 2006 11:57:21 +0000 (+0000)
Subject: Merge r5973 (fix for: ppc64-linux stack RZ fast-case snafu)
X-Git-Tag: svn/VALGRIND_3_2_1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecf3fbfe4b655e5f43e209ce26caa0f2f4c91ab5;p=thirdparty%2Fvalgrind.git

Merge r5973 (fix for: ppc64-linux stack RZ fast-case snafu)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6014
---

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 0d297eaca7..0e3096f98c 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -1872,7 +1872,7 @@ void MC_(helperc_MAKE_STACK_UNINIT) ( Addr base, UWord len )
    if (EXPECTED_TAKEN( len == 128 && VG_IS_8_ALIGNED(base) )) {
       /* Now we know the address range is suitably sized and aligned. */
       UWord a_lo = (UWord)(base);
-      UWord a_hi = (UWord)(base + 127);
+      UWord a_hi = (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 @@ void MC_(helperc_MAKE_STACK_UNINIT) ( Addr base, UWord len )
    }
 
    /* 288 bytes (36 ULongs) is the magic value for ELF ppc64. */
-   if (EXPECTED_TAKEN( len == 128 && VG_IS_8_ALIGNED(base) )) {
+   if (EXPECTED_TAKEN( len == 288 && VG_IS_8_ALIGNED(base) )) {
       /* Now we know the address range is suitably sized and aligned. */
       UWord a_lo = (UWord)(base);
-      UWord a_hi = (UWord)(base + 127);
+      UWord a_hi = (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.