use tv_t.h instead of tv.h

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index e325d19..f5050e9 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,8 @@ 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 */
+
 } block_attr;
 
 /** Start attributes */
@@ -375,10 +378,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]));
   }
 
@@ -501,7 +504,7 @@ 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));
+  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;
@@ -527,10 +530,16 @@ _is_Bad(const ir_node *node) {
 
 static INLINE int
 _is_Const(const ir_node *node) {
-       assert(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));
@@ -632,6 +641,7 @@ static INLINE type *_get_irn_type(ir_node *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)