From: Justin Seyster <jseyster@cs.sunysb.edu>
Date: Tue, 6 Jul 2010 22:31:29 +0000 (-0400)
Subject: Merge branch 'regimplify'
X-Git-Tag: release-v1.0~89
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=6ba0cc740b0de93b4a4f62d8321364b9602eb5f9;p=interaspect.git

Merge branch 'regimplify'

Conflicts:
	src/aop-pc-exit.c
---

6ba0cc740b0de93b4a4f62d8321364b9602eb5f9
diff --cc src/aop-pc-entry.c
index 293a299,66145d5..e66d494
--- a/src/aop-pc-entry.c
+++ b/src/aop-pc-entry.c
@@@ -118,12 -74,11 +118,14 @@@ aop_match_function_entry (
    struct aop_pointcut *pc;
    pc = ggc_alloc (sizeof (struct aop_pointcut));
    pc->kind = ATP_ENTRY;
+   pc->need_regimplification = false;
+ 
    pc->join_on = op_join_on_function_entry;
    pc->insert_before = op_default_insert_before;
 -  pc->prepare_for_weave = op_default_prepare_for_weave;
 +  pc->insert_after = op_default_insert_after;
 +  pc->prepare_for_weave = op_prepare_entry;
 +
 +  pc->pc_entry.function_name = NULL;
    return pc;
  }
  
diff --cc src/aop-pc-exit.c
index 56e1f57,2869fa6..857ef40
--- a/src/aop-pc-exit.c
+++ b/src/aop-pc-exit.c
@@@ -105,14 -70,11 +105,17 @@@ aop_match_function_exit (
    struct aop_pointcut *pc;  
    pc = ggc_alloc (sizeof (struct aop_pointcut));
    pc->kind = ATP_EXIT;
+   pc->need_regimplification = false;
+ 
    pc->join_on = op_join_on_function_exit;
    pc->insert_before = op_default_insert_before;
 -  pc->prepare_for_weave = op_default_prepare_for_weave;
 +  pc->insert_after = op_default_insert_after;
 +  pc->prepare_for_weave = op_prepare_exit;
+ 
    return pc;
  }
 +
 +/* Close Doxygen defgroup block. */
 +/**
 + * /}
 + */
diff --cc src/aop-pc-fun-call.c
index fa7a82d,199bae1..0d5b952
--- a/src/aop-pc-fun-call.c
+++ b/src/aop-pc-fun-call.c
@@@ -185,9 -126,9 +187,10 @@@ aop_match_function_call (
    pc->insert_before = op_default_insert_before;
    pc->prepare_for_weave = op_default_prepare_for_weave;
  
 -  /* Initialize the list to NULL */
 +  pc->pc_call.function_name = NULL;
 +  pc->pc_call.return_type = NULL;
    pc->pc_call.param_list_head = NULL;
+ 
    return pc;
  }