|
From: <sv...@va...> - 2005-05-11 18:51:56
|
Author: njn
Date: 2005-05-11 19:51:53 +0100 (Wed, 11 May 2005)
New Revision: 3662
Modified:
trunk/coregrind/core.h
trunk/coregrind/m_replacemalloc/vg_replace_malloc.c
trunk/coregrind/pub_core_replacemalloc.h
Log:
Move declaration of "struct vg_mallocfunc_info" from core.h into
pub_core_replacemalloc.h, to reduce its exposure.
Modified: trunk/coregrind/core.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
--- trunk/coregrind/core.h 2005-05-11 18:48:33 UTC (rev 3661)
+++ trunk/coregrind/core.h 2005-05-11 18:51:53 UTC (rev 3662)
@@ -379,24 +379,6 @@
#define VG_WRAPPER_ALIAS(name) "_vgw_" #name
=20
=20
-struct vg_mallocfunc_info {
- /* things vg_replace_malloc.o needs to know about */
- void* (*tl_malloc) (ThreadId tid, SizeT n);
- void* (*tl___builtin_new) (ThreadId tid, SizeT n);
- void* (*tl___builtin_vec_new) (ThreadId tid, SizeT n);
- void* (*tl_memalign) (ThreadId tid, SizeT align, SizeT n);
- void* (*tl_calloc) (ThreadId tid, SizeT nmemb, SizeT n);
- void (*tl_free) (ThreadId tid, void* p);
- void (*tl___builtin_delete) (ThreadId tid, void* p);
- void (*tl___builtin_vec_delete)(ThreadId tid, void* p);
- void* (*tl_realloc) (ThreadId tid, void* p, SizeT size);
-
- SizeT (*arena_payload_szB) (ArenaId aid, void* payload);
-
- Bool clo_trace_malloc;
-};
-
-
/* ---------------------------------------------------------------------
Exports of vg_scheduler.c
------------------------------------------------------------------ */
Modified: trunk/coregrind/m_replacemalloc/vg_replace_malloc.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_replacemalloc/vg_replace_malloc.c 2005-05-11 18:48:=
33 UTC (rev 3661)
+++ trunk/coregrind/m_replacemalloc/vg_replace_malloc.c 2005-05-11 18:51:=
53 UTC (rev 3662)
@@ -47,6 +47,7 @@
=20
#include "valgrind.h" /* for VALGRIND_NON_SIMD_CALL[12] */
#include "core.h"
+#include "pub_core_replacemalloc.h"
=20
/* The general idea is: you can write a function like this:
=20
Modified: trunk/coregrind/pub_core_replacemalloc.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
--- trunk/coregrind/pub_core_replacemalloc.h 2005-05-11 18:48:33 UTC (rev=
3661)
+++ trunk/coregrind/pub_core_replacemalloc.h 2005-05-11 18:51:53 UTC (rev=
3662)
@@ -36,11 +36,24 @@
// replace malloc/free with their own versions.
//--------------------------------------------------------------------
=20
-// Nb: there are no exports in this header; all exports for this module
-// are in include/pub_tool_replacemalloc.h
-
#include "pub_tool_replacemalloc.h"
=20
+// things vg_replace_malloc.o needs to know about
+struct vg_mallocfunc_info {
+ void* (*tl_malloc) (ThreadId tid, SizeT n);
+ void* (*tl___builtin_new) (ThreadId tid, SizeT n);
+ void* (*tl___builtin_vec_new) (ThreadId tid, SizeT n);
+ void* (*tl_memalign) (ThreadId tid, SizeT align, SizeT n);
+ void* (*tl_calloc) (ThreadId tid, SizeT nmemb, SizeT n);
+ void (*tl_free) (ThreadId tid, void* p);
+ void (*tl___builtin_delete) (ThreadId tid, void* p);
+ void (*tl___builtin_vec_delete)(ThreadId tid, void* p);
+ void* (*tl_realloc) (ThreadId tid, void* p, SizeT size);
+
+ SizeT (*arena_payload_szB) (ArenaId aid, void* payload);
+ Bool clo_trace_malloc;
+};
+
#endif // __PUB_CORE_REPLACEMALLOC_H
=20
/*--------------------------------------------------------------------*/
|