From fd5747054ac2a5c90d209195c55e6310972f969a Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 15 Aug 2008 14:46:27 -0400 Subject: PR6836: tweak $$return formatting --- ChangeLog | 8 ++++++++ NEWS | 2 +- stapprobes.5.in | 2 +- tapsets.cxx | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac800e8c..3a19ff26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-15 Frank Ch. Eigler + + PR 6836 + * tapsets.cxx (dwarf_var...visit_target_symbol): Emit + "return=0xf00" instead of "$return=0xf00" for $$return, + for consistency with other variables. + * NEWS, stapprobes.5.in: Update. + 2008-08-15 Frank Ch. Eigler PR 6836. diff --git a/NEWS b/NEWS index d6d220a0..ce3954cf 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ $$parms, and $$locals context variables, which expand to a string containing a list "var1=0xdead var2=0xbeef var3=?". (Here, var3 exists but is for some reason unavailable.) In return probes only, $$return - expands to an empty string for a void function, or "$return=0xf00". + expands to an empty string for a void function, or "return=0xf00". * What's new in version 0.7 diff --git a/stapprobes.5.in b/stapprobes.5.in index f1626166..a3697d0d 100644 --- a/stapprobes.5.in +++ b/stapprobes.5.in @@ -356,7 +356,7 @@ expands to a subset of $$vars for only function parameters. .TP $$return is available in return probes only. It expands to a string that -is equivalent to sprintf("$return=%x", $return) +is equivalent to sprintf("return=%x", $return) if the probed function has a return value, or else an empty string. .PP For ".return" probes, context variables other than the "$return" diff --git a/tapsets.cxx b/tapsets.cxx index 1f7d2555..f661b7e4 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -4333,7 +4333,7 @@ dwarf_var_expanding_copy_visitor::visit_target_symbol (target_symbol *e) } else { - pf->raw_components += "$return"; + pf->raw_components += "return"; pf->raw_components += "=%#x "; pf->args.push_back(*(expression**)this->targets.top()); } -- cgit