projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fehler109
[libfirm]
/
ir
/
be
/
betranshlp.c
diff --git
a/ir/be/betranshlp.c
b/ir/be/betranshlp.c
index
ddc9a04
..
20551c2
100644
(file)
--- a/
ir/be/betranshlp.c
+++ b/
ir/be/betranshlp.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.
*
@@
-60,9
+60,17
@@
void be_set_transformed_node(ir_node *old_node, ir_node *new_node) {
set_irn_link(old_node, new_node);
}
set_irn_link(old_node, new_node);
}
+int be_is_transformed(const ir_node *node) {
+ return irn_visited(node);
+}
+
static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
- assert(irn_visited(old_node));
- return (ir_node*) get_irn_link(old_node);
+ if (irn_visited(old_node)) {
+ ir_node *new_node = get_irn_link(old_node);
+ assert(new_node != NULL);
+ return new_node;
+ }
+ return NULL;
}
void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
}
void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
@@
-118,14
+126,11
@@
ir_node *be_duplicate_node(ir_node *node) {
* Calls transformation function for given node and marks it visited.
*/
ir_node *be_transform_node(ir_node *node) {
* Calls transformation function for given node and marks it visited.
*/
ir_node *be_transform_node(ir_node *node) {
- ir_node *new_node;
ir_op *op;
ir_op *op;
+ ir_node *new_node = be_get_transformed_node(node);
- if (irn_visited(node)) {
- new_node = be_get_transformed_node(node);
- assert(new_node != NULL);
+ if (new_node != NULL)
return new_node;
return new_node;
- }
mark_irn_visited(node);
DEBUG_ONLY(be_set_transformed_node(node, NULL));
mark_irn_visited(node);
DEBUG_ONLY(be_set_transformed_node(node, NULL));
@@
-330,6
+335,7
@@
static ir_node *gen_Block(ir_node *node) {
ir_graph *irg = current_ir_graph;
dbg_info *dbgi = get_irn_dbg_info(node);
ir_node *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
ir_graph *irg = current_ir_graph;
dbg_info *dbgi = get_irn_dbg_info(node);
ir_node *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
+ ir_node *macroblock = get_Block_MacroBlock(node);
ir_node *block;
/*
ir_node *block;
/*
@@
-345,10
+351,17
@@
static ir_node *gen_Block(ir_node *node) {
block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
get_irn_arity(node), get_irn_in(node) + 1);
copy_node_attr(node, block);
block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
get_irn_arity(node), get_irn_in(node) + 1);
copy_node_attr(node, block);
-
#ifdef DEBUG_libfirm
block->node_nr = node->node_nr;
#endif
#ifdef DEBUG_libfirm
block->node_nr = node->node_nr;
#endif
+ if (node == macroblock) {
+ /* this node is a macroblock header */
+ set_irn_n(block, -1, block);
+ } else {
+ macroblock = be_transform_node(macroblock);
+ set_irn_n(block, -1, macroblock);
+ }
+
be_set_transformed_node(node, block);
/* put the preds in the worklist */
be_set_transformed_node(node, block);
/* put the preds in the worklist */
@@
-393,16
+406,6
@@
void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
current_ir_graph = irg;
current_ir_graph = irg;
- /* most analysis info is wrong after transformation */
- free_callee_info(irg);
- free_irg_outs(irg);
- free_trouts();
- free_loop_information(irg);
- set_irg_doms_inconsistent(irg);
-
- be_liveness_invalidate(be_get_birg_liveness(birg));
- be_invalidate_dom_front(birg);
-
/* create a new obstack */
old_obst = irg->obst;
new_obst = xmalloc(sizeof(*new_obst));
/* create a new obstack */
old_obst = irg->obst;
new_obst = xmalloc(sizeof(*new_obst));
@@
-431,6
+434,18
@@
void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
/* restore state */
current_ir_graph = old_current_ir_graph;
/* restore state */
current_ir_graph = old_current_ir_graph;
+ /* most analysis info is wrong after transformation */
+ free_callee_info(irg);
+ free_irg_outs(irg);
+ free_trouts();
+ free_loop_information(irg);
+ set_irg_doms_inconsistent(irg);
+
+ be_liveness_invalidate(be_get_birg_liveness(birg));
+ /* Hack for now, something is buggy with invalidate liveness... */
+ birg->lv = NULL;
+ be_invalidate_dom_front(birg);
+
/* recalculate edges */
edges_deactivate(irg);
edges_activate(irg);
/* recalculate edges */
edges_deactivate(irg);
edges_activate(irg);