|
From: <sv...@va...> - 2005-06-29 08:46:33
|
Author: sewardj
Date: 2005-06-29 09:46:30 +0100 (Wed, 29 Jun 2005)
New Revision: 4051
Log:
Get rid of some VDSO finding stuff which was ifdef VGP_ppc32_linux but
apparently pointless as per recent mail from PaulM since ppc32-linux
does not use VDSOs yet.
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-29 04:02:24 UTC (rev 4050)
+++ trunk/coregrind/m_main.c 2005-06-29 08:46:30 UTC (rev 4051)
@@ -126,8 +126,6 @@
/* From the aux vector */
Int VG_(cache_line_size);
UInt VG_(hardware_capabilities);
-Addr VG_(vdso_base);
-Addr VG_(vdso_end);
#endif
=20
=20
@@ -154,24 +152,6 @@
=20
=20
/*=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=3D*/
-/*=3D=3D=3D Miscellaneous global functions =
=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=3D=3D=3D=3D*/
-
-#if defined(VGP_ppc32_linux)
-/* Used in scanning /proc/pid/maps for the VDSO */
-static int find_vdso(char *start, char *end, const char *perm,
- off_t offset, int maj, int min, int ino, void *extra)
-{
- if ((Addr)start !=3D VG_(vdso_base))
- return 1; /* keep looking */
- /* found it */
- VG_(vdso_end) =3D (Addr)end;
- return 0;
-}
-#endif
-
-
-/*=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=3D*/
/*=3D=3D=3D Check we were launched by stage 1 =
=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=3D=3D=3D=3D*/
=20
@@ -215,12 +195,6 @@
VG_(valgrind_base) =3D VG_PGROUNDDN(auxv->u.a_val);
break;
=20
-#if defined(VGP_ppc32_linux)
- case AT_SYSINFO_EHDR:
- VG_(vdso_base) =3D auxv->u.a_val;
- VG_(foreach_map)(find_vdso, NULL);
- break;
-#endif
}
=20
if ( found !=3D (1|2) ) {
@@ -294,27 +268,8 @@
vg_assert(!res.isError);
=20
// Make client hole
-//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);
-//zz #endif
=20
// Map shadow memory.
// Initially all inaccessible, incrementally initialized as it is use=
d
|