/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "lowering.h"
#include "irop_t.h"
#include "irgmod.h"
#include "irgopt.h"
#include "trouts.h"
+#include "irvrfy.h"
#include "pmap.h"
-#include "xmalloc.h"
+#include "array_t.h"
#include "iropt_dbg.h"
+#include "error.h"
-/** Walker environment */
+/** Walker environment. */
typedef struct _walker_env {
pmap *c_map; /**< The intrinsic call map. */
unsigned nr_of_intrinsics; /**< statistics */
ir_entity *ent;
symconst = get_Call_ptr(node);
- if (! is_SymConst_addr_ent(symconst))
+ if (! is_Global(symconst))
return;
- ent = get_SymConst_entity(symconst);
+ ent = get_Global_entity(symconst);
p = pmap_find(wenv->c_map, ent);
if (p) {
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
irg = get_irp_irg(i);
- if (part_block_used)
+ if (part_block_used) {
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);
collect_phiprojs(irg);
+ }
wenv.nr_of_intrinsics = 0;
irg_walk_graph(irg, NULL, call_mapper, &wenv);
- if (wenv.nr_of_intrinsics) {
- /* changes detected */
+ if (part_block_used)
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);
+
+ if (wenv.nr_of_intrinsics > 0) {
+ /* Changes detected: we might have added/removed nodes. */
set_irg_outs_inconsistent(irg);
set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
- /* exception control flow might have changed */
+ /* Exception control flow might have changed / new block might have added. */
set_irg_doms_inconsistent(irg);
set_irg_extblk_inconsistent(irg);
set_irg_loopinfo_inconsistent(irg);
- /* calls might be removed/added */
+ /* Calls might be removed/added. */
set_trouts_inconsistent();
- /* optimize it, tuple might be created */
- local_optimize_graph(irg);
+ /* verify here */
+ irg_verify(irg, VRFY_NORMAL);
+
+ /* Optimize it, tuple might be created. */
+ optimize_graph_df(irg);
nr_of_intrinsics += wenv.nr_of_intrinsics;
}
dbg_info *dbg = get_irn_dbg_info(call);
(void) ctx;
+ if (mode_is_signed(get_irn_mode(op))) {
+ ir_mode *mode = get_irn_mode(op);
+ mode = find_unsigned_mode(mode);
+ if (mode == NULL) {
+ panic("Cannot find unsigned mode for %M", mode);
+ }
+ op = new_rd_Conv(dbg, current_ir_graph, block, op, mode);
+ }
+
irn = new_rd_Alloc(dbg, current_ir_graph, block, mem, op, firm_unknown_type, stack_alloc);
- mem = new_Proj(irn, mode_M, pn_Alloc_M);
- no_exc = new_Proj(irn, mode_X, pn_Alloc_X_regular);
- exc = new_Proj(irn, mode_X, pn_Alloc_X_except);
- irn = new_Proj(irn, get_modeP_data(), pn_Alloc_res);
+ mem = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_M, pn_Alloc_M);
+ no_exc = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_regular);
+ exc = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_except);
+ irn = new_rd_Proj(dbg, current_ir_graph, block, irn, get_modeP_data(), pn_Alloc_res);
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA);
replace_call(irn, call, mem, no_exc, exc);
if (tarval_is_null(tv)) {
/* pow(x, 0.0) = 1.0 */
ir_mode *mode = get_tarval_mode(tv);
- irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode));
+ irn = new_Const(get_mode_one(mode));
} else if (tarval_is_one(tv)) {
/* pow(x, 1.0) = x */
irn = left;
ir_mode *mode = get_irn_mode(left);
ir_node *quot;
- irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode));
+ irn = new_Const(get_mode_one(mode));
quot = new_rd_Quot(dbg, current_ir_graph, block, mem, irn, left, mode, op_pin_state_pinned);
mem = new_r_Proj(current_ir_graph, block, quot, mode_M, pn_Quot_M);
irn = new_r_Proj(current_ir_graph, block, quot, mode, pn_Quot_res);
if (is_Const(val) && is_Const_null(val)) {
/* exp(0.0) = 1.0 */
- ir_node *block = get_nodes_block(call);
ir_mode *mode = get_irn_mode(val);
- ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode));
+ ir_node *irn = new_Const(get_mode_one(mode));
ir_node *mem = get_Call_mem(call);
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_EXP);
replace_call(irn, call, mem, NULL, NULL);
if (is_Const(val) && is_Const_one(val)) {
/* acos(1.0) = 0.0 */
- ir_node *block = get_nodes_block(call);
ir_mode *mode = get_irn_mode(val);
- ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode));
+ ir_node *irn = new_Const(get_mode_null(mode));
ir_node *mem = get_Call_mem(call);
DBG_OPT_ALGSIM0(call, irn, reason);
replace_call(irn, call, mem, NULL, NULL);
if (is_Const(val) && is_Const_null(val)) {
/* f(0.0) = 1.0 */
- ir_node *block = get_nodes_block(call);
ir_mode *mode = get_irn_mode(val);
- ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode));
+ ir_node *irn = new_Const(get_mode_one(mode));
ir_node *mem = get_Call_mem(call);
DBG_OPT_ALGSIM0(call, irn, reason);
replace_call(irn, call, mem, NULL, NULL);
*/
static ir_entity *get_const_entity(ir_node *ptr) {
/* FIXME: this cannot handle constant strings inside struct initializers yet */
- if (is_SymConst_addr_ent(ptr)) {
- ir_entity *ent = get_SymConst_entity(ptr);
+ if (is_Global(ptr)) {
+ ir_entity *ent = get_Global_entity(ptr);
if (get_entity_variability(ent) == variability_constant) {
/* a constant entity */
mode = get_type_mode(tp);
/* FIXME: This is too restrict, as the type char might be more the 8bits */
- if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+ if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
return NULL;
n = get_compound_ent_n_values(ent);
mode = get_type_mode(tp);
/* FIXME: This is too restrict, as the type char might be more the 8bits */
- if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+ if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
return NULL;
tp = get_entity_type(right);
mode = get_type_mode(tp);
/* FIXME: This is too restrict, as the type char might be more the 8bits */
- if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+ if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
return NULL;
n = get_compound_ent_n_values(left);
mode = get_type_mode(tp);
/* FIXME: This is too restrict, as the type char might be more the 8bits */
- if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+ if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
return 0;
n = get_compound_ent_n_values(ent);
ir_node *irn = NULL;
ir_node *exc = NULL;
ir_node *reg = NULL;
- ir_node *adr = get_Call_ptr(call);
- ir_entity *ent = get_SymConst_entity(adr);
- ir_type *call_tp = get_entity_type(ent);
+ ir_type *call_tp = get_Call_type(call);
ir_type *res_tp = get_method_res_type(call_tp, 0);
ir_entity *ent_l, *ent_r;
ir_type *char_tp;
/* a strcmp(s, s) ==> 0 */
ir_node *mem = get_Call_mem(call);
ir_mode *mode = get_type_mode(res_tp);
- ir_node *block = get_nodes_block(call);
- irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode));
+ irn = new_Const(get_mode_null(mode));
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP);
replace_call(irn, call, mem, NULL, NULL);
return 1;
mode = get_type_mode(char_tp);
/* replace the strcmp by (*x) */
- irn = new_rd_Load(dbg, current_ir_graph, block, mem, v, mode);
+ irn = new_rd_Load(dbg, current_ir_graph, block, mem, v, mode, 0);
mem = new_r_Proj(current_ir_graph, block, irn, mode_M, pn_Load_M);
exc = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_except);
reg = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_regular);
ir_type *call_tp = get_entity_type(ent);
ir_type *res_tp = get_method_res_type(call_tp, 0);
ir_mode *mode = get_type_mode(res_tp);
- ir_node *block = get_nodes_block(call);
- irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode));
+ irn = new_Const(get_mode_null(mode));
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRNCMP);
replace_call(irn, call, mem, NULL, NULL);
return 1;
set_Tuple_pred(node, i, new_r_Bad(irg));
if (rt->mem_proj_nr >= 0)
set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_regular));
- if (get_irn_op(mem) != op_NoMem) {
+ if (!is_NoMem(mem)) {
/* Exceptions can only be handled with real memory */
if (rt->regular_proj_nr >= 0)
set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_regular));