projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo.
[libfirm]
/
ir
/
ir
/
ircons.c
diff --git
a/ir/ir/ircons.c
b/ir/ir/ircons.c
index
f38994b
..
b263e89
100644
(file)
--- a/
ir/ir/ircons.c
+++ b/
ir/ir/ircons.c
@@
-87,8
+87,8
@@
ir_node *new_rd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[],
memcpy(res->attr.assem.output_constraints, outputs, sizeof(outputs[0]) * n_outs);
memcpy(res->attr.assem.clobbers, clobber, sizeof(clobber[0]) * n_clobber);
memcpy(res->attr.assem.output_constraints, outputs, sizeof(outputs[0]) * n_outs);
memcpy(res->attr.assem.clobbers, clobber, sizeof(clobber[0]) * n_clobber);
- res = optimize_node(res);
irn_verify_irg(res, irg);
irn_verify_irg(res, irg);
+ res = optimize_node(res);
return res;
}
return res;
}
@@
-106,8
+106,8
@@
ir_node *new_rd_SymConst(dbg_info *db, ir_graph *irg, ir_mode *mode,
res->attr.symc.kind = symkind;
res->attr.symc.sym = value;
res->attr.symc.kind = symkind;
res->attr.symc.sym = value;
- res = optimize_node(res);
irn_verify_irg(res, irg);
irn_verify_irg(res, irg);
+ res = optimize_node(res);
return res;
}
return res;
}
@@
-243,7
+243,7
@@
static ir_node *set_phi_arguments(ir_node *phi, int pos)
ir_node *cfgpred = get_Block_cfgpred_block(block, i);
ir_node *value;
if (is_Bad(cfgpred)) {
ir_node *cfgpred = get_Block_cfgpred_block(block, i);
ir_node *value;
if (is_Bad(cfgpred)) {
- value = new_r_Bad(irg);
+ value = new_r_Bad(irg
, mode
);
} else {
inc_irg_visited(irg);
} else {
inc_irg_visited(irg);
@@
-287,7
+287,7
@@
static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
/* We ran into a cycle. This may happen in unreachable loops. */
if (irn_visited_else_mark(block)) {
/* Since the loop is unreachable, return a Bad. */
/* We ran into a cycle. This may happen in unreachable loops. */
if (irn_visited_else_mark(block)) {
/* Since the loop is unreachable, return a Bad. */
- return new_r_Bad(irg);
+ return new_r_Bad(irg
, mode
);
}
/* in a matured block we can immediately determine the phi arguments */
}
/* in a matured block we can immediately determine the phi arguments */
@@
-306,11
+306,12
@@
static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
}
/* one predecessor just use its value */
} else if (arity == 1) {
}
/* one predecessor just use its value */
} else if (arity == 1) {
- ir_node *cfgpred = get_Block_cfgpred
_block
(block, 0);
+ ir_node *cfgpred = get_Block_cfgpred(block, 0);
if (is_Bad(cfgpred)) {
if (is_Bad(cfgpred)) {
- res =
cfgpred
;
+ res =
new_r_Bad(irg, mode)
;
} else {
} else {
- res = get_r_value_internal(cfgpred, pos, mode);
+ ir_node *cfgpred_block = get_nodes_block(cfgpred);
+ res = get_r_value_internal(cfgpred_block, pos, mode);
}
/* multiple predecessors construct Phi */
} else {
}
/* multiple predecessors construct Phi */
} else {
@@
-376,8
+377,8
@@
void mature_immBlock(ir_node *block)
nodes refer to the unoptimized node.
We can call optimize_in_place_2(), as global cse has no effect on blocks.
*/
nodes refer to the unoptimized node.
We can call optimize_in_place_2(), as global cse has no effect on blocks.
*/
- block = optimize_in_place_2(block);
irn_verify_irg(block, irg);
irn_verify_irg(block, irg);
+ block = optimize_in_place_2(block);
}
ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
}
ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
@@
-432,8
+433,8
@@
ir_node *new_rd_strictConv(dbg_info *dbgi, ir_node *block, ir_node * irn_op, ir_
res = new_ir_node(dbgi, irg, block, op_Conv, mode, 1, in);
res->attr.conv.strict = 1;
res = new_ir_node(dbgi, irg, block, op_Conv, mode, 1, in);
res->attr.conv.strict = 1;
- res = optimize_node(res);
irn_verify_irg(res, irg);
irn_verify_irg(res, irg);
+ res = optimize_node(res);
return res;
}
return res;
}
@@
-469,8
+470,8
@@
ir_node *new_rd_DivRL(dbg_info *dbgi, ir_node *block, ir_node * irn_mem, ir_node
res->attr.div.resmode = resmode;
res->attr.div.no_remainder = 1;
res->attr.div.exc.pin_state = pin_state;
res->attr.div.resmode = resmode;
res->attr.div.no_remainder = 1;
res->attr.div.exc.pin_state = pin_state;
- res = optimize_node(res);
irn_verify_irg(res, irg);
irn_verify_irg(res, irg);
+ res = optimize_node(res);
return res;
}
return res;
}
@@
-551,13
+552,13
@@
void add_immBlock_pred(ir_node *block, ir_node *jmp)
void set_cur_block(ir_node *target)
{
void set_cur_block(ir_node *target)
{
- assert(target == NULL || current_ir_graph == get_irn_irg(target));
- current_ir_graph->current_block = target;
+ set_r_cur_block(current_ir_graph, target);
}
void set_r_cur_block(ir_graph *irg, ir_node *target)
{
}
void set_r_cur_block(ir_graph *irg, ir_node *target)
{
- assert(target == NULL || irg == get_irn_irg(target));
+ assert(target == NULL || get_irn_mode(target) == mode_BB);
+ assert(target == NULL || get_irn_irg(target) == irg);
irg->current_block = target;
}
irg->current_block = target;
}