From: Justin Seyster <jseyster@cs.sunysb.edu>
Date: Wed, 24 Mar 2010 01:07:44 +0000 (-0400)
Subject: Merge branch 'entryexit'
X-Git-Tag: release-v1.0~118
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=833fbbd6cced8cba16f5553c68edeb5fec833424;p=interaspect.git

Merge branch 'entryexit'
---

833fbbd6cced8cba16f5553c68edeb5fec833424
diff --cc src/aop.h
index b355ade,79389c2..29bcb02
--- a/src/aop.h
+++ b/src/aop.h
@@@ -52,22 -52,17 +52,23 @@@ struct aop_pointcut
  struct aop_type;
  
  typedef unsigned int (*pass_callback) ();
- typedef void (*join_callback) (struct aop_joinpoint *);
+ typedef void (*join_callback) (struct aop_joinpoint *, void *callback_param);
  
 -extern struct aop_pointcut *aop_match_assignment_by_type (struct aop_type *type);
 +extern struct aop_pointcut *aop_match_assignment_by_type (
 +  const struct aop_type *type);
  
  extern const char *aop_capture_lhs_name (struct aop_joinpoint *jp);
  
 -extern void aop_do_weave (struct aop_joinpoint *jp, const char *name, ...);
 +extern void aop_insert_advice (struct aop_joinpoint *jp, const char *name, ...);
 +
 +extern const struct aop_type *aop_t_all_signed ();
 +extern const struct aop_type *aop_t_all_unsigned ();
 +extern const struct aop_type *aop_t_all_fp ();
 +extern const struct aop_type *aop_t_all_pointer ();
  
  extern void aop_register_pass (const char *pass_name, pass_callback callback);
- extern void aop_join_on (struct aop_pointcut *pc, join_callback callback);
+ extern void aop_join_on (struct aop_pointcut *pc, join_callback callback,
+ 			 void *callback_param);
  extern void aop_main ();
  
  extern void aop_abort (const char *filename, int lineno, const char *function)