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, 12 insertions, 1 deletions

diff --git a/staptree.h b/staptree.h
index dd53c42e..8d55f053 100644
--- a/staptree.h
+++ b/staptree.h
@@ -356,10 +356,12 @@ struct next_statement: public statement
 
 
 struct probe;
+struct probe_alias;
 struct stapfile
 {
   std::string name;
   std::vector<probe*> probes;
+  std::vector<probe_alias*> aliases;
   std::vector<functiondecl*> functions;
   std::vector<vardecl*> globals;
   void print (std::ostream& o);
@@ -392,9 +394,18 @@ struct probe
   std::vector<vardecl*> locals;
   probe ();
   void print (std::ostream& o);
-  void printsig (std::ostream &o);
+  virtual void printsig (std::ostream &o);
+  virtual ~probe() {}
 };
 
+struct probe_alias 
+  : public probe
+{
+  probe_alias(std::vector<probe_point*> const & aliases);
+  std::vector<probe_point*> alias_names;  
+  virtual void printsig (std::ostream &o);
+  virtual ~probe_alias() {}
+};
 
 
 // An derived visitor instance is used to visit the entire