|
From: <sv...@va...> - 2013-09-02 13:36:34
|
sewardj 2013-09-02 13:36:25 +0000 (Mon, 02 Sep 2013)
New Revision: 13525
Log:
MacOS only: fix somee compiler complaints about casting from pointers
and integers of a different size.
Modified files:
trunk/coregrind/m_replacemalloc/vg_replace_malloc.c
Modified: trunk/coregrind/m_replacemalloc/vg_replace_malloc.c (+7 -7)
===================================================================
--- trunk/coregrind/m_replacemalloc/vg_replace_malloc.c 2013-09-02 13:07:16 +00:00 (rev 13524)
+++ trunk/coregrind/m_replacemalloc/vg_replace_malloc.c 2013-09-02 13:36:25 +00:00 (rev 13525)
@@ -241,7 +241,7 @@
void* v; \
\
DO_INIT; \
- trigger_memcheck_error_if_undefined((ULong) zone); \
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone); \
trigger_memcheck_error_if_undefined((ULong) n); \
MALLOC_TRACE(#fnname "(%p, %llu)", zone, (ULong)n ); \
\
@@ -443,7 +443,7 @@
void VG_REPLACE_FUNCTION_EZU(10040,soname,fnname) (void *zone, void *p) \
{ \
DO_INIT; \
- trigger_memcheck_error_if_undefined((ULong) zone); \
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone); \
MALLOC_TRACE(#fnname "(%p, %p)\n", zone, p ); \
if (p == NULL) \
return; \
@@ -577,7 +577,7 @@
void* v; \
\
DO_INIT; \
- trigger_memcheck_error_if_undefined((ULong) zone); \
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone); \
trigger_memcheck_error_if_undefined((ULong) nmemb); \
trigger_memcheck_error_if_undefined((ULong) size); \
MALLOC_TRACE("zone_calloc(%p, %llu,%llu)", zone, (ULong)nmemb, (ULong)size ); \
@@ -708,7 +708,7 @@
void* v; \
\
DO_INIT; \
- trigger_memcheck_error_if_undefined((ULong) zone); \
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone); \
trigger_memcheck_error_if_undefined((ULong) n); \
MALLOC_TRACE("zone_memalign(%p, al %llu, size %llu)", \
zone, (ULong)alignment, (ULong)n ); \
@@ -788,7 +788,7 @@
static int pszB = 0; \
if (pszB == 0) \
pszB = my_getpagesize(); \
- trigger_memcheck_error_if_undefined((ULong) zone); \
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone); \
return VG_REPLACE_FUNCTION_EZU(10110,VG_Z_LIBC_SONAME,memalign) \
((SizeT)pszB, size); \
}
@@ -1038,8 +1038,8 @@
/* Implement "malloc_size" by handing the request through to the
tool's .tl_usable_size method. */
DO_INIT;
- trigger_memcheck_error_if_undefined((ULong) zone);
- trigger_memcheck_error_if_undefined((ULong) ptr);
+ trigger_memcheck_error_if_undefined((ULong)(UWord) zone);
+ trigger_memcheck_error_if_undefined((ULong)(UWord) ptr);
size_t res = (size_t)VALGRIND_NON_SIMD_CALL1(
info.tl_malloc_usable_size, ptr);
return res;
|