projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use @version tag
[libfirm]
/
ir
/
ana
/
irdom.c
diff --git
a/ir/ana/irdom.c
b/ir/ana/irdom.c
index
97a1079
..
f485c9c
100644
(file)
--- a/
ir/ana/irdom.c
+++ b/
ir/ana/irdom.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-24,13
+24,9
@@
* @date 2.2002
* @version $Id$
*/
* @date 2.2002
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
-#ifdef HAVE_STRING_H
#include <string.h>
#include <string.h>
-#endif
#include "irouts.h"
#include "irouts.h"
@@
-40,7
+36,7
@@
#include "irgraph_t.h" /* To access state field. */
#include "irnode_t.h"
#include "ircons_t.h"
#include "irgraph_t.h" /* To access state field. */
#include "irnode_t.h"
#include "ircons_t.h"
-#include "array.h"
+#include "array
_t
.h"
#include "iredges.h"
#include "iredges.h"
@@
-63,7
+59,7
@@
ir_node *get_Block_idom(const ir_node *bl) {
void set_Block_idom(ir_node *bl, ir_node *n) {
ir_dom_info *bli = get_dom_info(bl);
void set_Block_idom(ir_node *bl, ir_node *n) {
ir_dom_info *bli = get_dom_info(bl);
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
/* Set the immediate dominator of bl to n */
bli->idom = n;
/* Set the immediate dominator of bl to n */
bli->idom = n;
@@
-92,7
+88,7
@@
ir_node *get_Block_ipostdom(const ir_node *bl) {
void set_Block_ipostdom(ir_node *bl, ir_node *n) {
ir_dom_info *bli = get_pdom_info(bl);
void set_Block_ipostdom(ir_node *bl, ir_node *n) {
ir_dom_info *bli = get_pdom_info(bl);
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
/* Set the immediate post dominator of bl to n */
bli->idom = n;
/* Set the immediate post dominator of bl to n */
bli->idom = n;
@@
-110,43
+106,43
@@
void set_Block_ipostdom(ir_node *bl, ir_node *n) {
}
int get_Block_dom_pre_num(const ir_node *bl) {
}
int get_Block_dom_pre_num(const ir_node *bl) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
return get_dom_info(bl)->pre_num;
}
void set_Block_dom_pre_num(ir_node *bl, int num) {
return get_dom_info(bl)->pre_num;
}
void set_Block_dom_pre_num(ir_node *bl, int num) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
get_dom_info(bl)->pre_num = num;
}
int get_Block_dom_depth(const ir_node *bl) {
get_dom_info(bl)->pre_num = num;
}
int get_Block_dom_depth(const ir_node *bl) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
return get_dom_info(bl)->dom_depth;
}
void set_Block_dom_depth(ir_node *bl, int depth) {
return get_dom_info(bl)->dom_depth;
}
void set_Block_dom_depth(ir_node *bl, int depth) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
get_dom_info(bl)->dom_depth = depth;
}
int get_Block_postdom_pre_num(const ir_node *bl) {
get_dom_info(bl)->dom_depth = depth;
}
int get_Block_postdom_pre_num(const ir_node *bl) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
return get_pdom_info(bl)->pre_num;
}
void set_Block_postdom_pre_num(ir_node *bl, int num) {
return get_pdom_info(bl)->pre_num;
}
void set_Block_postdom_pre_num(ir_node *bl, int num) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
get_pdom_info(bl)->pre_num = num;
}
int get_Block_postdom_depth(const ir_node *bl) {
get_pdom_info(bl)->pre_num = num;
}
int get_Block_postdom_depth(const ir_node *bl) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
return get_pdom_info(bl)->dom_depth;
}
void set_Block_postdom_depth(ir_node *bl, int depth) {
return get_pdom_info(bl)->dom_depth;
}
void set_Block_postdom_depth(ir_node *bl, int depth) {
- assert(
get_irn_op(bl) == op_Block
);
+ assert(
is_Block(bl)
);
get_pdom_info(bl)->dom_depth = depth;
}
get_pdom_info(bl)->dom_depth = depth;
}
@@
-360,7
+356,7
@@
void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
/* The root of the dominator tree should be the Start block. */
ir_node *root = get_irg_start_block(irg);
/* The root of the dominator tree should be the Start block. */
ir_node *root = get_irg_start_block(irg);
- assert(irg->dom_state == dom_consistent
+
assert(irg->dom_state == dom_consistent
&& "The dominators of the irg must be consistent");
assert(root && "The start block of the graph is NULL?");
assert(get_dom_info(root)->idom == NULL
&& "The dominators of the irg must be consistent");
assert(root && "The start block of the graph is NULL?");
assert(get_dom_info(root)->idom == NULL
@@
-398,6
+394,7
@@
static void assign_tree_dom_pre_order_max(ir_node *bl, void *data)
ir_node *p;
unsigned max = 0;
unsigned children = 0;
ir_node *p;
unsigned max = 0;
unsigned children = 0;
+ (void) data;
for(p = bi->first; p; p = get_dom_info(p)->next) {
unsigned max_p = get_dom_info(p)->max_subtree_pre_num;
for(p = bi->first; p; p = get_dom_info(p)->next) {
unsigned max_p = get_dom_info(p)->max_subtree_pre_num;
@@
-423,6
+420,7
@@
static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
ir_node *p;
unsigned max = 0;
unsigned children = 0;
ir_node *p;
unsigned max = 0;
unsigned children = 0;
+ (void) data;
for(p = bi->first; p; p = get_pdom_info(p)->next) {
unsigned max_p = get_pdom_info(p)->max_subtree_pre_num;
for(p = bi->first; p; p = get_pdom_info(p)->next) {
unsigned max_p = get_pdom_info(p)->max_subtree_pre_num;
@@
-505,7
+503,11
@@
static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
/* Iterate */
for (i = get_Block_n_cfg_outs_ka(bl) - 1; i >= 0; --i) {
ir_node *pred = get_Block_cfg_out_ka(bl, i);
/* Iterate */
for (i = get_Block_n_cfg_outs_ka(bl) - 1; i >= 0; --i) {
ir_node *pred = get_Block_cfg_out_ka(bl, i);
- assert(is_Block(pred));
+ /* can happen for half-optimized dead code (I've seen this in student
+ projects */
+ if (!is_Block(pred))
+ continue;
+
init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
}
}
init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
}
}
@@
-577,14
+579,14
@@
static void dom_compress(tmp_dom_info *v) {
* if V is a root, return v, else return the vertex u, not being the
* root, with minimum u->semi on the path from v to its root.
*/
* if V is a root, return v, else return the vertex u, not being the
* root, with minimum u->semi on the path from v to its root.
*/
-
INLINE
static tmp_dom_info *dom_eval(tmp_dom_info *v) {
+
inline
static tmp_dom_info *dom_eval(tmp_dom_info *v) {
if (!v->ancestor) return v;
dom_compress (v);
return v->label;
}
/** make V W's ancestor */
if (!v->ancestor) return v;
dom_compress (v);
return v->label;
}
/** make V W's ancestor */
-
INLINE
static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
+
inline
static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
w->ancestor = v;
}
w->ancestor = v;
}
@@
-634,19
+636,19
@@
static int init_construction(ir_graph *irg, irg_walk_func *pre) {
for (i = j = 0; i < arity; i++) {
ir_node *pred = get_End_keepalive(end, i);
for (i = j = 0; i < arity; i++) {
ir_node *pred = get_End_keepalive(end, i);
- if (get_irn_op(pred) == op_Block) {
- if (Block_not_block_visited(pred)) {
- /* we found a endless loop */
- dec_irg_block_visited(irg);
- irg_block_walk(pred, pre, NULL, &n_blocks);
- }
- else
+ if (!is_Block(pred)) {
+ pred = get_nodes_block(pred);
+ if (!is_Block(pred)) {
+ /* a node which has a bad block input: kill it */
continue;
continue;
+ }
}
}
+ dec_irg_block_visited(irg);
+ irg_block_walk(pred, pre, NULL, &n_blocks);
in[j++] = pred;
}
if (j != arity) {
in[j++] = pred;
}
if (j != arity) {
- /* we kill some
Block
keep-alives */
+ /* we kill some keep-alives */
set_End_keepalives(end, j, in);
set_irg_outs_inconsistent(irg);
}
set_End_keepalives(end, j, in);
set_irg_outs_inconsistent(irg);
}
@@
-675,7
+677,7
@@
void compute_doms(ir_graph *irg) {
n_blocks = init_construction(irg, count_and_init_blocks_dom);
/* Memory for temporary information. */
n_blocks = init_construction(irg, count_and_init_blocks_dom);
/* Memory for temporary information. */
- tdi_list =
xcalloc(n_blocks, sizeof(tdi_list[0])
);
+ tdi_list =
XMALLOCNZ(tmp_dom_info, n_blocks
);
/* We need the out data structure. */
assure_irg_outs(irg);
/* We need the out data structure. */
assure_irg_outs(irg);
@@
-789,8
+791,8
@@
void assure_doms(ir_graph *irg) {
void free_dom(ir_graph *irg) {
/* Update graph state */
void free_dom(ir_graph *irg) {
/* Update graph state */
- assert(get_irg_phase_state(
current_ir_graph
) != phase_building);
-
current_ir_graph
->dom_state = dom_none;
+ assert(get_irg_phase_state(
irg
) != phase_building);
+
irg
->dom_state = dom_none;
/* With the implementation right now there is nothing to free,
but better call it anyways... */
/* With the implementation right now there is nothing to free,
but better call it anyways... */
@@
-814,7
+816,7
@@
void compute_postdoms(ir_graph *irg) {
n_blocks = init_construction(irg, count_and_init_blocks_pdom);
/* Memory for temporary information. */
n_blocks = init_construction(irg, count_and_init_blocks_pdom);
/* Memory for temporary information. */
- tdi_list =
xcalloc(n_blocks, sizeof(tdi_list[0])
);
+ tdi_list =
XMALLOCNZ(tmp_dom_info, n_blocks
);
/* We need the out data structure. */
assure_irg_outs(irg);
/* We need the out data structure. */
assure_irg_outs(irg);
@@
-900,8
+902,8
@@
void assure_postdoms(ir_graph *irg) {
void free_postdom(ir_graph *irg) {
/* Update graph state */
void free_postdom(ir_graph *irg) {
/* Update graph state */
- assert(get_irg_phase_state(
current_ir_graph
) != phase_building);
-
current_ir_graph
->pdom_state = dom_none;
+ assert(get_irg_phase_state(
irg
) != phase_building);
+
irg
->pdom_state = dom_none;
/* With the implementation right now there is nothing to free,
but better call it anyways... */
/* With the implementation right now there is nothing to free,
but better call it anyways... */