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 41d3ec0..391bf01 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -37,6 +37,7 @@
 #include "entity_t.h"
 #include "type_t.h"
 #include "tv_t.h"
+#include "irextbb_t.h"
 
 
 /** ir node attributes **/
@@ -65,6 +66,10 @@ typedef struct {
                      @@@ @todo Ev. replace by bitfield! */
   int *cg_backedge;           /**< Field n set to true if pred n is interprocedural backedge.
                      @@@ @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 */
@@ -375,10 +380,10 @@ _get_irn_inter_n (const ir_node *node, int n) {
   assert(node); assert(-1 <= n && n < _get_irn_inter_arity(node));
 
   /* handle Filter and Block specially */
-  if (_get_irn_opcode(node) == iro_Filter) {
+  if (_get_irn_op(node) == op_Filter) {
     assert(node->attr.filter.in_cg);
     return (node->attr.filter.in_cg[n + 1] = skip_Id(node->attr.filter.in_cg[n + 1]));
-  } else if (_get_irn_opcode(node) == iro_Block && node->attr.block.in_cg) {
+  } else if (_get_irn_op(node) == op_Block && node->attr.block.in_cg) {
     return (node->attr.block.in_cg[n + 1] = skip_Id(node->attr.block.in_cg[n + 1]));
   }
 
@@ -494,19 +499,30 @@ _get_irn_link(const ir_node *node) {
 }
 
 /**
- * Returns the pinned state of a node.
+ * Returns whether the node _always_ must be pinned.
+ * I.e., the node is not floating after global cse.
+ *
  * Intern version of libFirm.
  */
 static INLINE op_pin_state
 _get_irn_pinned(const ir_node *node) {
   op_pin_state state;
   assert(node && _is_ir_node(node));
-  state = __get_op_pinned(_get_irn_op(node));
+  /* Check opcode */
+  state = _get_op_pinned(_get_irn_op(node));
+
   if (state >= op_pin_state_exc_pinned)
     return get_opt_fragile_ops() ? node->attr.except.pin_state : op_pin_state_pinned;
   return state;
 }
 
+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);
+  return op_pin_state_pinned;
+}
+
 static INLINE int
 _is_unop(const ir_node *node) {
   assert(node && _is_ir_node(node));
@@ -525,6 +541,18 @@ _is_Bad(const ir_node *node) {
   return (node && _get_irn_op(node) == op_Bad);
 }
 
+static INLINE int
+_is_Const(const ir_node *node) {
+  assert(node);
+  return (node && _get_irn_op(node) == op_Const);
+}
+
+static INLINE int
+_is_Unknown (const ir_node *node) {
+  assert(node);
+  return (node && _get_irn_op(node) == op_Unknown);
+}
+
 static INLINE int
 _is_no_Block(const ir_node *node) {
   assert(node && _is_ir_node(node));
@@ -537,6 +565,38 @@ _is_Block(const ir_node *node) {
   return (_get_irn_op(node) == op_Block);
 }
 
+static INLINE int
+_get_Block_n_cfgpreds (ir_node *node) {
+  assert(_is_Block(node));
+  return _get_irn_arity(node);
+}
+
+static INLINE ir_node *
+_get_Block_cfgpred (ir_node *node, int pos) {
+  assert(0 <= pos && pos < get_irn_arity(node));
+  assert(_is_Block(node));
+  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);
@@ -623,11 +683,18 @@ static INLINE type *_get_irn_type(ir_node *node) {
 #define irn_not_visited(node)                 _irn_not_visited(node)
 #define set_irn_link(node, link)              _set_irn_link(node, link)
 #define get_irn_link(node)                    _get_irn_link(node)
+#define get_irn_pinned(node)                  _get_irn_pinned(node)
+#define is_irn_pinned_in_irg(node)            _is_irn_pinned_in_irg(node)
 #define is_unop(node)                         _is_unop(node)
 #define is_binop(node)                        _is_binop(node)
+#define is_Const(node)                        _is_Const(node)
+#define is_Unknown(node)                      _is_Unknown(node)
 #define is_Bad(node)                          _is_Bad(node)
 #define is_no_Block(node)                     _is_no_Block(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)