Merge branch 'entryexit'

diff --cc src/aop-main.c
Simple merge

diff --cc src/aop-pc-assign.c
Simple merge

diff --cc src/aop-pointcut.h
Simple merge

diff --cc src/aop.h
index b355ade1781c2872cb570e97a79fbfe20b74eb6b,79389c23c4e9923d5d773916df8e720b6d33b798..29bcb02845e875780f5d912380684ab94983ec26
--- 1/src/aop.h
--- 2/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)