projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert bitfield initializer tarvals before using them
[libfirm]
/
ir
/
be
/
beirgmod.c
diff --git
a/ir/be/beirgmod.c
b/ir/be/beirgmod.c
index
70bd642
..
dc3ee7a
100644
(file)
--- a/
ir/be/beirgmod.c
+++ b/
ir/be/beirgmod.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.
*
@@
-53,6
+53,7
@@
#include "iredges_t.h"
#include "irgraph_t.h"
#include "irgopt.h"
#include "iredges_t.h"
#include "irgraph_t.h"
#include "irgopt.h"
+#include "irgmod.h"
#include "irprintf_t.h"
#include "irgwalk.h"
#include "irprintf_t.h"
#include "irgwalk.h"
@@
-192,7
+193,7
@@
static void remove_empty_block(ir_node *block)
}
/* there can be some non-scheduled Pin nodes left in the block, move them
}
/* there can be some non-scheduled Pin nodes left in the block, move them
- * to the succ block */
+ * to the succ block
(Pin) or pred block (Sync)
*/
foreach_out_edge_safe(block, edge, next) {
node = get_edge_src_irn(edge);
foreach_out_edge_safe(block, edge, next) {
node = get_edge_src_irn(edge);
@@
-208,11
+209,20
@@
static void remove_empty_block(ir_node *block)
set_nodes_block(node, succ_block);
continue;
}
set_nodes_block(node, succ_block);
continue;
}
+ if (is_Sync(node)) {
+ set_nodes_block(node, get_nodes_block(pred));
+ continue;
+ }
+ if (is_End(node)) { /* End-keep, reroute it to the successor */
+ int pos = get_edge_src_pos(edge);
+ set_irn_n(node, pos, succ_block);
+ continue;
+ }
panic("Unexpected node %+F in block %+F with empty schedule", node, block);
}
set_Block_cfgpred(block, 0, new_Bad());
panic("Unexpected node %+F in block %+F with empty schedule", node, block);
}
set_Block_cfgpred(block, 0, new_Bad());
-
be_
kill_node(jump);
+ kill_node(jump);
blocks_removed = 1;
/* check predecessor */
blocks_removed = 1;
/* check predecessor */
@@
-235,7
+245,7
@@
int be_remove_empty_blocks(ir_graph *irg)
blocks_removed = 0;
blocks_removed = 0;
-
set_using_visited(irg
);
+
ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED
);
inc_irg_visited(irg);
remove_empty_block(get_irg_end_block(irg));
end = get_irg_end(irg);
inc_irg_visited(irg);
remove_empty_block(get_irg_end_block(irg));
end = get_irg_end(irg);
@@
-246,13
+256,14
@@
int be_remove_empty_blocks(ir_graph *irg)
continue;
remove_empty_block(pred);
}
continue;
remove_empty_block(pred);
}
-
clear_using_visited(irg
);
+
ir_free_resources(irg, IR_RESOURCE_IRN_VISITED
);
if (blocks_removed) {
/* invalidate analysis info */
set_irg_doms_inconsistent(irg);
set_irg_extblk_inconsistent(irg);
set_irg_outs_inconsistent(irg);
if (blocks_removed) {
/* invalidate analysis info */
set_irg_doms_inconsistent(irg);
set_irg_extblk_inconsistent(irg);
set_irg_outs_inconsistent(irg);
+ set_irg_loopinfo_inconsistent(irg);
}
return blocks_removed;
}
}
return blocks_removed;
}