-/* -------------------------------------------------------------------
- * $Id$
- * -------------------------------------------------------------------
- * Auf- und Abbau der interprozeduralen Darstellung (Explizite
- * interprozedurale Abhängigkeiten).
- *
- * Erstellt: Hubert Schmid, 09.06.2002
- * ---------------------------------------------------------------- */
-
+/*
+ * Project: libFIRM
+ * File name: ir/ir/ircgcons.c
+ * Purpose: Construction and removal of interprocedural representation
+ * (explicit interprocedural dependencies).
+ * Author: Hubert Schmid
+ * Modified by:
+ * Created: 09.06.2002
+ * CVS-ID: $Id$
+ * Copyright: (c) 2002-2003 Universität Karlsruhe
+ * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
+ */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <string.h>
+#include <stdbool.h>
#include "ircgcons.h"
#include "array.h"
#include "irprog.h"
+#include "irnode_t.h"
+#include "irprog_t.h"
#include "ircons.h"
#include "irgmod.h"
#include "irgwalk.h"
-#include "irflag.h"
-#include "misc.h"
+#include "irflag_t.h"
+
+
+/* Return the current state of the interprocedural view. */
+ip_view_state get_irp_ip_view_state(void) {
+ return irp->ip_view;
+}
+
+/* Set the current state of the interprocedural view. */
+static void set_irp_ip_view(ip_view_state state) {
+ irp->ip_view = state;
+}
+
+/* Set the state of the interprocedural view to invalid. */
+void set_irp_ip_view_invalid(void) {
+ set_irp_ip_view(ip_view_invalid);
+}
+/* # define CATE_jni */
+
/* Datenstruktur für jede Methode */
typedef struct {
- int count;
- bool open; /* offene Methode (mit unbekanntem Aufrufer) */
+ int count; /* GL: anzahl aufrufer */
+ bool open; /* offene Methode (mit unbekanntem Aufrufer) */
ir_node * reg, * mem, ** res; /* EndReg, Mem und Rückgabewerte */
ir_node * except, * except_mem; /* EndExcept und Mem für Ausnahmeabbruch */
} irg_data_t;
-
static irg_data_t * irg_data_create(void) {
irg_data_t * data = xmalloc(sizeof(irg_data_t));
memset(data, 0, sizeof(irg_data_t)); /* init */
return data;
}
-
/* Die Anzahl der Aufrufer jeder Methode zählen (irg_data_t->count), und die
* offenen Methoden (mit unbekannten Vorgänger) markieren. */
static void caller_init(int arr_length, entity ** free_methods) {
for (call = get_irn_link(get_irg_end(irg)); call; call = get_irn_link(call)) {
if (get_irn_op(call) != op_Call) continue;
for (j = get_Call_n_callees(call) - 1; j >= 0; --j) {
- entity * ent = get_Call_callee(call, j);
- if (ent) {
- irg_data_t * data = get_entity_link(ent);
- assert(get_entity_irg(ent) && data);
- ++data->count;
- }
+ entity * ent = get_Call_callee(call, j);
+ if (ent) {
+ irg_data_t * data = get_entity_link(ent);
+# ifndef CATE_jni
+ assert(get_entity_irg(ent) && data);
+ ++data->count;
+# endif /* ndef CATE_jni */
+ }
}
}
}
ir_graph * irg = get_irp_irg(i);
ir_node * start = get_irg_start(irg);
ir_node * end = get_irg_end(irg);
+ current_ir_graph = irg;
assert(irg && start);
/* Die speziellen Parameter der Start-Operation extra verlinken,
* auch wenn sie nicht im intraprozeduralen Graphen erreichbar
link(start, get_irg_frame(irg));
link(start, get_irg_globals(irg));
/* walk */
- irg_walk_graph(irg, clear_link, (irg_walk_func) collect_phicallproj_walker, &end);
+ irg_walk_graph(irg, clear_link, (irg_walk_func *) collect_phicallproj_walker, &end);
}
}
ir_node * filter;
assert(get_irn_op(proj) == op_Proj);
filter = new_Filter(get_Proj_pred(proj), get_irn_mode(proj), get_Proj_proj(proj));
- assert(get_Proj_proj(proj) == get_Filter_proj(filter)); /* XXX:SID */
/* Die Proj- (Id-) Operation sollte im gleichen Grundblock stehen, wie die
* Filter-Operation. */
set_nodes_Block(proj, get_nodes_Block(filter));
/* Echt neue Block-Operation erzeugen. CSE abschalten! */
static ir_node * create_Block(int n, ir_node ** in) {
/* Turn off optimizations so that blocks are not merged again. */
- int rem_opt = get_optimize();
+ int rem_opt = get_opt_optimize();
ir_node * block;
set_optimize(0);
block = new_Block(n, in);
static void prepare_irg_end_except(ir_graph * irg, irg_data_t * data);
+/* If we use new_Unknown we get the Unknown of a graph. This can
+ * cause cycles we don't want to see, as Unknwon is in the Start Block
+ * or the procedure. Use unknown of outermost irg where the start
+ * block has no predecessors. */
+static INLINE ir_node *get_cg_Unknown(ir_mode *m) {
+ assert((get_Block_n_cfgpreds(get_irg_start_block(get_irp_main_irg())) == 1) &&
+ (get_nodes_block(get_Block_cfgpred(get_irg_start_block(get_irp_main_irg()), 0)) ==
+ get_irg_start_block(get_irp_main_irg())));
+ return new_r_Unknown(get_irp_main_irg(), m);
+}
+
+
/* IRG vorbereiten. Proj-Operationen der Start-Operation in Filter-Operationen
* umwandeln. Die künstlichen Steuerzusammenflüsse EndReg und EndExcept
* einfügen. An der Start-Operation hängt nach dem Aufruf eine Liste der
* den Start-Block verschieben. */
for (proj = get_irn_link(get_irg_start(irg)); proj; proj = get_irn_link(proj)) {
if (get_Proj_pred(proj) != get_irg_start(irg)
- || (get_Proj_proj(proj) != pns_initial_exec && get_Proj_proj(proj) != pns_args)) {
+ || (get_Proj_proj(proj) != pns_initial_exec && get_Proj_proj(proj) != pns_args)) {
ir_node * filter = exchange_proj(proj);
set_Filter_cg_pred_arr(filter, n_callers, in);
} else {
ir_node * filter = get_Id_pred(proj);
assert(get_irn_op(filter) == op_Filter);
if (filter != link && get_irn_link(filter) == NULL) {
- set_irn_link(link, filter);
- link = filter;
+ set_irn_link(link, filter);
+ link = filter;
}
}
}
/* Unbekannten Aufrufer sofort eintragen. */
if (data->open) {
- set_Block_cg_cfgpred(start_block, 0, new_Unknown());
+ set_Block_cg_cfgpred(start_block, 0, get_cg_Unknown(mode_X));
for (proj = get_irn_link(get_irg_start(irg)); proj; proj = get_irn_link(proj)) {
if (get_irn_op(proj) == op_Filter) {
- set_Filter_cg_pred(proj, 0, new_Unknown());
+ set_Filter_cg_pred(proj, 0, get_cg_Unknown(get_irn_mode(proj)));
}
}
data->count = 1;
/* Künstlicher Steuerzusammenfluss EndReg einfügen. */
static void prepare_irg_end(ir_graph * irg, irg_data_t * data) {
- ir_node * end_block = get_irg_end_block(irg);
- ir_node * end = get_irg_end(irg);
- ir_node ** ret_arr = NULL;
+ ir_node * end_block = get_irg_end_block(irg);
+ ir_node * end = get_irg_end(irg);
+ ir_node **ret_arr = NULL;
+ ir_node **cfgpred_arr = get_Block_cfgpred_arr(end_block);
int i, j;
int n_ret = 0;
- ir_node ** cfgpred_arr = get_Block_cfgpred_arr(end_block);
+
for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) {
if (get_irn_op(cfgpred_arr[i]) == op_Return) {
if (ret_arr) {
- ARR_APP1(ir_node *, ret_arr, cfgpred_arr[i]);
+ ARR_APP1(ir_node *, ret_arr, cfgpred_arr[i]);
} else {
- ret_arr = NEW_ARR_F(ir_node *, 1);
- ret_arr[0] = cfgpred_arr[i];
+ ret_arr = NEW_ARR_F(ir_node *, 1);
+ ret_arr[0] = cfgpred_arr[i];
}
++n_ret;
}
}
+
if (n_ret > 0) {
- int n_res = get_method_n_res(get_entity_type(get_irg_ent(irg)));
+ int n_res = get_method_n_ress(get_entity_type(get_irg_ent(irg)));
ir_node ** in = NEW_ARR_F(ir_node *, n_ret);
+
/* block */
for (i = n_ret - 1; i >= 0; --i) {
set_irg_current_block(irg, get_nodes_Block(ret_arr[i]));
in[i] = new_Jmp();
}
create_Block(n_ret, in);
+
/* end */
data->reg = new_EndReg();
+
/* mem */
for (i = n_ret - 1; i >= 0; --i) {
in[i] = get_Return_mem(ret_arr[i]);
}
data->mem = new_Phi(n_ret, in, mode_M);
- /* This Phi is a merge, therefor needs not be kept alive.
+ /* This Phi is a merge, therefore needs not be kept alive.
It might be optimized away, though. */
if (get_End_keepalive(end, get_End_n_keepalives(end)-1 ) == data->mem)
set_End_keepalive(end, get_End_n_keepalives(end)-1, new_Bad());
+
/* res */
data->res = NEW_ARR_F(ir_node *, n_res);
for (j = n_res - 1; j >= 0; --j) {
ir_mode *mode = NULL;
/* In[0] could be a Bad node with wrong mode. */
for (i = n_ret - 1; i >= 0; --i) {
- in[i] = get_Return_res(ret_arr[i], j);
- if (!mode && get_irn_mode(in[i]) != mode_T)
- mode = get_irn_mode(in[i]);
+ in[i] = get_Return_res(ret_arr[i], j);
+ if (!mode && get_irn_mode(in[i]) != mode_T)
+ mode = get_irn_mode(in[i]);
}
if (mode)
- data->res[j] = new_Phi(n_ret, in, mode);
+ data->res[j] = new_Phi(n_ret, in, mode);
else /* All preds are Bad */
- data->res[j] = new_Bad();
+ data->res[j] = new_Bad();
}
+
DEL_ARR_F(in);
}
+
if (ret_arr) DEL_ARR_F(ret_arr);
}
for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) {
if (get_irn_op(cfgpred_arr[i]) != op_Return) {
if (except_arr) {
- ARR_APP1(ir_node *, except_arr, cfgpred_arr[i]);
+ ARR_APP1(ir_node *, except_arr, cfgpred_arr[i]);
} else {
- except_arr = NEW_ARR_F(ir_node *, 1);
- except_arr[0] = cfgpred_arr[i];
+ except_arr = NEW_ARR_F(ir_node *, 1);
+ except_arr[0] = cfgpred_arr[i];
}
++n_except;
}
for (i = n_except - 1; i >= 0; --i) {
ir_node * node = skip_Proj(except_arr[i]);
if (get_irn_op(node) == op_Call) {
- in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 3);
+ in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 3);
} else if (get_irn_op(node) == op_Raise) {
- in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 1);
+ in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 1);
} else {
- assert(is_fragile_op(node));
- /* We rely that all cfops have the memory output at the same position. */
- in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 0);
+ assert(is_fragile_op(node));
+ /* We rely that all cfops have the memory output at the same position. */
+ in[i] = new_r_Proj(irg, get_nodes_Block(node), node, mode_M, 0);
}
}
data->except_mem = new_Phi(n_except, in, mode_M);
/* This Phi is a merge, therefor needs not be kept alive.
It might be optimized away, though. */
if (get_End_keepalive(end, get_End_n_keepalives(end)-1 )
- == data->except_mem)
+ == data->except_mem)
set_End_keepalive(end, get_End_n_keepalives(end)-1, new_Bad());
DEL_ARR_F(in);
}
/* Rekursiv die Operation "node" und alle ihre Vorgänger aus dem Block
- * "from_block" nach "to_block" verschieben. */
+ * "from_block" nach "to_block" verschieben.
+ * Verschiebe ebenfalls die Projs aus diesen Operationen. */
static void move_nodes(ir_node * from_block, ir_node * to_block, ir_node * node) {
int i;
+ ir_node *proj;
+
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node * pred = get_irn_n(node, i);
if (get_nodes_Block(pred) == from_block) {
}
}
set_nodes_Block(node, to_block);
+
+ /* Move projs of this node. */
+ proj = get_irn_link(node);
+ for (; proj; proj = skip_Id(get_irn_link(proj))) {
+ if (get_irn_op(proj) != op_Proj && get_irn_op(proj) != op_Filter) continue;
+ if ((get_nodes_Block(proj) == from_block) && (skip_Proj(get_irn_n(proj, 0)) == node))
+ set_nodes_Block(proj, to_block);
+ }
}
/* Abhängigkeiten vom Start-Block und den Filter-Operationen im
* Start-Block auf den Aufrufer hinzufügen. */
static void construct_start(entity * caller, entity * callee,
- ir_node * call, ir_node * exec) {
- irg_data_t * data = get_entity_link(callee);
- ir_graph * irg = get_entity_irg(callee);
- ir_node * start = get_irg_start(irg), * filter;
+ ir_node * call, ir_node * exec) {
+ irg_data_t *data = get_entity_link(callee);
+ ir_graph *irg = get_entity_irg(callee);
+ ir_node *start = get_irg_start(irg);
+ ir_node *filter;
assert(irg);
- assert(get_entity_peculiarity(callee) == existent); /* Else data is not initalized. */
+ assert(get_entity_peculiarity(callee) == peculiarity_existent); /* Else data is not initalized. */
assert((0 <= data->count) &&
- (data->count < get_Block_cg_n_cfgpreds(get_nodes_Block(start))));
+ (data->count < get_Block_cg_n_cfgpreds(get_nodes_Block(start))));
+
set_Block_cg_cfgpred(get_nodes_Block(start), data->count, exec);
for (filter = get_irn_link(start); filter; filter = get_irn_link(filter)) {
if (get_irn_op(filter) != op_Filter) continue;
if (get_Proj_pred(filter) == start) {
switch ((int) get_Proj_proj(filter)) {
case pns_global_store:
- set_Filter_cg_pred(filter, data->count, get_Call_mem(call));
- break;
+ set_Filter_cg_pred(filter, data->count, get_Call_mem(call));
+ break;
case pns_frame_base:
- /* "frame_base" wird nur durch Unknown dargestellt. Man kann ihn aber
- * auch explizit darstellen, wenn sich daraus Vorteile für die
- * Datenflussanalyse ergeben. */
- set_Filter_cg_pred(filter, data->count, new_Unknown());
- break;
+ /* "frame_base" wird nur durch Unknown dargestellt. Man kann ihn aber
+ * auch explizit darstellen, wenn sich daraus Vorteile für die
+ * Datenflussanalyse ergeben. */
+ set_Filter_cg_pred(filter, data->count, get_cg_Unknown(get_irn_mode(filter)));
+ break;
case pns_globals:
- /* "globals" wird nur durch Unknown dargestellt. Man kann ihn aber auch
- * explizit darstellen, wenn sich daraus Vorteile für die
- * Datenflussanalyse ergeben. */
- set_Filter_cg_pred(filter, data->count, new_Unknown());
- break;
+ /* "globals" wird nur durch Unknown dargestellt. Man kann ihn aber auch
+ * explizit darstellen, wenn sich daraus Vorteile für die
+ * Datenflussanalyse ergeben. */
+ set_Filter_cg_pred(filter, data->count, get_cg_Unknown(get_irn_mode(filter)));
+ break;
default:
- /* not reached */
- assert(0 && "not reached");
- break;
+ /* not reached */
+ assert(0 && "not reached");
+ break;
}
} else {
set_Filter_cg_pred(filter, data->count, get_Call_param(call, get_Proj_proj(filter)));
for (i = 0; i < length; ++i) {
if (data[i]) { /* explicit */
if (data[i]->reg) {
- in[i] = data[i]->mem;
+ in[i] = data[i]->mem;
} else {
- in[i] = new_Bad();
+ in[i] = new_Bad();
}
} else { /* unknown */
- in[i] = new_Unknown();
+ in[i] = get_cg_Unknown(mode_M);
}
}
}
for (i = 0; i < length; ++i) {
if (data[i]) { /* explicit */
if (data[i]->except) {
- in[i] = data[i]->except_mem;
+ in[i] = data[i]->except_mem;
} else {
- in[i] = new_Bad();
+ in[i] = new_Bad();
}
} else { /* unknown */
- in[i] = new_Unknown();
+ in[i] = get_cg_Unknown(mode_M);
}
}
}
/* Abhängigkeiten für ein Ergebnis über alle aufgerufenen Methoden
* bestimmen. */
-static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[]) {
+static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[], ir_mode *m) {
int i;
for (i = 0; i < length; ++i) {
if (data[i]) { /* explicit */
if (data[i]->reg) {
- in[i] = data[i]->res[pos];
+ in[i] = data[i]->res[pos];
} else {
- in[i] = new_Bad();
+ in[i] = new_Bad();
}
} else { /* unknown */
- in[i] = new_Unknown();
+ in[i] = get_cg_Unknown(m);
}
}
}
return NULL;
}
+/* Returns true if control flow operation exc is predecessor of end
+ block in irg. Works also for Return nodes, not only exceptions. */
+static bool exc_branches_to_end(ir_graph *irg, ir_node *exc) {
+ int i;
+ ir_node *end = get_irg_end_block(irg);
+ for (i = get_Block_n_cfgpreds(end) -1; i >= 0; --i)
+ if (get_Block_cfgpred(end, i) == exc) return true;
+ return false;
+}
+
+/* Returns true if only caller of irg is "Unknown". */
+static bool is_outermost_graph(ir_graph *irg) {
+ irg_data_t * data = get_entity_link(get_irg_ent(irg));
+ if (data->count) {
+ return false;
+ } else if (data->open) {
+ /* Die Methode wird nur von "der" unbekannten Aufrufstelle
+ * aufgerufen. Darstellung wird für diese Methode nicht
+ * geändert. */
+ } else {
+ /* Methode kann nicht aufgerufen werden. Die Darstellung wird
+ * für diese Methode nicht geändert. Das kann nicht vorkommen,
+ * wenn zuvor "gc_irgs()" aufgerufen wurde. */
+ }
+ return true;
+}
/* Grundblock der Call-Operation aufteilen. CallBegin- und Filter-Operationen
* einfügen. Die Steuer- und Datenflussabhängigkeiten von den aufgerufenen
int n_callees = get_Call_n_callees(call);
ir_node * post_block = get_nodes_Block(call); /* block nach dem Aufruf */
ir_node * pre_block = create_Block(get_Block_n_cfgpreds(post_block),
- get_Block_cfgpred_arr(post_block)); /* block vor dem Aufruf (mit CallBegin) */
+ get_Block_cfgpred_arr(post_block)); /* block vor dem Aufruf (mit CallBegin) */
ir_node * except_block = NULL, * proj;
ir_node * jmp = new_Break(); /* Sprung für intraprozedurale Darstellung (in
- * pre_block) */
+ * pre_block) */
ir_node * call_begin = new_CallBegin(call); /* (in pre_block) */
ir_node ** in = NEW_ARR_F(ir_node *, n_callees);
entity * caller = get_irg_ent(current_ir_graph); /* entity des aktuellen ir_graph */
* besitzen. Diese müssen dann auch noch für den pre_block gesetzt werden. */
if (get_Block_cg_cfgpred_arr(post_block)) {
set_Block_cg_cfgpred_arr(pre_block, get_Block_cg_n_cfgpreds(post_block),
- get_Block_cg_cfgpred_arr(post_block));
+ get_Block_cg_cfgpred_arr(post_block));
remove_Block_cg_cfgpred_arr(post_block);
}
/* Operationen verschieben */
move_phis(post_block, pre_block);
move_nodes(post_block, pre_block, call);
- /* @@@ GL Wer setzt die Laenge des PostBlock cgfpred array auf 1? */
set_irn_in(post_block, 1, &jmp);
/* Wiederverwendete Daten initialisieren. */
data[i] = get_entity_link(callees[i]);
}
+ /*
+ * Set flag to suppress verifying placement on proper irg:
+ * optimization can return block on other irg.
+ */
+ set_interprocedural_view(1);
+
/* Die interprozeduralen Steuerflussvorgänger des post_block
* bestimmen. */
for (i = 0; i < n_callees; ++i) {
if (data[i]) { /* explicit */
if (data[i]->reg) {
- in[i] = new_r_Proj(irgs[i], get_nodes_Block(data[i]->reg),
- data[i]->reg, mode_X, data[i]->count);
+ in[i] = new_r_Proj(irgs[i], get_nodes_Block(data[i]->reg),
+ data[i]->reg, mode_X, data[i]->count);
} else {
- in[i] = new_Bad();
+ in[i] = new_Bad();
}
} else { /* unknown */
- in[i] = new_Unknown();
+ in[i] = get_cg_Unknown(mode_X);
}
}
+ set_interprocedural_view(0);
+
set_Block_cg_cfgpred_arr(post_block, n_callees, in);
/* Die interprozeduralen Steuerflussvorgänger des except_block
* bestimmen. */
if ((proj = get_except(call)) != NULL) {
- except_block = create_Block(1, &proj);
- set_nodes_Block(proj, except_block);
- exchange(proj, new_Break());
- set_irg_current_block(current_ir_graph, pre_block);
- set_irn_n(except_block, 0, new_Proj(call, mode_X, 1));
- set_irg_current_block(current_ir_graph, post_block);
+ int preds = 0;
+ bool exc_to_end = false;
+ if (exc_branches_to_end(current_ir_graph, proj)) {
+ /* The Call aborts the procedure if it returns with an exception.
+ If this is an outermost procedure, the normal handling of exceptions
+ will generate a Break that goes to the end block. This is illegal
+ Frim. So directly branch to the end block with all exceptions. */
+ exc_to_end = true;
+ if (is_outermost_graph(current_ir_graph)) {
+ except_block = get_irg_end_block(current_ir_graph);
+ } else {
+ irg_data_t * tmp_data = get_entity_link(get_irg_ent(current_ir_graph));
+ except_block = get_nodes_block(tmp_data->except);
+ }
+ } else
+ {
+ except_block = create_Block(1, &proj);
+ set_nodes_Block(proj, except_block);
+ exchange(proj, new_Break());
+ set_irg_current_block(current_ir_graph, pre_block);
+ set_irn_n(except_block, 0, new_Proj(call, mode_X, 1));
+ set_irg_current_block(current_ir_graph, post_block);
+ }
+
+ /*
+ * Set flag to suppress verifying placement on proper irg:
+ * optimization can return block on other irg.
+ */
+ set_interprocedural_view(1);
+
for (i = 0; i < n_callees; ++i) {
entity * callee = get_Call_callee(call, i);
if (data[i]) { /* explicit */
- if (data[i]->except) {
- in[i] = new_r_Proj(get_entity_irg(callee), get_nodes_Block(data[i]->except),
- data[i]->except, mode_X, data[i]->count);
- } else {
- in[i] = new_Bad();
- }
+ if (data[i]->except) {
+ in[i] = new_r_Proj(get_entity_irg(callee), get_nodes_Block(data[i]->except),
+ data[i]->except, mode_X, data[i]->count);
+ } else {
+ in[i] = new_Bad();
+ }
} else { /* unknown */
- in[i] = new_Unknown();
+ in[i] = get_cg_Unknown(mode_X);
+ }
+ }
+
+ preds = n_callees;
+ if (exc_to_end) {
+ /* append all existing preds of the end block to new in array.
+ * Normal access routine guarantees that with first visit we
+ * get the normal preds, and from then on the _cg_ preds.
+ * (interporcedural view is set!)
+ * Do not add the exc pred of end we are replacing! */
+ for (i = get_Block_n_cfgpreds(except_block)-1; i >= 0; --i) {
+ ir_node *pred = get_Block_cfgpred(except_block, i);
+ if (pred != proj) {
+ ARR_APP1(ir_node *, in, pred);
+ preds++;
+ }
}
}
- set_Block_cg_cfgpred_arr(except_block, n_callees, in);
+ set_Block_cg_cfgpred_arr(except_block, preds, in);
}
+ set_interprocedural_view(0);
/* Diesen Vorgänger in den Start-Blöcken der aufgerufenen Methoden
* eintragen. */
/* Proj-Operationen in Filter-Operationen umwandeln und
* interprozedurale Vorgänger einfügen. */
set_irg_current_block(current_ir_graph, post_block);
- for (proj = get_irn_link(call); proj && get_irn_op(proj) == op_Proj; proj = get_irn_link(proj)) {
+ for (proj = get_irn_link(call); proj; proj = get_irn_link(proj)) {
+ if (get_irn_op(proj) != op_Proj) continue;
+ if (skip_Proj(get_Proj_pred(proj)) != call) continue;
if (get_Proj_pred(proj) == call) {
if (get_Proj_proj(proj) == 0) { /* memory */
- /* memory */
- ir_node * filter = exchange_proj(proj);
- /* filter in die Liste der Phis aufnehmen */
- if (get_irn_link(filter) == NULL) { /* note CSE */
- set_irn_link(filter, get_irn_link(post_block));
- set_irn_link(post_block, filter);
- }
- fill_mem(n_callees, data, in);
- set_Filter_cg_pred_arr(filter, n_callees, in);
+ ir_node * filter;
+
+ set_nodes_Block(proj, post_block);
+ filter = exchange_proj(proj);
+ /* filter in die Liste der Phis aufnehmen */
+ if (get_irn_link(filter) == NULL) { /* note CSE */
+ set_irn_link(filter, get_irn_link(post_block));
+ set_irn_link(post_block, filter);
+ }
+ fill_mem(n_callees, data, in);
+ set_Filter_cg_pred_arr(filter, n_callees, in);
} else if (get_Proj_proj(proj) == 1) { /* except */
- /* nothing: siehe oben */
+ /* nothing: siehe oben */
} else if (get_Proj_proj(proj) == 2) { /* results */
- set_nodes_Block(proj, pre_block);
+ /* nothing */
} else if (get_Proj_proj(proj) == 3) { /* except_mem */
- /* except_mem */
- ir_node * filter;
- assert(except_block);
- set_irg_current_block(current_ir_graph, except_block);
- filter = exchange_proj(proj);
- /* filter in die Liste der Phis aufnehmen */
- if (get_irn_link(filter) == NULL) { /* note CSE */
- set_irn_link(filter, get_irn_link(except_block));
- set_irn_link(except_block, filter);
- }
- set_irg_current_block(current_ir_graph, post_block);
- fill_except_mem(n_callees, data, in);
- set_Filter_cg_pred_arr(filter, n_callees, in);
+ ir_node * filter;
+
+ set_nodes_Block(proj, post_block);
+ assert(except_block);
+ set_irg_current_block(current_ir_graph, except_block);
+ filter = exchange_proj(proj);
+ /* filter in die Liste der Phis aufnehmen */
+ if (get_irn_link(filter) == NULL) { /* note CSE */
+ set_irn_link(filter, get_irn_link(except_block));
+ set_irn_link(except_block, filter);
+ }
+ set_irg_current_block(current_ir_graph, post_block);
+ fill_except_mem(n_callees, data, in);
+ set_Filter_cg_pred_arr(filter, n_callees, in);
} else {
- assert(0 && "not reached");
+ assert(0 && "not reached");
}
- } else {
- /* result */
- ir_node * filter = exchange_proj(proj);
+ } else { /* result */
+ ir_node * filter;
+
+ assert(is_Proj(get_Proj_pred(proj)) && get_Proj_pred(get_Proj_pred(proj)) == call);
+ set_nodes_Block(proj, post_block);
+ filter = exchange_proj(proj);
/* filter in die Liste der Phis aufnehmen */
- if (get_irn_link(filter) == NULL) { /* note CSE */
- set_irn_link(filter, get_irn_link(post_block));
- set_irn_link(post_block, filter);
+ if (get_irn_link(filter) == NULL) { /* not CSE */
+ set_irn_link(filter, get_irn_link(post_block));
+ set_irn_link(post_block, filter);
}
- fill_result(get_Proj_proj(filter), n_callees, data, in);
+ fill_result(get_Proj_proj(filter), n_callees, data, in, get_irn_mode(filter));
set_Filter_cg_pred_arr(filter, n_callees, in);
}
}
void cg_construct(int arr_len, entity ** free_methods_arr) {
int i;
+ if (get_irp_ip_view_state() == ip_view_valid) return;
+ if (get_irp_ip_view_state() == ip_view_invalid) cg_destruct();
+ set_irp_ip_view(ip_view_valid);
+
collect_phicallproj();
/* count callers */
/* construct calls */
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
ir_node * node;
+ int n_callees;
+
current_ir_graph = get_irp_irg(i);
for (node = get_irn_link(get_irg_end(current_ir_graph)); node; node = get_irn_link(node)) {
if (get_irn_op(node) == op_Call) {
- int n_callees = get_Call_n_callees(node);
- if (n_callees > 1 || (n_callees == 1 && get_Call_callee(node, 0) != NULL)) {
- construct_call(node);
- }
+ n_callees = get_Call_n_callees(node);
+ if (n_callees > 1 || (n_callees == 1 && get_Call_callee(node, 0) != NULL)) {
+ construct_call(node);
+ }
}
}
}
exchange(node, new_Jmp());
} else if (get_irn_op(node) == op_Call) {
remove_Call_callee_arr(node);
+ } else if (get_irn_op(node) == op_Proj) {
+ /* some ProjX end up in strage blocks. */
+ set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
}
}
void cg_destruct(void) {
int i;
- for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
- ir_graph * irg = get_irp_irg(i);
- irg_walk_graph(irg, destruct_walker, clear_link, NULL);
- set_irg_frame(irg, skip_nop(get_irg_frame(irg)));
- set_irg_globals(irg, skip_nop(get_irg_globals(irg)));
+ if (get_irp_ip_view_state() != ip_view_no) {
+ for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+ ir_graph * irg = get_irp_irg(i);
+ irg_walk_graph(irg, destruct_walker, clear_link, NULL);
+ set_irg_frame(irg, skip_nop(get_irg_frame(irg)));
+ set_irg_globals(irg, skip_nop(get_irg_globals(irg)));
+ set_irg_callee_info_state(irg, irg_callee_info_none);
+ set_irg_end_reg(irg, get_irg_end(irg));
+ set_irg_end_except(irg, get_irg_end(irg));
+ }
+ set_irp_ip_view(ip_view_no);
}
}
projects / libfirm / blobdiff