|
From: <sv...@va...> - 2005-09-19 23:35:56
|
Author: sewardj
Date: 2005-09-20 00:35:54 +0100 (Tue, 20 Sep 2005)
New Revision: 4687
Log:
Completely empty out this module in preparation for deleting it.
Modified:
branches/ASPACEM/coregrind/m_libcmman.c
branches/ASPACEM/coregrind/pub_core_libcmman.h
Modified: branches/ASPACEM/coregrind/m_libcmman.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/ASPACEM/coregrind/m_libcmman.c 2005-09-19 23:25:26 UTC (rev =
4686)
+++ branches/ASPACEM/coregrind/m_libcmman.c 2005-09-19 23:35:54 UTC (rev =
4687)
@@ -28,123 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "pub_core_basics.h"
-#include "pub_core_debuginfo.h" // Needed for pub_core_aspacemgr :(
-#include "pub_core_aspacemgr.h"
-#include "pub_core_libcbase.h"
-#include "pub_core_libcassert.h"
-#include "pub_core_libcmman.h"
-#include "pub_core_libcprint.h"
=20
-/* Returns -1 on failure. */
-void* VG_(mmap)( void* start, SizeT length,
- UInt prot, UInt flags, UInt sf_flags, UInt fd, OffT off=
set)
-{
- SysRes res;
=20
- if (!(flags & VKI_MAP_FIXED)) {
- start =3D (void *)VG_(find_map_space)((Addr)start, length, !!(flag=
s & VKI_MAP_CLIENT));
- }
- if (start =3D=3D 0)
- return (void *)-1;
-
- res =3D VG_(mmap_native)(start, length, prot,=20
- (flags | VKI_MAP_FIXED) & ~(VKI_MAP_NOSYMS | V=
KI_MAP_CLIENT),
- fd, offset);
-
- // Check it ended up in the right place.
- if (!res.isError) {
- if (flags & VKI_MAP_CLIENT) {
- vg_assert(VG_(client_base) <=3D res.val=20
- && res.val+length <=3D VG_(client_end));
- } else {
- vg_assert(VG_(valgrind_base) <=3D res.val=20
- && res.val+length-1 <=3D VG_(valgrind_last));
- }
-
- sf_flags |=3D SF_MMAP;
- if ( flags & VKI_MAP_SHARED) sf_flags |=3D SF_SHARED;
- if (!(flags & VKI_MAP_ANONYMOUS)) sf_flags |=3D SF_FILE;
- if (!(flags & VKI_MAP_CLIENT)) sf_flags |=3D SF_VALGRIND;
- if ( flags & VKI_MAP_NOSYMS) sf_flags |=3D SF_NOSYMS;
-
- VG_(map_fd_segment)(res.val, length, prot, sf_flags, fd, offset, N=
ULL);
- }
-
- return res.isError ? (void*)-1 : (void*)res.val;
-}
-
-/* Returns -1 on failure. */
-Int VG_(munmap)( void* start, SizeT length )
-{
- SysRes res =3D VG_(munmap_native)(start, length);
- if (!res.isError) {
- VG_(unmap_range)((Addr)start, length);
- return 0;
- } else {
- return -1;
- }
-}
-
-Int VG_(mprotect)( void *start, SizeT length, UInt prot )
-{
- SysRes res =3D VG_(mprotect_native)(start, length, prot);
- if (!res.isError) {
- VG_(mprotect_range)((Addr)start, length, prot);
- return 0;
- } else {
- return -1;
- }
-}
-
-void* VG_(get_memory_from_mmap) ( SizeT nBytes, Char* who )
-{
- static SizeT tot_alloc =3D 0;
- void* p;
- p =3D VG_(mmap)(0, nBytes,
- VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
- VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS, SF_VALGRIND, -1, 0);
-
- if (p !=3D ((void*)(-1))) {
- vg_assert((void*)VG_(valgrind_base) <=3D p && p <=3D (void*)VG_(va=
lgrind_last));
- tot_alloc +=3D nBytes;
- if (0)
- VG_(printf)(
- "get_memory_from_mmap: %llu tot, %llu req =3D %p .. %p, call=
er %s\n",
- (ULong)tot_alloc, (ULong)nBytes, p, ((char*)p) + nBytes - 1,=
who );
- return p;
- }
-
- VG_(printf)("\n");
- VG_(printf)("VG_(get_memory_from_mmap): %s's request for %llu bytes f=
ailed.\n",
- who, (ULong)nBytes);
- VG_(printf)("VG_(get_memory_from_mmap): %llu bytes already allocated.=
\n",=20
- (ULong)tot_alloc);
- VG_(printf)("\n");
- VG_(printf)("Sorry. You could try using a tool that uses less memory=
;\n");
- VG_(printf)("eg. addrcheck instead of memcheck.\n");
- VG_(printf)("\n");
- VG_(exit)(1);
-}
-
-// Returns 0 on failure.
-Addr VG_(get_memory_from_mmap_for_client) (SizeT len)
-{
- Addr addr;
-
- len =3D VG_PGROUNDUP(len);
-
- addr =3D (Addr)VG_(mmap)(NULL, len,=20
- VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
- VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS|VKI_MAP_CLIE=
NT,
- SF_CORE, -1, 0);
- if ((Addr)-1 !=3D addr)
- return addr;
- else
- return 0;
-}
-
-
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
Modified: branches/ASPACEM/coregrind/pub_core_libcmman.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/ASPACEM/coregrind/pub_core_libcmman.h 2005-09-19 23:25:26 UT=
C (rev 4686)
+++ branches/ASPACEM/coregrind/pub_core_libcmman.h 2005-09-19 23:35:54 UT=
C (rev 4687)
@@ -38,13 +38,6 @@
=20
#include "pub_tool_libcmman.h"
=20
-extern void* VG_(mmap) ( void* start, SizeT length, UInt prot, UInt fl=
ags,
- UInt sf_flags, UInt fd, OffT offset );
-extern Int VG_(munmap) ( void* start, SizeT length );
-extern Int VG_(mprotect) ( void *start, SizeT length, UInt prot );
-
-extern Addr VG_(get_memory_from_mmap_for_client)(SizeT len);
-
#endif // __PUB_CORE_LIBCMMAN_H
=20
/*--------------------------------------------------------------------*/
|