Handle user supplied sdt probe argument template

User supplied templates were erroneously removed by commit eaa15b047,
which complicated the template expansion. To do the above the
expansion of STAP_PROBE_ASM(provider, fooprobe,
STAP_PROBE_ASM_TEMPLATE(3)) adds an unused argument:
STAP_PROBE_ASM(provider, fooprobe, /*template expansion*/ "%[SDT..]..",
"use _SDT_ASM_TEMPLATE") A supplied template
STAP_PROBE_ASM(provider, fooprobe, "4@%rdx 8@%rax") is left alone.  If
the varargs has 2 args (the fake "use ..") then macro expansion
inserts the expanded string, otherwise "4@.." becomes an ascii op.

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 28d236d91cd8e4d3a5db8b13cac90fb678c629cf..24d5e01c37805e55c36f7202e5d4e821b85167a1 100644 (file)
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -290,7 +290,7 @@ __extension__ extern unsigned long long __sdt_unsp;
   _SDT_ASM_1(.purgem _SDT_TYPE_)                                             \
   _SDT_ASM_1(.purgem _SDT_TYPE)
 
-#define _SDT_ASM_BODY(provider, name, pack_args, args)                       \
+#define _SDT_ASM_BODY(provider, name, pack_args, args, ...)                  \
   _SDT_DEF_MACROS                                                            \
   _SDT_ASM_1(990:      _SDT_NOP)                                             \
   _SDT_ASM_3(          .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \
@@ -417,9 +417,9 @@ __extension__ extern unsigned long long __sdt_unsp;
    counted, so we don't have to worry about the behavior of macros
    called without any arguments.  */
 
-#ifdef SDT_USE_VARIADIC
 #define _SDT_NARG(...) __SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0)
 #define __SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N
+#ifdef SDT_USE_VARIADIC
 #define _SDT_PROBE_N(provider, name, N, ...) \
   _SDT_PROBE(provider, name, N, (__VA_ARGS__))
 #define STAP_PROBEV(provider, name, ...) \
@@ -468,9 +468,15 @@ __extension__ extern unsigned long long __sdt_unsp;
     Note that these can use operand templates like %0 or %[name],
     and likewise they must write %%reg for a literal operand of %reg.  */
 
+#define _SDT_ASM_BODY_1(p,n,...) _SDT_ASM_BODY(p,n,_SDT_ASM_SUBSTR,(__VA_ARGS__))
+#define _SDT_ASM_BODY_2(p,n,...) _SDT_ASM_BODY(p,n,/*_SDT_ASM_STRING */,__VA_ARGS__)
+#define _SDT_ASM_BODY_N2(p,n,no,...) _SDT_ASM_BODY_ ## no(p,n,__VA_ARGS__)
+#define _SDT_ASM_BODY_N1(p,n,no,...) _SDT_ASM_BODY_N2(p,n,no,__VA_ARGS__)
+#define _SDT_ASM_BODY_N(p,n,...) _SDT_ASM_BODY_N1(p,n,_SDT_NARG(0, __VA_ARGS__),__VA_ARGS__)
+
 #if __STDC_VERSION__ >= 199901L
 # define STAP_PROBE_ASM(provider, name, ...)           \
-  _SDT_ASM_BODY(provider, name, /*_SDT_ASM_STRING */, __VA_ARGS__)     \
+  _SDT_ASM_BODY_N(provider, name, __VA_ARGS__)                                 \
   _SDT_ASM_BASE
 # define STAP_PROBE_ASM_OPERANDS(n, ...) _SDT_ASM_OPERANDS_##n(__VA_ARGS__)
 #else
@@ -478,7 +484,7 @@ __extension__ extern unsigned long long __sdt_unsp;
   _SDT_ASM_BODY(provider, name, /* _SDT_ASM_STRING */, (args)) \
   _SDT_ASM_BASE
 #endif
-#define STAP_PROBE_ASM_TEMPLATE(n)     _SDT_ASM_TEMPLATE_##n
+#define STAP_PROBE_ASM_TEMPLATE(n) _SDT_ASM_TEMPLATE_##n,"use _SDT_ASM_TEMPLATE_"
 
 
 /* DTrace compatible macro names.  */

diff --git a/testsuite/systemtap.base/sdt_casm.c b/testsuite/systemtap.base/sdt_casm.c
index 1cff23c5f7b926e4baa20f81d73185baadbe5f6d..9b357086c04f82d996c6e0a54ac60769fc3555d0 100644 (file)
--- a/testsuite/systemtap.base/sdt_casm.c
+++ b/testsuite/systemtap.base/sdt_casm.c
@@ -3,6 +3,7 @@
 int main()
 {
     int x = 42;
+    int y = 43;
     __asm__ __volatile__ (
             STAP_PROBE_ASM(testsuite, probe0, STAP_PROBE_ASM_TEMPLATE(0))
             );
@@ -10,5 +11,9 @@ int main()
             STAP_PROBE_ASM(testsuite, probe1, STAP_PROBE_ASM_TEMPLATE(1))
             :: STAP_PROBE_ASM_OPERANDS(1, x)
             );
+    // Create a template to test explicit template support
+    __asm__ __volatile__ (
+                         STAP_PROBE_ASM(testsuite, probe2, -4@%[ARG1] -4@%[ARG2])
+                         :: [ARG1] "rm" (x), [ARG2] "rm" (y));
     return 0;
 }

diff --git a/testsuite/systemtap.base/sdt_casm.exp b/testsuite/systemtap.base/sdt_casm.exp
index 5791cb2b9f9a435aa587d4922d294a704f7d2963..0cd1cb51730e8cbdf773e990fecef1dbe146d4a0 100644 (file)
--- a/testsuite/systemtap.base/sdt_casm.exp
+++ b/testsuite/systemtap.base/sdt_casm.exp
@@ -18,7 +18,8 @@ proc cleanup_handler { verbose } {
 
 set script $srcdir/$subdir/$test.stp
 set ::result_string {PASS: probe0
-PASS: probe1}
+PASS: probe1
+PASS: probe2}
 
 set asm_flags [sdt_includes]
 set asm_flags "$asm_flags additional_flags=-std=c99"

diff --git a/testsuite/systemtap.base/sdt_casm.stp b/testsuite/systemtap.base/sdt_casm.stp
index 4f2539c93e52fbda6ff0b05dcba1a241657a5755..530a791751e0f4ef89467b960ae8c6f9a7fe975b 100644 (file)
--- a/testsuite/systemtap.base/sdt_casm.stp
+++ b/testsuite/systemtap.base/sdt_casm.stp
@@ -10,3 +10,11 @@ probe process.mark("probe1")
     else
         printf("FAIL: %s (%d != 42)\n", $$name, $arg1)
 }
+
+probe process.mark("probe2") 
+{
+    if ($arg1 == 42 && $arg2 == 43)
+        printf("PASS: %s\n", $$name)
+    else
+        printf("FAIL: %s (%d/%d != 42/43)\n", $$name, $arg1, $arg2)
+}