|
From: <sv...@va...> - 2006-12-30 04:06:18
|
Author: sewardj
Date: 2006-12-30 04:06:15 +0000 (Sat, 30 Dec 2006)
New Revision: 6458
Log:
Followup to r6457 (Support 64k pages on ppc32/64-linux) which adds
some assertions and then fixes definitions accordingly.
Modified:
branches/VALGRIND_3_2_BRANCH/coregrind/m_main.c
branches/VALGRIND_3_2_BRANCH/include/vki-ppc32-linux.h
branches/VALGRIND_3_2_BRANCH/include/vki-ppc64-linux.h
Modified: branches/VALGRIND_3_2_BRANCH/coregrind/m_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
--- branches/VALGRIND_3_2_BRANCH/coregrind/m_main.c 2006-12-30 02:46:07 U=
TC (rev 6457)
+++ branches/VALGRIND_3_2_BRANCH/coregrind/m_main.c 2006-12-30 04:06:15 U=
TC (rev 6458)
@@ -2041,6 +2041,8 @@
vg_assert(VKI_PAGE_SIZE =3D=3D 4096 || VKI_PAGE_SIZE =3D=3D 6=
5536);
vg_assert(VKI_MAX_PAGE_SIZE =3D=3D 4096 || VKI_MAX_PAGE_SIZE =3D=3D 6=
5536);
vg_assert(VKI_PAGE_SIZE <=3D VKI_MAX_PAGE_SIZE);
+ vg_assert(VKI_PAGE_SIZE =3D=3D (1 << VKI_PAGE_SHIFT));
+ vg_assert(VKI_MAX_PAGE_SIZE =3D=3D (1 << VKI_MAX_PAGE_SHIFT));
clstack_top =3D VG_(am_startup)( sp_at_startup );
VG_(debugLog)(1, "main", "Address space manager is running\n");
=20
@@ -2988,11 +2990,11 @@
while (*sp++ !=3D 0);
for (; *sp !=3D AT_NULL && *sp !=3D AT_PAGESZ; sp +=3D 2);
if (*sp =3D=3D AT_PAGESZ) {
- VKI_PAGE_SIZE =3D sp[1];
- for (VKI_PAGE_SHIFT =3D 12;
- VKI_PAGE_SHIFT <=3D VKI_MAX_PAGE_SHIFT; VKI_PAGE_SHIFT++)
- if (VKI_PAGE_SIZE =3D=3D (1UL << VKI_PAGE_SHIFT))
- break;
+ VKI_PAGE_SIZE =3D sp[1];
+ for (VKI_PAGE_SHIFT =3D 12;
+ VKI_PAGE_SHIFT <=3D VKI_MAX_PAGE_SHIFT; VKI_PAGE_SHIFT++)
+ if (VKI_PAGE_SIZE =3D=3D (1UL << VKI_PAGE_SHIFT))
+ break;
}
}
# endif
Modified: branches/VALGRIND_3_2_BRANCH/include/vki-ppc32-linux.h
=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
--- branches/VALGRIND_3_2_BRANCH/include/vki-ppc32-linux.h 2006-12-30 02:=
46:07 UTC (rev 6457)
+++ branches/VALGRIND_3_2_BRANCH/include/vki-ppc32-linux.h 2006-12-30 04:=
06:15 UTC (rev 6458)
@@ -65,7 +65,7 @@
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)
=20
//----------------------------------------------------------------------
// From linux-2.6.9/include/asm-ppc/signal.h
Modified: branches/VALGRIND_3_2_BRANCH/include/vki-ppc64-linux.h
=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
--- branches/VALGRIND_3_2_BRANCH/include/vki-ppc64-linux.h 2006-12-30 02:=
46:07 UTC (rev 6457)
+++ branches/VALGRIND_3_2_BRANCH/include/vki-ppc64-linux.h 2006-12-30 04:=
06:15 UTC (rev 6458)
@@ -66,7 +66,7 @@
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)
=20
//----------------------------------------------------------------------
// From linux-2.6.13/include/asm-ppc64/signal.h
|