* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+
#include <stdbool.h>
#include "ircgcons.h"
}
-/* # define CATE_jni */
-
-/* Datenstruktur für jede Methode */
+/* Data for each method */
typedef struct {
- 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 */
+ int count; /* Number of calleers. */
+ bool open; /* Open method: called by an unknown caller */
+ ir_node * reg, * mem, ** res; /* EndReg, Mem and Method return values */
+ ir_node * except, * except_mem; /* EndExcept and Mem for exception return */
} 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 */
+ irg_data_t *data = xmalloc(sizeof(*data));
+ memset(data, 0, sizeof(*data)); /* init */
return data;
}
-/* Die Anzahl der Aufrufer jeder Methode zählen (irg_data_t->count), und die
- * offenen Methoden (mit unbekannten Vorgänger) markieren. */
+/** Count the number of callers of each method and mark open methods.
+ *
+ * Fills the irg_data data structure.
+ * Open methods are methods with an unknown caller, I.e., methods that
+ * - are external visible
+ * - are dereferenced somewhere within the program (i.e., the address of the
+ * method is stored somewhere). */
static void caller_init(int arr_length, entity ** free_methods) {
int i, j;
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
- set_entity_link(get_irg_ent(get_irp_irg(i)), irg_data_create());
+ set_entity_link(get_irg_entity(get_irp_irg(i)), irg_data_create());
}
for (i = arr_length - 1; i >= 0; --i) {
irg_data_t * data = get_entity_link(free_methods[i]);
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
ir_graph * irg = get_irp_irg(i);
ir_node * call;
- /* Die Call-Knoten sind (mit den Proj-Knoten) am End-Knoten verlinkt! */
+ /* We collected all call nodes in a link list at the end node. */
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);
+ entity * ent = get_Call_callee(call, j);
+ if (get_entity_irg(ent)) {
+ irg_data_t * data = get_entity_link(ent);
# ifndef CATE_jni
- assert(get_entity_irg(ent) && data);
- ++data->count;
+ assert(get_entity_irg(ent) && data);
+ ++data->count;
# endif /* ndef CATE_jni */
- }
+ } else {
+ set_entity_link(ent, NULL);
+ }
}
}
}
*call_tail = node;
}
} else if (get_irn_op(node) == op_Phi) {
- ir_node * block = get_nodes_Block(node);
+ ir_node * block = get_nodes_block(node);
set_irn_link(node, get_irn_link(block));
set_irn_link(block, node);
}
filter = new_Filter(get_Proj_pred(proj), get_irn_mode(proj), get_Proj_proj(proj));
/* Die Proj- (Id-) Operation sollte im gleichen Grundblock stehen, wie die
* Filter-Operation. */
- set_nodes_Block(proj, get_nodes_Block(filter));
+ set_nodes_block(proj, get_nodes_block(filter));
exchange(proj, filter);
return filter;
}
* 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())));
+ (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);
}
* 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) != pn_Start_X_initial_exec && get_Proj_proj(proj) != pn_Start_T_args)) {
ir_node * filter = exchange_proj(proj);
set_Filter_cg_pred_arr(filter, n_callers, in);
} else {
- set_nodes_Block(proj, start_block);
+ set_nodes_block(proj, start_block);
}
}
}
}
/* Globle Einträge für ersetzte Operationen korrigieren. */
- set_irg_frame (irg, skip_nop(get_irg_frame(irg)));
- set_irg_globals (irg, skip_nop(get_irg_globals(irg)));
- set_irg_initial_mem(irg, skip_nop(get_irg_initial_mem(irg)));
+ set_irg_frame (irg, skip_Id(get_irg_frame(irg)));
+ set_irg_globals (irg, skip_Id(get_irg_globals(irg)));
+ set_irg_initial_mem(irg, skip_Id(get_irg_initial_mem(irg)));
/* Unbekannten Aufrufer sofort eintragen. */
if (data->open) {
}
if (n_ret > 0) {
- int n_res = get_method_n_ress(get_entity_type(get_irg_ent(irg)));
+ int n_res = get_method_n_ress(get_entity_type(get_irg_entity(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]));
+ set_irg_current_block(irg, get_nodes_block(ret_arr[i]));
in[i] = new_Jmp();
}
create_Block(n_ret, in);
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);
for (i = n_except - 1; i >= 0; --i) {
ir_node * node = skip_Proj(skip_Tuple(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);
+ in[i] = new_r_Proj(irg, get_nodes_block(node), node, mode_M, 0);
}
}
data->except_mem = new_Phi(n_except, in, mode_M);
/* Zwischengespeicherte Daten wieder freigeben. */
static void cleanup_irg(ir_graph * irg) {
- entity * ent = get_irg_ent(irg);
+ entity * ent = get_irg_entity(irg);
irg_data_t * data = get_entity_link(ent);
assert(data);
if (data->res) DEL_ARR_F(data->res);
static void move_phis(ir_node * from_block, ir_node * to_block) {
ir_node * phi;
for (phi = get_irn_link(from_block); phi != NULL; phi = get_irn_link(phi)) {
- set_nodes_Block(phi, to_block);
+ set_nodes_block(phi, to_block);
}
assert(get_irn_link(to_block) == NULL);
set_irn_link(to_block, get_irn_link(from_block));
for (i = arity - 1; i >= 0; --i) {
ir_node * pred = get_irn_n(node, i);
- if (get_nodes_Block(pred) == from_block) {
+ if (get_nodes_block(pred) == from_block) {
move_nodes(from_block, to_block, pred);
}
}
- set_nodes_Block(node, to_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);
+ 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) {
+ 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);
assert(irg);
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);
+ 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:
+ case pn_Start_M:
set_Filter_cg_pred(filter, data->count, get_Call_mem(call));
break;
- case pns_frame_base:
+ case pn_Start_P_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, get_cg_Unknown(get_irn_mode(filter)));
break;
- case pns_globals:
+ case pn_Start_P_globals:
/* "globals" wird nur durch Unknown dargestellt. Man kann ihn aber auch
* explizit darstellen, wenn sich daraus Vorteile für die
* Datenflussanalyse ergeben. */
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] = 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] = get_cg_Unknown(mode_M);
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] = get_cg_Unknown(m);
/* 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));
+ irg_data_t * data = get_entity_link(get_irg_entity(irg));
if (data->count) {
return false;
} else if (data->open) {
* Methoden auf die CallBegin-Operation, und von der Aufrufstelle auf die
* aufgerufenen Methoden eintragen. */
static void construct_call(ir_node * call) {
- 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) */
- ir_node * except_block = NULL, * proj;
- ir_node * jmp = new_Break(); /* Sprung für intraprozedurale Darstellung (in
- * pre_block) */
- ir_node * call_begin = new_CallBegin(call); /* (in pre_block) */
+ int i, n_callees;
+ ir_node *post_block, *pre_block, *except_block, * proj, *jmp, *call_begin;
+ ir_node ** in;
+ entity * caller;
+ entity ** callees;
+ ir_graph ** irgs;
+ irg_data_t ** data;
+
+ n_callees = get_Call_n_callees(call);
+ post_block = get_nodes_block(call); /* block nach dem Aufruf */
+ pre_block = create_Block(get_Block_n_cfgpreds(post_block),
+ get_Block_cfgpred_arr(post_block)); /* block vor dem Aufruf (mit CallBegin) */
+ except_block = NULL;
+ jmp = new_Break(); /* Sprung für intraprozedurale Darstellung (in * pre_block) */
+ call_begin = new_CallBegin(call); /* (in pre_block) */
/* CallBegin might be entry to endless recursion. */
add_End_keepalive(get_irg_end(get_irn_irg(pre_block)), 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 */
- entity ** callees = NEW_ARR_F(entity *, n_callees); /* aufgerufene Methoden: entity */
- ir_graph ** irgs = NEW_ARR_F(ir_graph *, n_callees); /* aufgerufene Methoden: ir_graph */
- irg_data_t ** data = NEW_ARR_F(irg_data_t *, n_callees); /* aufgerufene Methoden: irg_data_t */
- int i;
+
+ in = NEW_ARR_F(ir_node *, n_callees);
+ caller = get_irg_entity(current_ir_graph); /* entity des aktuellen ir_graph */
+ callees = NEW_ARR_F(entity *, n_callees); /* aufgerufene Methoden: entity */
+ irgs = NEW_ARR_F(ir_graph *, n_callees); /* aufgerufene Methoden: ir_graph */
+ data = NEW_ARR_F(irg_data_t *, n_callees); /* aufgerufene Methoden: irg_data_t */
/* post_block kann bereits interprozedurale Steuerflussvorgänger
* besitzen. Diese müssen dann auch noch für den pre_block gesetzt werden. */
/* Wiederverwendete Daten initialisieren. */
for (i = 0; i < n_callees; ++i) {
callees[i] = get_Call_callee(call, i);
- irgs[i] = callees[i] ? get_entity_irg(callees[i]) : NULL;
+ irgs[i] = get_entity_irg(callees[i]);
data[i] = get_entity_link(callees[i]);
+ /* Only entities that have an irg got a irg_data data structure.
+ In others there is some arbitrary garbage in the link field. */
+ if (!irgs[i]) { assert(!data[i]); data[i] = NULL; }
}
/*
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] = get_cg_Unknown(mode_X);
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. */
+ 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);
+ 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);
+ irg_data_t * tmp_data = get_entity_link(get_irg_entity(current_ir_graph));
+ except_block = get_nodes_block(tmp_data->except);
}
- } else
- {
+ } else {
except_block = create_Block(1, &proj);
- set_nodes_Block(proj, except_block);
+ 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));
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] = get_cg_Unknown(mode_X);
+ in[i] = get_cg_Unknown(mode_X);
}
}
/* 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!)
+ * (interprocedural 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++;
- }
+ 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, preds, in);
* eintragen. */
set_irg_current_block(current_ir_graph, pre_block);
for (i = 0; i < n_callees; ++i) {
- construct_start(caller, callees[i], call, new_Proj(call_begin, mode_X, i));
+ if (irgs[i]) /* Else there is not graph to call */
+ construct_start(caller, callees[i], call, new_Proj(call_begin, mode_X, i));
}
/* Proj-Operationen in Filter-Operationen umwandeln und
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 */
- 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 */
- } else if (get_Proj_proj(proj) == 2) { /* results */
- /* nothing */
- } else if (get_Proj_proj(proj) == 3) { /* except_mem */
+ if (get_Proj_proj(proj) == pn_Call_M_regular) { /* memory */
+ 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) == pn_Call_X_except) { /* except */
+ /* nothing: siehe oben */
+ } else if (get_Proj_proj(proj) == pn_Call_T_result) { /* results */
+ /* nothing */
+ } else if (get_Proj_proj(proj) == pn_Call_M_except) { /* except_mem */
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);
+ 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;
assert(is_Proj(get_Proj_pred(proj)) && get_Proj_pred(get_Proj_pred(proj)) == call);
- set_nodes_Block(proj, post_block);
+ set_nodes_block(proj, post_block);
filter = exchange_proj(proj);
/* filter in die Liste der Phis aufnehmen */
if (get_irn_link(filter) == NULL) { /* not CSE */
- set_irn_link(filter, get_irn_link(post_block));
- set_irn_link(post_block, filter);
+ 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, get_irn_mode(filter));
set_Filter_cg_pred_arr(filter, n_callees, in);
/* prepare irgs */
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
ir_graph * irg = get_irp_irg(i);
- entity * ent = get_irg_ent(irg);
+ entity * ent = get_irg_entity(irg);
irg_data_t * data = get_entity_link(ent);
if (data->count) {
prepare_irg(irg, data);
/* 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) {
- n_callees = get_Call_n_callees(node);
- if (n_callees > 1 || (n_callees == 1 && get_Call_callee(node, 0) != NULL)) {
- construct_call(node);
- }
+ int j, n_callees = get_Call_n_callees(node);
+ for (j = 0; j < n_callees; ++j)
+ if (get_entity_irg(get_Call_callee(node, j)))
+ break;
+ if (j < n_callees) /* There is an entity with a graph */
+ construct_call(node);
}
}
}
static void destruct_walker(ir_node * node, void * env) {
if (get_irn_op(node) == op_Block) {
remove_Block_cg_cfgpred_arr(node);
+ /* Do not turn Break into Jmp. Better: merge blocks right away. */
+ if (get_Block_n_cfgpreds(node) == 1) {
+ ir_node *pred = get_Block_cfgpred(node, 0);
+ if (get_irn_op(pred) == op_Break)
+ exchange(node, get_nodes_block(pred));
+ }
} else if (get_irn_op(node) == op_Filter) {
- set_irg_current_block(current_ir_graph, get_nodes_Block(node));
+ set_irg_current_block(current_ir_graph, get_nodes_block(node));
exchange(node, new_Proj(get_Filter_pred(node), get_irn_mode(node), get_Filter_proj(node)));
} else if (get_irn_op(node) == op_Break) {
- set_irg_current_block(current_ir_graph, get_nodes_Block(node));
- exchange(node, new_Jmp());
+ //set_irg_current_block(current_ir_graph, get_nodes_block(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. */
+ /* some ProjX end up in strange blocks. */
set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
}
}
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_initial_mem(irg, skip_nop(get_irg_initial_mem(irg)));
+ set_irg_frame(irg, skip_Id(get_irg_frame(irg)));
+ set_irg_globals(irg, skip_Id(get_irg_globals(irg)));
+ set_irg_initial_mem(irg, skip_Id(get_irg_initial_mem(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));
projects / libfirm / blobdiff