Fixed optimization of Div/Mod/DivMod nodes

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index e9a931c..391bf01 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -68,6 +68,8 @@ typedef struct {
                      @@@ @todo Ev. replace by bitfield! */
   ir_extblk *extblk;          /**< the extended basic block this block belongs to */
 
+  struct list_head succ_head; /**< A list head for all successor edges of a block. */
+
 } block_attr;
 
 /** Start attributes */
@@ -516,9 +518,8 @@ _get_irn_pinned(const ir_node *node) {
 
 static INLINE op_pin_state
 _is_irn_pinned_in_irg(const ir_node *node) {
-  if (get_irg_pinned(get_irn_irg(node)) == op_pin_state_floats) {
-    return get_irn_pinned(node)
-  }
+  if (get_irg_pinned(get_irn_irg(node)) == op_pin_state_floats)
+    return get_irn_pinned(node);
   return op_pin_state_pinned;
 }
 
@@ -577,6 +578,25 @@ _get_Block_cfgpred (ir_node *node, int pos) {
   return _get_irn_n(node, pos);
 }
 
+/* Get the predecessor block.
+ *
+ *  Returns the block corresonding to the predecessor pos.
+ *
+ *  There are several ambiguities we resolve with this function:
+ *  - The direct predecessor can be a Proj, which is not pinned.
+ *    We walk from the predecessor to the next pinned node
+ *    (skip_Proj) and return the block that node is in.
+ *  - If we encounter the Bad node, this function does not return
+ *    Start, but the Bad node.
+ */
+static INLINE ir_node  *
+_get_Block_cfgpred_block(ir_node *node, int pos) {
+  ir_node *res = skip_Proj(get_Block_cfgpred(node, pos));
+  if (!is_Bad(res))
+    res = get_nodes_block(res);
+  return res;
+}
+
 static INLINE unsigned long
 _get_Block_block_visited (ir_node *node) {
   assert (node->op == op_Block);
@@ -674,6 +694,7 @@ static INLINE type *_get_irn_type(ir_node *node) {
 #define is_Block(node)                        _is_Block(node)
 #define get_Block_n_cfgpreds(node)            _get_Block_n_cfgpreds(node)
 #define get_Block_cfgpred(node, pos)          _get_Block_cfgpred(node, pos)
+#define get_Block_cfgpred_block(node, pos)    _get_Block_cfgpred_block(node, pos)
 #define get_Block_block_visited(node)         _get_Block_block_visited(node)
 #define set_Block_block_visited(node, visit)  _set_Block_block_visited(node, visit)
 #define mark_Block_block_visited(node)        _mark_Block_block_visited(node)