|
From: <sv...@va...> - 2005-06-20 18:03:19
|
Author: sewardj
Date: 2005-06-20 19:03:17 +0100 (Mon, 20 Jun 2005)
New Revision: 3970
Log:
(Re)-drop reliance on <sys/mman.h> and disable ppc32-linux specific
vdso-related mashing until the purpose of it is clarified.
Modified:
trunk/coregrind/m_main.c
Modified: trunk/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
--- trunk/coregrind/m_main.c 2005-06-20 15:51:07 UTC (rev 3969)
+++ trunk/coregrind/m_main.c 2005-06-20 18:03:17 UTC (rev 3970)
@@ -64,7 +64,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/mman.h>
=20
#include "memcheck/memcheck.h"
=20
@@ -291,27 +290,27 @@
vg_assert(!res.isError);
=20
// Make client hole
-#if defined(VGP_ppc32_linux)
- {
- Int ires;
- if (VG_(vdso_end) > VG_(client_base) && VG_(vdso_base) < VG_(client_e=
nd)) {
- if (VG_(client_base) < VG_(vdso_base)) {
- ires =3D munmap((void *)VG_(client_base), VG_(vdso_base) - VG_(cl=
ient_base));
- vg_assert(ires =3D=3D 0);
- }
- if (VG_(vdso_end) < VG_(client_end)) {
- ires =3D munmap((void *)VG_(vdso_end), VG_(client_end) - VG_(vdso=
_end));
- vg_assert(ires =3D=3D 0);
- }
- } else {
- ires =3D munmap((void*)VG_(client_base), client_size);
- vg_assert(ires =3D=3D 0);
- }
- }
-#else
+//zz #if defined(VGP_ppc32_linux)
+//zz {
+//zz Int ires;
+//zz if (VG_(vdso_end) > VG_(client_base) && VG_(vdso_base) < VG_(cli=
ent_end)) {
+//zz if (VG_(client_base) < VG_(vdso_base)) {
+//zz ires =3D munmap((void *)VG_(client_base), VG_(vdso_base) - V=
G_(client_base));
+//zz vg_assert(ires =3D=3D 0);
+//zz }
+//zz if (VG_(vdso_end) < VG_(client_end)) {
+//zz ires =3D munmap((void *)VG_(vdso_end), VG_(client_end) - VG_=
(vdso_end));
+//zz vg_assert(ires =3D=3D 0);
+//zz }
+//zz } else {
+//zz ires =3D munmap((void*)VG_(client_base), client_size);
+//zz vg_assert(ires =3D=3D 0);
+//zz }
+//zz }
+//zz #else
res =3D VG_(munmap_native)((void*)VG_(client_base), client_size);
vg_assert(!res.isError);
-#endif
+//zz #endif
=20
// Map shadow memory.
// Initially all inaccessible, incrementally initialized as it is use=
d
|