projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ir_mode: simplify interface, improve float-mode handling
[libfirm]
/
ir
/
ir
/
ircons.c
diff --git
a/ir/ir/ircons.c
b/ir/ir/ircons.c
index
810f225
..
290e1c4
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,8
+243,10
@@
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 {
} else {
+ inc_irg_visited(irg);
+
value = get_r_value_internal(cfgpred, pos, mode);
}
in[i] = value;
value = get_r_value_internal(cfgpred, pos, mode);
}
in[i] = value;
@@
-277,16
+279,22
@@
static ir_node *set_phi_arguments(ir_node *phi, int pos)
*/
static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
{
*/
static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
{
- ir_node *res = block->attr.block.graph_arr[pos];
+ ir_node *res = block->attr.block.graph_arr[pos];
+ ir_graph *irg = get_irn_irg(block);
if (res != NULL)
return res;
if (res != NULL)
return res;
+ /* 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, mode);
+ }
+
/* in a matured block we can immediately determine the phi arguments */
/* in a matured block we can immediately determine the phi arguments */
- if (
block->attr.block.is_matured
) {
+ if (
get_Block_matured(block)
) {
int arity = get_irn_arity(block);
/* no predecessors: use unknown value */
if (arity == 0 && block == get_irg_start_block(get_irn_irg(block))) {
int arity = get_irn_arity(block);
/* no predecessors: use unknown value */
if (arity == 0 && block == get_irg_start_block(get_irn_irg(block))) {
- ir_graph *irg = get_irn_irg(block);
if (default_initialize_local_variable != NULL) {
ir_node *rem = get_r_cur_block(irg);
set_r_cur_block(irg, block);
if (default_initialize_local_variable != NULL) {
ir_node *rem = get_r_cur_block(irg);
set_r_cur_block(irg, block);
@@
-297,11
+305,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 {
@@
-357,7
+366,7
@@
void mature_immBlock(ir_node *block)
}
}
}
}
-
block->attr.block.is_matured = 1
;
+
set_Block_matured(block, 1)
;
/* Now, as the block is a finished Firm node, we can optimize it.
Since other nodes have been allocated since the block was created
/* Now, as the block is a finished Firm node, we can optimize it.
Since other nodes have been allocated since the block was created
@@
-367,8
+376,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)
@@
-423,8
+432,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;
}
@@
-460,8
+469,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;
}
@@
-491,14
+500,12
@@
ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
/* creates a new dynamic in-array as length of in is -1 */
res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
/* creates a new dynamic in-array as length of in is -1 */
res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
- res->attr.block.is_matured = 0;
- res->attr.block.is_dead = 0;
+ set_Block_matured(res, 0);
res->attr.block.irg.irg = irg;
res->attr.block.backedge = NULL;
res->attr.block.in_cg = NULL;
res->attr.block.cg_backedge = NULL;
res->attr.block.extblk = NULL;
res->attr.block.irg.irg = irg;
res->attr.block.backedge = NULL;
res->attr.block.in_cg = NULL;
res->attr.block.cg_backedge = NULL;
res->attr.block.extblk = NULL;
- res->attr.block.region = NULL;
res->attr.block.entity = NULL;
set_Block_block_visited(res, 0);
res->attr.block.entity = NULL;
set_Block_block_visited(res, 0);
@@
-533,7
+540,7
@@
void add_immBlock_pred(ir_node *block, ir_node *jmp)
int n = ARR_LEN(block->in) - 1;
assert(is_Block(block) && "Error: Must be a Block");
int n = ARR_LEN(block->in) - 1;
assert(is_Block(block) && "Error: Must be a Block");
- assert(!
block->attr.block.is_matured
&& "Error: Block already matured!\n");
+ assert(!
get_Block_matured(block)
&& "Error: Block already matured!\n");
assert(is_ir_node(jmp));
ARR_APP1(ir_node *, block->in, jmp);
assert(is_ir_node(jmp));
ARR_APP1(ir_node *, block->in, jmp);
@@
-543,13
+550,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;
}
@@
-567,6
+574,7
@@
ir_node *get_r_value(ir_graph *irg, int pos, ir_mode *mode)
{
assert(get_irg_phase_state(irg) == phase_building);
assert(pos >= 0);
{
assert(get_irg_phase_state(irg) == phase_building);
assert(pos >= 0);
+ inc_irg_visited(irg);
return get_r_value_internal(irg->current_block, pos + 1, mode);
}
return get_r_value_internal(irg->current_block, pos + 1, mode);
}
@@
-586,9
+594,8
@@
static ir_mode *guess_recursively(ir_node *block, int pos)
int n_preds;
int i;
int n_preds;
int i;
- if (irn_visited(block))
+ if (irn_visited
_else_mark
(block))
return NULL;
return NULL;
- mark_irn_visited(block);
/* already have a defintion -> we can simply look at its mode */
value = block->attr.block.graph_arr[pos];
/* already have a defintion -> we can simply look at its mode */
value = block->attr.block.graph_arr[pos];
@@
-665,6
+672,7
@@
int find_value(ir_node *value)
ir_node *get_r_store(ir_graph *irg)
{
assert(get_irg_phase_state(irg) == phase_building);
ir_node *get_r_store(ir_graph *irg)
{
assert(get_irg_phase_state(irg) == phase_building);
+ inc_irg_visited(irg);
return get_r_value_internal(irg->current_block, 0, mode_M);
}
return get_r_value_internal(irg->current_block, 0, mode_M);
}
@@
-716,14
+724,10
@@
void set_store(ir_node *store)
set_r_store(current_ir_graph, store);
}
set_r_store(current_ir_graph, store);
}
-void r_keep_alive(ir_graph *irg, ir_node *ka)
-{
- add_End_keepalive(get_irg_end(irg), ka);
-}
-
void keep_alive(ir_node *ka)
{
void keep_alive(ir_node *ka)
{
- r_keep_alive(current_ir_graph, ka);
+ ir_graph *irg = get_irn_irg(ka);
+ add_End_keepalive(get_irg_end(irg), ka);
}
void ir_set_uninitialized_local_variable_func(
}
void ir_set_uninitialized_local_variable_func(