iropt: Or/Eor/Add are sometimes equivalent

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 7c41e03..27faec2 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -56,7 +56,7 @@ extern unsigned firm_add_node_size;
  * @return
  *    The operations.
  */
-ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops);
+ir_op_ops *firm_set_default_get_type_attr(unsigned code, ir_op_ops *ops);
 
 /**
  * Sets the get_entity_attr operation for an ir_op_ops.
@@ -67,7 +67,7 @@ ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops);
  * @return
  *    The operations.
  */
-ir_op_ops *firm_set_default_get_entity_attr(ir_opcode code, ir_op_ops *ops);
+ir_op_ops *firm_set_default_get_entity_attr(unsigned code, ir_op_ops *ops);
 
 /**
  * Returns an array with the predecessors of the Block. Depending on
@@ -135,7 +135,7 @@ static inline unsigned _get_irn_opcode(const ir_node *node)
  */
 static inline int _get_irn_arity(const ir_node *node)
 {
-       return ARR_LEN(node->in) - 1;
+       return (int)(ARR_LEN(node->in) - 1);
 }
 
 /**
@@ -167,12 +167,12 @@ static inline unsigned hash_irn(const ir_node *node)
 }
 
 static inline int _get_irn_deps(const ir_node *node) {
-       return node->deps ? ARR_LEN(node->deps) : 0;
+       return node->deps ? (int)ARR_LEN(node->deps) : 0;
 }
 
 static inline ir_node *_get_irn_dep(const ir_node *node, int pos) {
        assert(node->deps && "dependency array node yet allocated. use add_irn_dep()");
-       assert(pos >= 0 && pos < ARR_LEN(node->deps) && "dependency index out of range");
+       assert(pos >= 0 && pos < (int)ARR_LEN(node->deps) && "dependency index out of range");
        return node->deps[pos];
 }
 
@@ -184,7 +184,7 @@ static inline void _set_irn_dep(ir_node *node, int pos, ir_node *dep)
        ir_node *old;
 
        assert(node->deps && "dependency array node yet allocated. use add_irn_dep()");
-       assert(pos >= 0 && pos < ARR_LEN(node->deps) && "dependency index out of range");
+       assert(pos >= 0 && pos < (int)ARR_LEN(node->deps) && "dependency index out of range");
        old = node->deps[pos];
        node->deps[pos] = dep;
        edges_notify_edge_kind(node, pos, dep, old, EDGE_KIND_DEP, get_irn_irg(node));
@@ -327,7 +327,7 @@ static inline op_pin_state _get_irn_pinned(const ir_node *node)
        state = _get_op_pinned(_get_irn_op(node));
 
        if (state >= op_pin_state_exc_pinned)
-               return node->attr.except.pin_state;
+               return (op_pin_state)node->attr.except.pin_state;
 
        return state;
 }
@@ -390,10 +390,14 @@ static inline ir_node *_get_Block_cfgpred(const ir_node *node, int pos)
  */
 static inline ir_node  *_get_Block_cfgpred_block(const 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;
+       ir_node *res = get_Block_cfgpred(node, pos);
+       if (is_Bad(res)) {
+               /* must return a Bad with mode_BB! */
+               ir_graph *irg = get_irn_irg(node);
+               return new_r_Bad(irg, mode_BB);
+       } else {
+               return get_nodes_block(skip_Proj(res));
+       }
 }
 
 static inline ir_visited_t _get_Block_block_visited(const ir_node *node)
@@ -420,26 +424,6 @@ static inline int _Block_block_visited(const ir_node *node)
        return node->attr.block.block_visited >= get_irg_block_visited(irg);
 }
 
-static inline ir_node *_set_Block_dead(ir_node *block)
-{
-       assert(_get_irn_op(block) == op_Block);
-       block->attr.block.dom.dom_depth = -1;
-       block->attr.block.is_dead = 1;
-       return block;
-}
-
-static inline int _is_Block_dead(const ir_node *block)
-{
-       ir_op *op = _get_irn_op(block);
-
-       if (op == op_Bad)
-               return 1;
-       else {
-               assert(op == op_Block);
-               return block->attr.block.is_dead;
-       }
-}
-
 static inline ir_graph *_get_Block_irg(const ir_node *block)
 {
        assert(is_Block(block));
@@ -531,7 +515,7 @@ static inline unsigned _get_irn_idx(const ir_node *node) {
 
 static inline dbg_info *_get_irn_dbg_info(const ir_node *n) {
        return n->dbi;
-}  /* get_irn_dbg_info */
+}
 
 static inline void _set_irn_dbg_info(ir_node *n, dbg_info *db) {
        n->dbi = db;
@@ -572,6 +556,7 @@ static inline ir_node *_get_Phi_next(const ir_node *phi)
 /** Add a Phi node to the list of Block Phi's. */
 static inline void _add_Block_phi(ir_node *block, ir_node *phi)
 {
+       assert(_is_Block(block));
        _set_Phi_next(phi, _get_Block_phis(block));
        _set_Block_phis(block, phi);
 }
@@ -637,8 +622,6 @@ void init_irnode(void);
 #define set_Block_block_visited(node, visit)  _set_Block_block_visited(node, visit)
 #define mark_Block_block_visited(node)        _mark_Block_block_visited(node)
 #define Block_block_visited(node)             _Block_block_visited(node)
-#define set_Block_dead(block)                 _set_Block_dead(block)
-#define is_Block_dead(block)                  _is_Block_dead(block)
 #define get_Block_irg(block)                  _get_Block_irg(block)
 #define get_Const_tarval(node)                _get_Const_tarval(node)
 #define is_Const_null(node)                   _is_Const_null(node)