Followup to r6457 (Support 64k pages on ppc32/64-linux) which adds

some assertions and then fixes definitions accordingly.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index bb695539449bc9850ae7140e01e6e807ad468f56..311c9c314e0d2031d4df4b5ff574c76995acbe8c 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -2041,6 +2041,8 @@ Int main(Int argc, HChar **argv, HChar **envp)
    vg_assert(VKI_PAGE_SIZE     == 4096 || VKI_PAGE_SIZE     == 65536);
    vg_assert(VKI_MAX_PAGE_SIZE == 4096 || VKI_MAX_PAGE_SIZE == 65536);
    vg_assert(VKI_PAGE_SIZE <= VKI_MAX_PAGE_SIZE);
+   vg_assert(VKI_PAGE_SIZE     == (1 << VKI_PAGE_SHIFT));
+   vg_assert(VKI_MAX_PAGE_SIZE == (1 << VKI_MAX_PAGE_SHIFT));
    clstack_top = VG_(am_startup)( sp_at_startup );
    VG_(debugLog)(1, "main", "Address space manager is running\n");
 
@@ -2988,11 +2990,11 @@ void _start_in_C ( UWord* pArgc )
       while (*sp++ != 0);
       for (; *sp != AT_NULL && *sp != AT_PAGESZ; sp += 2);
       if (*sp == AT_PAGESZ) {
-        VKI_PAGE_SIZE = sp[1];
-        for (VKI_PAGE_SHIFT = 12;
-             VKI_PAGE_SHIFT <= VKI_MAX_PAGE_SHIFT; VKI_PAGE_SHIFT++)
-           if (VKI_PAGE_SIZE == (1UL << VKI_PAGE_SHIFT))
-              break;
+         VKI_PAGE_SIZE = sp[1];
+         for (VKI_PAGE_SHIFT = 12;
+              VKI_PAGE_SHIFT <= VKI_MAX_PAGE_SHIFT; VKI_PAGE_SHIFT++)
+            if (VKI_PAGE_SIZE == (1UL << VKI_PAGE_SHIFT))
+         break;
       }
    }
 #  endif

diff --git a/include/vki-ppc32-linux.h b/include/vki-ppc32-linux.h
index 6fecd7c38918e4488d4bb51a5b8c9782d9483254..3416b944b3a48edf57f8d30c09c3c8238c235a05 100644 (file)
--- a/include/vki-ppc32-linux.h
+++ b/include/vki-ppc32-linux.h
@@ -65,7 +65,7 @@ typedef struct {
    page size might vary between 32-bit and 64-bit ppc kernels */
 extern unsigned long VKI_PAGE_SHIFT, VKI_PAGE_SIZE;
 #define VKI_MAX_PAGE_SHIFT     16
-#define VKI_MAX_PAGE_SIZE      (1UL << VKI_PAGE_SHIFT)
+#define VKI_MAX_PAGE_SIZE      (1UL << VKI_MAX_PAGE_SHIFT)
 
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-ppc/signal.h

diff --git a/include/vki-ppc64-linux.h b/include/vki-ppc64-linux.h
index b5c99744588d298e86888c2dfcb23ad7d14ff414..f05d0ae7fffe575999b2a2ae442bbbf6bee3bb3d 100644 (file)
--- a/include/vki-ppc64-linux.h
+++ b/include/vki-ppc64-linux.h
@@ -66,7 +66,7 @@ typedef unsigned int vki_u32;
    page size might vary between 32-bit and 64-bit ppc kernels */
 extern unsigned long VKI_PAGE_SHIFT, VKI_PAGE_SIZE;
 #define VKI_MAX_PAGE_SHIFT     16
-#define VKI_MAX_PAGE_SIZE      (1UL << VKI_PAGE_SHIFT)
+#define VKI_MAX_PAGE_SIZE      (1UL << VKI_MAX_PAGE_SHIFT)
 
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/signal.h