From: Julian Seward <jseward@acm.org>
Date: Sat, 30 Dec 2006 04:06:15 +0000 (+0000)
Subject: Followup to r6457 (Support 64k pages on ppc32/64-linux) which adds
X-Git-Tag: svn/VALGRIND_3_2_2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18ffad572ffe808744eb0f1fdd683f6af04ba4a;p=thirdparty%2Fvalgrind.git

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 bb69553944..311c9c314e 100644
--- 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 6fecd7c389..3416b944b3 100644
--- 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 b5c9974458..f05d0ae7ff 100644
--- 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