|
From: <sv...@va...> - 2005-09-30 01:20:50
|
Author: sewardj
Date: 2005-09-30 02:20:47 +0100 (Fri, 30 Sep 2005)
New Revision: 4829
Log:
Get rid of duplicated STRINGIFY macros.
Modified:
trunk/auxprogs/valgrind-listener.c
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: trunk/auxprogs/valgrind-listener.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/auxprogs/valgrind-listener.c 2005-09-30 01:09:50 UTC (rev 4828)
+++ trunk/auxprogs/valgrind-listener.c 2005-09-30 01:20:47 UTC (rev 4829)
@@ -80,12 +80,10 @@
}
=20
#undef assert
-#undef STRINGIFY
=20
-#define STRINGIFY(__str) #__str
#define assert(expr) \
((void) ((expr) ? 0 : \
- (my_assert_fail (STRINGIFY(expr), \
+ (my_assert_fail (VG_STRINGIFY(expr), \
__FILE__, __LINE__, \
__PRETTY_FUNCTION__), 0)))
=20
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-linux.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_syswrap/syswrap-amd64-linux.c 2005-09-30 01:09:50 U=
TC (rev 4828)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-09-30 01:20:47 U=
TC (rev 4829)
@@ -285,10 +285,8 @@
=20
Returns a Long encoded in the linux-amd64 way, not a SysRes.
*/
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str) STRINGIFZ(__str)
-#define __NR_CLONE STRINGIFY(__NR_clone)
-#define __NR_EXIT STRINGIFY(__NR_exit)
+#define __NR_CLONE VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT VG_STRINGIFY(__NR_exit)
=20
extern
Long do_syscall_clone_amd64_linux ( Long (*fn)(void *),=20
@@ -339,8 +337,6 @@
=20
#undef __NR_CLONE
#undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
=20
=20
// forward declaration
Modified: trunk/coregrind/m_syswrap/syswrap-ppc32-linux.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_syswrap/syswrap-ppc32-linux.c 2005-09-30 01:09:50 U=
TC (rev 4828)
+++ trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c 2005-09-30 01:20:47 U=
TC (rev 4829)
@@ -307,10 +307,8 @@
=20
Returns an Int encoded in the linux-ppc32 way, not a SysRes.
*/
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str) STRINGIFZ(__str)
-#define __NR_CLONE STRINGIFY(__NR_clone)
-#define __NR_EXIT STRINGIFY(__NR_exit)
+#define __NR_CLONE VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT VG_STRINGIFY(__NR_exit)
=20
extern
ULong do_syscall_clone_ppc32_linux ( Int (*fn)(void *),=20
@@ -379,8 +377,6 @@
=20
#undef __NR_CLONE
#undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
=20
// forward declarations
static void setup_child ( ThreadArchState*, ThreadArchState* );
Modified: trunk/coregrind/m_syswrap/syswrap-x86-linux.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_syswrap/syswrap-x86-linux.c 2005-09-30 01:09:50 UTC=
(rev 4828)
+++ trunk/coregrind/m_syswrap/syswrap-x86-linux.c 2005-09-30 01:20:47 UTC=
(rev 4829)
@@ -284,11 +284,9 @@
=20
Returns an Int encoded in the linux-x86 way, not a SysRes.
*/
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str) STRINGIFZ(__str)
#define FSZ "4+4+4+4" /* frame size =3D retaddr+ebx+edi+es=
i */
-#define __NR_CLONE STRINGIFY(__NR_clone)
-#define __NR_EXIT STRINGIFY(__NR_exit)
+#define __NR_CLONE VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT VG_STRINGIFY(__NR_exit)
=20
extern
Int do_syscall_clone_x86_linux ( Int (*fn)(void *),=20
@@ -345,8 +343,6 @@
#undef FSZ
#undef __NR_CLONE
#undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
=20
=20
// forward declarations
|