diff options
| author | Stan Cox <scox@redhat.com> | 2010-03-09 10:50:14 -0500 |
|---|---|---|
| committer | Stan Cox <scox@redhat.com> | 2010-03-09 10:50:14 -0500 |
| commit | f43a495397a431683f2b5ee8ad827f77b82f5f09 (patch) | |
| tree | db421d8483a8518f9c9e03f72d4e1ae3b52f5265 /includes/sys/sdt.h | |
| parent | 12c1a00781ad7273546a9d16f4711876f328ab8c (diff) | |
| download | systemtap-steved-f43a495397a431683f2b5ee8ad827f77b82f5f09.tar.gz systemtap-steved-f43a495397a431683f2b5ee8ad827f77b82f5f09.tar.xz systemtap-steved-f43a495397a431683f2b5ee8ad827f77b82f5f09.zip | |
Only use volatile for sdt.h arguments when needed.
sdt.h (VOLATILE_ARG): gcc 4.4.3 support for inline asm
argument debug info means volatile is not needed.
Diffstat (limited to 'includes/sys/sdt.h')
| -rw-r--r-- | includes/sys/sdt.h | 116 |
1 files changed, 61 insertions, 55 deletions
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index 882a0d8b..f7673130 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -80,6 +80,12 @@ #define STAP_UPROBE_GUARD 0x31425250 +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && __GNUC_PATCHLEVEL__ >= 3 +#define VOLATILE_ARG +#else +#define VOLATILE_ARG volatile +#endif + #define STAP_PROBE_(probe) \ do { \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ @@ -89,7 +95,7 @@ do { \ #define STAP_PROBE1_(probe,label,parm1) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -98,8 +104,8 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE2_(probe,label,parm1,parm2) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -108,9 +114,9 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE3_(probe,label,parm1,parm2,parm3) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -119,10 +125,10 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE4_(probe,label,parm1,parm2,parm3,parm4) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -131,11 +137,11 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE5_(probe,label,parm1,parm2,parm3,parm4,parm5) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -144,12 +150,12 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE6_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ - volatile __typeof__((parm6)) arg6 = parm6; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm6)) arg6 = parm6; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -158,13 +164,13 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE7_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ - volatile __typeof__((parm6)) arg6 = parm6; \ - volatile __typeof__((parm7)) arg7 = parm7; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm6)) arg6 = parm6; \ + VOLATILE_ARG __typeof__((parm7)) arg7 = parm7; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -173,14 +179,14 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE8_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ - volatile __typeof__((parm6)) arg6 = parm6; \ - volatile __typeof__((parm7)) arg7 = parm7; \ - volatile __typeof__((parm8)) arg8 = parm8; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm6)) arg6 = parm6; \ + VOLATILE_ARG __typeof__((parm7)) arg7 = parm7; \ + VOLATILE_ARG __typeof__((parm8)) arg8 = parm8; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -189,15 +195,15 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE9_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ - volatile __typeof__((parm6)) arg6 = parm6; \ - volatile __typeof__((parm7)) arg7 = parm7; \ - volatile __typeof__((parm8)) arg8 = parm8; \ - volatile __typeof__((parm9)) arg9 = parm9; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm6)) arg6 = parm6; \ + VOLATILE_ARG __typeof__((parm7)) arg7 = parm7; \ + VOLATILE_ARG __typeof__((parm8)) arg8 = parm8; \ + VOLATILE_ARG __typeof__((parm9)) arg9 = parm9; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ @@ -206,16 +212,16 @@ do STAP_SEMAPHORE(probe) { \ #define STAP_PROBE10_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10) \ do STAP_SEMAPHORE(probe) { \ - volatile __typeof__((parm1)) arg1 = parm1; \ - volatile __typeof__((parm2)) arg2 = parm2; \ - volatile __typeof__((parm3)) arg3 = parm3; \ - volatile __typeof__((parm4)) arg4 = parm4; \ - volatile __typeof__((parm5)) arg5 = parm5; \ - volatile __typeof__((parm6)) arg6 = parm6; \ - volatile __typeof__((parm7)) arg7 = parm7; \ - volatile __typeof__((parm8)) arg8 = parm8; \ - volatile __typeof__((parm9)) arg9 = parm9; \ - volatile __typeof__((parm10)) arg10 = parm10; \ + VOLATILE_ARG __typeof__((parm1)) arg1 = parm1; \ + VOLATILE_ARG __typeof__((parm2)) arg2 = parm2; \ + VOLATILE_ARG __typeof__((parm3)) arg3 = parm3; \ + VOLATILE_ARG __typeof__((parm4)) arg4 = parm4; \ + VOLATILE_ARG __typeof__((parm5)) arg5 = parm5; \ + VOLATILE_ARG __typeof__((parm6)) arg6 = parm6; \ + VOLATILE_ARG __typeof__((parm7)) arg7 = parm7; \ + VOLATILE_ARG __typeof__((parm8)) arg8 = parm8; \ + VOLATILE_ARG __typeof__((parm9)) arg9 = parm9; \ + VOLATILE_ARG __typeof__((parm10)) arg10 = parm10; \ STAP_UNINLINE; \ STAP_PROBE_DATA(probe,STAP_UPROBE_GUARD,2f); \ __asm__ volatile ("2:\n" \ |