|
From: <sv...@va...> - 2006-01-10 16:12:21
|
Author: sewardj
Date: 2006-01-10 16:12:16 +0000 (Tue, 10 Jan 2006)
New Revision: 5510
Log:
Common up CALL_FN_v_* macros.
Modified:
branches/FNWRAP/include/valgrind.h
Modified: branches/FNWRAP/include/valgrind.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/FNWRAP/include/valgrind.h 2006-01-10 15:56:59 UTC (rev 5509)
+++ branches/FNWRAP/include/valgrind.h 2006-01-10 16:12:16 UTC (rev 5510)
@@ -348,6 +348,21 @@
one of the CALL_FN_ macros. */
#define VALGRIND_GET_ORIG_FN(_lval) VALGRIND_GET_NRADDR(_lval)
=20
+/* Derivatives of the main macros below, for calling functions
+ returning void. */
+
+#define CALL_FN_v_v(fnptr) \
+ do { volatile unsigned long _junk; \
+ CALL_FN_W_v(_junk,fnptr); } while (0)
+
+#define CALL_FN_v_W(fnptr, arg1) \
+ do { volatile unsigned long _junk; \
+ CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
+
+#define CALL_FN_v_WW(fnptr, arg1,arg2) \
+ do { volatile unsigned long _junk; \
+ CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
+
/* ---------------------------- x86 ---------------------------- */
=20
#if defined(ARCH_x86)
@@ -375,9 +390,6 @@
lval =3D (__typeof__(lval)) _res; \
} while (0)
=20
-#define CALL_FN_v_v(fnptr) \
- do { unsigned long _junk; CALL_FN_W_v(_junk,fnptr); } while (0)
-
#define CALL_FN_W_W(lval, fnptr, arg1) \
do { \
volatile void* _fnptr =3D (fnptr); \
@@ -639,11 +651,6 @@
lval =3D (__typeof__(lval)) _res; \
} while (0)
=20
-#define CALL_FN_v_v(fnptr) \
- do { volatile unsigned long _junk; \
- CALL_FN_W_v(_junk,fnptr); } while (0)
-
-
#define CALL_FN_W_W(lval, fnptr, arg1) \
do { \
volatile void* _fnptr =3D (fnptr); \
@@ -662,11 +669,6 @@
lval =3D (__typeof__(lval)) _res; \
} while (0)
=20
-#define CALL_FN_v_W(fnptr, arg1) \
- do { volatile unsigned long _junk; \
- CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
-
-
#define CALL_FN_W_WW(lval, fnptr, arg1,arg2) \
do { \
volatile void* _fnptr =3D (fnptr); \
@@ -687,10 +689,6 @@
lval =3D (__typeof__(lval)) _res; \
} while (0)
=20
-#define CALL_FN_v_WW(fnptr, arg1,arg2) \
- do { volatile unsigned long _junk; \
- CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
-
#endif /* ARCH_amd64 */
=20
/* --------------------------- ppc32 --------------------------- */
|