2005-06-27 Graydon Hoare <graydon@redhat.com>

	* staptree.{h,cxx} (probe_alias): New structure.
	* parse.{h,cxx} (parser::parse): Parse probes or probe aliases.
	(parser::parse_probe): Likewise.
	* tapsets.{h,cxx}:
	(derived_probe_builder):
	(match_key):
	(match_node):
	(alias_derived_probe): Move from here,
	* elaborate.{h,cxx}: to here.
	* elaborate.h (systemtap_session::pattern_root): New member.
	(register_library_aliases): New function.
	* tapsets.cxx: Build one dwarf_derived_probe per target address.

1 files changed, 25 insertions, 0 deletions

diff --git a/staptree.cxx b/staptree.cxx
index f74f9a91..1243df98 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -373,6 +373,12 @@ void stapfile::print (ostream& o)
       o << endl;
     }
 
+  for (unsigned i=0; i<aliases.size(); i++)
+    {
+      aliases[i]->print (o);
+      o << endl;
+    }
+
   for (unsigned i=0; i<probes.size(); i++)
     {
       probes[i]->print (o);
@@ -417,6 +423,25 @@ void probe_point::print (ostream& o)
     }
 }
 
+probe_alias::probe_alias(std::vector<probe_point*> const & aliases):
+  probe (), alias_names (aliases)
+{
+}
+
+void probe_alias::printsig (ostream& o)
+{
+  for (unsigned i=0; i<alias_names.size(); i++)
+    {
+      o << (i>0 ? " = " : "");
+      alias_names[i]->print (o);
+    }
+  for (unsigned i=0; i<locations.size(); i++)
+    {
+      o << (i>0 ? ", " : "");
+      locations[i]->print (o);
+    }
+}
+
 
 ostream& operator << (ostream& o, probe_point& k)
 {