|
From: <sv...@va...> - 2005-05-16 22:45:43
|
Author: njn
Date: 2005-05-16 21:50:52 +0100 (Mon, 16 May 2005)
New Revision: 3746
Modified:
trunk/coregrind/amd64-linux/core_platform.h
trunk/coregrind/core.h
trunk/coregrind/vg_scheduler.c
trunk/coregrind/x86-linux/core_platform.h
Log:
Remove VGP_LONGJMP and VGP_SETJMP, since they're the same on all
platforms.
Modified: trunk/coregrind/amd64-linux/core_platform.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/amd64-linux/core_platform.h 2005-05-16 20:40:51 UTC (=
rev 3745)
+++ trunk/coregrind/amd64-linux/core_platform.h 2005-05-16 20:50:52 UTC (=
rev 3746)
@@ -59,13 +59,6 @@
} while (0)
=20
=20
-/* Use libc setjmp/longjmp. longjmp must not restore signal mask
- state, but does need to pass though "val". */
-#include <setjmp.h> /* for jmp_buf */
-
-#define VGP_SETJMP(env) setjmp(env)
-#define VGP_LONGJMP(env, val) longjmp(env, val)
-
#endif // __AMD64_LINUX_CORE_PLATFORM_H
=20
/*--------------------------------------------------------------------*/
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-16 20:40:51 UTC (rev 3745)
+++ trunk/coregrind/core.h 2005-05-16 20:50:52 UTC (rev 3746)
@@ -45,6 +45,8 @@
#include "pub_core_mallocfree.h" // for type 'ArenaId'
#include "pub_core_stacktrace.h" // for type 'StackTrace'
=20
+#include <setjmp.h> /* for jmp_buf */
+
/* ---------------------------------------------------------------------
Global macros.
------------------------------------------------------------------ */
Modified: trunk/coregrind/vg_scheduler.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/vg_scheduler.c 2005-05-16 20:40:51 UTC (rev 3745)
+++ trunk/coregrind/vg_scheduler.c 2005-05-16 20:50:52 UTC (rev 3746)
@@ -415,7 +415,7 @@
/* Can't continue; must longjmp back to the scheduler and thus
enter the sighandler immediately. */
=20
- VGP_LONGJMP(tst->sched_jmpbuf, True);
+ longjmp(tst->sched_jmpbuf, True);
}
}
=20
@@ -445,11 +445,13 @@
VG_(sigprocmask)(VKI_SIG_SETMASK, &mask, NULL);
}
=20
+/* Use libc setjmp/longjmp. longjmp must not restore signal mask
+ state, but does need to pass "val" through. */
#define SCHEDSETJMP(tid, jumped, stmt) \
do { \
ThreadState * volatile _qq_tst =3D VG_(get_ThreadState)(tid); \
\
- (jumped) =3D VGP_SETJMP(_qq_tst->sched_jmpbuf); =
\
+ (jumped) =3D setjmp(_qq_tst->sched_jmpbuf); =
\
if ((jumped) =3D=3D 0) { \
vg_assert(!_qq_tst->sched_jmpbuf_valid); \
_qq_tst->sched_jmpbuf_valid =3D True; \
Modified: trunk/coregrind/x86-linux/core_platform.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/x86-linux/core_platform.h 2005-05-16 20:40:51 UTC (re=
v 3745)
+++ trunk/coregrind/x86-linux/core_platform.h 2005-05-16 20:50:52 UTC (re=
v 3746)
@@ -141,13 +141,6 @@
__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory");
}
=20
-/* Use libc setjmp/longjmp. longjmp must not restore signal mask
- state, but does need to pass though "val". */
-#include <setjmp.h> /* for jmp_buf */
-
-#define VGP_SETJMP(env) setjmp(env)
-#define VGP_LONGJMP(env, val) longjmp(env, val)
-
#endif // __X86_LINUX_CORE_PLATFORM_H
=20
/*--------------------------------------------------------------------*/
|