improve peephole API, do IncSP stuff as peephole opts, add IncSP -4 -> Pop opt

[libfirm] / ir / lower / lower_calls.c

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index f8b5763..d77b69f 100644 (file)
--- a/ir/lower/lower_calls.c
+++ b/ir/lower/lower_calls.c
@@ -1,25 +1,34 @@
 /*
- * Project:     libFIRM
- * File name:   ir/lower/lower_calls.c
- * Purpose:     lowering of Calls with compound parameters
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2005 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   Lowering of Calls with compound parameters and return types.
+ * @author  Michael Beck
+ * @version $Id$
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
+#include "lowering.h"
 #include "irprog_t.h"
 #include "irnode_t.h"
 #include "type_t.h"
@@ -27,12 +36,11 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "typewalk.h"
-#include "lower_calls.h"
-#include "return.h"
 #include "irtools.h"
+#include "iroptimize.h"
 #include "array.h"
 #include "pmap.h"
+#include "xmalloc.h"
 
 /** A type map for def_find_pointer_type. */
 static pmap *type_map;
@@ -77,6 +85,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
   int n_ress, n_params, nn_ress, nn_params, i, first_variadic;
   ident *id;
   add_hidden hidden_params;
+  int        changed = 0;
   variadicity var;
 
   if (is_lowered_type(mtp)) {
@@ -121,6 +130,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
              address will be transmitted as a hidden parameter. */
           ptr_tp = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
           params[nn_params++] = ptr_tp;
+          changed++;
           if (lp->flags & LF_RETURN_HIDDEN)
             results[nn_ress++] = ptr_tp;
         }
@@ -169,6 +179,10 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
     set_method_first_variadic_param_index(lowered, first_variadic);
 
   /* associate the lowered type with the original one for easier access */
+  if(changed) {
+         set_method_calling_convention(lowered,
+                         get_method_calling_convention(mtp) | cc_compound_ret);
+  }
   set_lowered_type(mtp, lowered);
 
   return lowered;
@@ -297,7 +311,7 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
  */
 static int is_compound_address(ir_type *ft, ir_node *adr)
 {
-  entity *ent;
+  ir_entity *ent;
 
   if (! is_Sel(adr))
     return 0;
@@ -309,7 +323,7 @@ static int is_compound_address(ir_type *ft, ir_node *adr)
 
 /** A pair for the copy-return-optimization. */
 typedef struct cr_pair {
-  entity *ent;    /**< the entity than can be removed from the frame */
+  ir_entity *ent; /**< the entity than can be removed from the frame */
   ir_node *arg;   /**< the argument that replaces the entities address */
 } cr_pair;
 
@@ -326,7 +340,7 @@ static void do_copy_return_opt(ir_node *n, void *ctx) {
   int i;
 
   if (is_Sel(n)) {
-    entity *ent = get_Sel_entity(n);
+    ir_entity *ent = get_Sel_entity(n);
 
     for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
       if (ent == arr[i].ent) {
@@ -351,7 +365,7 @@ static void do_copy_return_opt(ir_node *n, void *ctx) {
  */
 static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_env *env)
 {
-  entity *ent;
+  ir_entity *ent;
   pmap_entry *e;
 
   /* use a map the check if we already create such an entity */
@@ -390,8 +404,8 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
  */
 static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *entry, wlk_env *env)
 {
-  ir_node *p, *n, *src, *mem;
-  entity *ent;
+  ir_node *p, *n, *src, *mem, *blk;
+  ir_entity *ent;
   ir_type *owner;
   int idx, n_args;
 
@@ -418,12 +432,14 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
 
     ins[idx] = get_CopyB_dst(p);
     mem      = get_CopyB_mem(p);
+    blk      = get_nodes_block(p);
 
     /* get rid of the CopyB */
     turn_into_tuple(p, pn_CopyB_max);
     set_Tuple_pred(p, pn_CopyB_M_regular, mem);
-    set_Tuple_pred(p, pn_CopyB_M_except, get_irg_bad(irg));
-    set_Tuple_pred(p, pn_CopyB_X_except, get_irg_bad(irg));
+    set_Tuple_pred(p, pn_CopyB_M_except,  get_irg_bad(irg));
+    set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(irg, blk));
+    set_Tuple_pred(p, pn_CopyB_X_except,  get_irg_bad(irg));
     ++n_args;
   }
 
@@ -511,7 +527,7 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) {
  */
 static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 {
-  entity *ent = get_irg_entity(irg);
+  ir_entity *ent = get_irg_entity(irg);
   ir_type *mtp, *lowered_mtp, *tp, *ft;
   int i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt;
   ir_node **new_in, *ret, *endbl, *bl, *mem, *copy;
@@ -696,7 +712,7 @@ static void lower_method_types(type_or_ent *tore, void *env)
 
   /* fix method entities */
   if (is_entity(tore)) {
-    entity *ent = (entity *)tore;
+    ir_entity *ent = (ir_entity *)tore;
     tp = get_entity_type(ent);
 
     if (must_be_lowered(lp, tp)) {