← Back to branch summary

~bkerensa/ubuntu/raring/valgrind/merge-from-deb

« back to all changes in this revision

Viewing changes to memcheck/mc_main.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-11-16 17:56:30 UTC
  • mfrom: (1.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20061116175630-hatkgajb0twz0upw
Tags: upstream-3.2.1
Import upstream version 3.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
memcheck/mc_main.c
1872
1872
   if (EXPECTED_TAKEN( len == 128 && VG_IS_8_ALIGNED(base) )) {
1873
1873
      /* Now we know the address range is suitably sized and aligned. */
1874
1874
      UWord a_lo = (UWord)(base);
1875
 
      UWord a_hi = (UWord)(base + 127);
 
1875
      UWord a_hi = (UWord)(base + 128 - 1);
1876
1876
      tl_assert(a_lo < a_hi);             // paranoia: detect overflow
1877
1877
      if (a_hi < MAX_PRIMARY_ADDRESS) {
1878
1878
         // Now we know the entire range is within the main primary map.
1907
1907
   }
1908
1908
 
1909
1909
   /* 288 bytes (36 ULongs) is the magic value for ELF ppc64. */
1910
 
   if (EXPECTED_TAKEN( len == 128 && VG_IS_8_ALIGNED(base) )) {
 
1910
   if (EXPECTED_TAKEN( len == 288 && VG_IS_8_ALIGNED(base) )) {
1911
1911
      /* Now we know the address range is suitably sized and aligned. */
1912
1912
      UWord a_lo = (UWord)(base);
1913
 
      UWord a_hi = (UWord)(base + 127);
 
1913
      UWord a_hi = (UWord)(base + 288 - 1);
1914
1914
      tl_assert(a_lo < a_hi);             // paranoia: detect overflow
1915
1915
      if (a_hi < MAX_PRIMARY_ADDRESS) {
1916
1916
         // Now we know the entire range is within the main primary map.