Renamed VG_NON_SIMD_CALL1 (and friends) as VALGRIND_NON_SIMD_CALL1 to be

consistent with the names of the other client requests.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1534

diff --git a/coregrind/vg_replace_malloc.c b/coregrind/vg_replace_malloc.c
index 29f15c52205c8ed239830dc339d26de5710ace47..42e2e1184b287b832364f45b6d0478d2861ebaec 100644 (file)
--- a/coregrind/vg_replace_malloc.c
+++ b/coregrind/vg_replace_malloc.c
@@ -45,7 +45,7 @@
 
 /* Sidestep the normal check which disallows using valgrind.h directly. */
 #define __VALGRIND_SOMESKIN_H
-#include "valgrind.h"            /* for VG_NON_SIMD_tstCALL[12] */
+#include "valgrind.h"            /* for VALGRIND_NON_SIMD_tstCALL[12] */
 
 /*------------------------------------------------------------*/
 /*--- Command line options                                 ---*/
@@ -150,7 +150,7 @@ void* malloc ( Int n )
    MAYBE_SLOPPIFY(n);
 
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL1( SK_(malloc), n );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL1( SK_(malloc), n );
    } else if (VG_(clo_alignment) != 4) {
       v = VG_(arena_malloc_aligned)(VG_AR_CLIENT, VG_(clo_alignment), n);
    } else {
@@ -169,7 +169,7 @@ void* __builtin_new ( Int n )
    MAYBE_SLOPPIFY(n);
 
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL1( SK_(__builtin_new), n );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL1( SK_(__builtin_new), n );
    } else if (VG_(clo_alignment) != 4) {
       v = VG_(arena_malloc_aligned)(VG_AR_CLIENT, VG_(clo_alignment), n);
    } else {
@@ -194,7 +194,7 @@ void* __builtin_vec_new ( Int n )
    MAYBE_SLOPPIFY(n);
 
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL1( SK_(__builtin_vec_new), n );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL1( SK_(__builtin_vec_new), n );
    } else if (VG_(clo_alignment) != 4) {
       v = VG_(arena_malloc_aligned)(VG_AR_CLIENT, VG_(clo_alignment), n);
    } else {
@@ -217,7 +217,7 @@ void free ( void* p )
    if (p == NULL) 
       return;
    if (VG_(is_running_on_simd_CPU)()) {
-      (void)VG_NON_SIMD_tstCALL1( SK_(free), p );
+      (void)VALGRIND_NON_SIMD_tstCALL1( SK_(free), p );
    } else {
       VG_(arena_free)(VG_AR_CLIENT, p);      
    }
@@ -230,7 +230,7 @@ void __builtin_delete ( void* p )
    if (p == NULL) 
       return;
    if (VG_(is_running_on_simd_CPU)()) {
-      (void)VG_NON_SIMD_tstCALL1( SK_(__builtin_delete), p );
+      (void)VALGRIND_NON_SIMD_tstCALL1( SK_(__builtin_delete), p );
    } else {
       VG_(arena_free)(VG_AR_CLIENT, p);
    }
@@ -249,7 +249,7 @@ void __builtin_vec_delete ( void* p )
    if (p == NULL) 
       return;
    if (VG_(is_running_on_simd_CPU)()) {
-      (void)VG_NON_SIMD_tstCALL1( SK_(__builtin_vec_delete), p );
+      (void)VALGRIND_NON_SIMD_tstCALL1( SK_(__builtin_vec_delete), p );
    } else {
       VG_(arena_free)(VG_AR_CLIENT, p);
    }
@@ -270,7 +270,7 @@ void* calloc ( Int nmemb, Int size )
    MAYBE_SLOPPIFY(size);
 
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL2( SK_(calloc), nmemb, size );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL2( SK_(calloc), nmemb, size );
    } else {
       v = VG_(arena_calloc)(VG_AR_CLIENT, VG_(clo_alignment), nmemb, size);
    }
@@ -296,7 +296,7 @@ void* realloc ( void* ptrV, Int new_size )
       return NULL;
    }   
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL2( SK_(realloc), ptrV, new_size );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL2( SK_(realloc), ptrV, new_size );
    } else {
       v = VG_(arena_realloc)(VG_AR_CLIENT, ptrV, VG_(clo_alignment), new_size);
    }
@@ -314,7 +314,7 @@ void* memalign ( Int alignment, Int n )
    MAYBE_SLOPPIFY(n);
 
    if (VG_(is_running_on_simd_CPU)()) {
-      v = (void*)VG_NON_SIMD_tstCALL2( SK_(memalign), alignment, n );
+      v = (void*)VALGRIND_NON_SIMD_tstCALL2( SK_(memalign), alignment, n );
    } else {
       v = VG_(arena_malloc_aligned)(VG_AR_CLIENT, alignment, n);
    }

diff --git a/include/valgrind.h b/include/valgrind.h
index b6768f755203e6b2d7fba2974a32775ac22bc083..b91216d04e6d9d673b9772490ad38eff62b3175d 100644 (file)
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -199,7 +199,7 @@ typedef
 
 /* These requests allow control to move from the simulated CPU to the
    real CPU, calling an arbitary function */
-#define VG_NON_SIMD_CALL0(_qyy_fn)                             \
+#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                       \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_CALL0,          \
@@ -208,7 +208,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)                  \
+#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)            \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_CALL1,          \
@@ -217,7 +217,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)       \
+#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2) \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_CALL2,          \
@@ -226,7 +226,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3)  \
+#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3)  \
    ({unsigned int _qyy_res;                                          \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,        \
                             VG_USERREQ__CLIENT_CALL3,                \
@@ -238,7 +238,7 @@ typedef
 
 /* These requests are similar to those above;  they insert the current
    ThreadState as the first argument to the called function. */
-#define VG_NON_SIMD_tstCALL0(_qyy_fn)                          \
+#define VALGRIND_NON_SIMD_tstCALL0(_qyy_fn)                    \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_tstCALL0,       \
@@ -247,7 +247,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_tstCALL1(_qyy_fn, _qyy_arg1)               \
+#define VALGRIND_NON_SIMD_tstCALL1(_qyy_fn, _qyy_arg1)         \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_tstCALL1,       \
@@ -256,7 +256,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_tstCALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
+#define VALGRIND_NON_SIMD_tstCALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
    ({unsigned int _qyy_res;                                    \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,  \
                             VG_USERREQ__CLIENT_tstCALL2,       \
@@ -265,7 +265,7 @@ typedef
     _qyy_res;                                                  \
    })
 
-#define VG_NON_SIMD_tstCALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3)  \
+#define VALGRIND_NON_SIMD_tstCALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3)  \
    ({unsigned int _qyy_res;                                             \
     VALGRIND_MAGIC_SEQUENCE(_qyy_res, 0 /* default return */,           \
                             VG_USERREQ__CLIENT_tstCALL3,                \

diff --git a/include/vg_skin.h b/include/vg_skin.h
index 3bb6e36834f3be52c8757d8a7fb5cf5b8f297f70..2fe3e2255166fbcef643ca0cb5e479f6226f6fb1 100644 (file)
--- a/include/vg_skin.h
+++ b/include/vg_skin.h
@@ -1342,7 +1342,7 @@ extern void VG_(HT_destruct) ( VgHashTable t );
 /* Is the client running on the simulated CPU or the real one? 
 
    Nb: If it is, and you want to call a function to be run on the real CPU,
-   use one of the VG_NON_SIMD_CALL[123] macros in valgrind.h to call it.
+   use one of the VALGRIND_NON_SIMD_CALL[123] macros in valgrind.h to call it.
 
    Nb: don't forget the function parentheses when using this in a 
    condition... write this: