Bad and Unknown are pinned instructions yet, speeding up code placement

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 518c63c..b6e1250 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -39,6 +39,10 @@
 
 # include "exc.h"
 
+#include "set.h"
+#include "entity_t.h"
+#include "type_t.h"
+
 /** ir node attributes **/
 
 /** Block attributes */
@@ -85,16 +89,10 @@ typedef struct {
   type   *tp;        /**< the source type, for analyses. default: type_unknown. */
 } const_attr;
 
-/** SymConst attributes
-    This union contains the symbolic information represented by the node */
-typedef union type_or_id {
-  type  *typ;
-  ident *ptrinfo;
-} type_or_id;
-
 typedef struct {
-  type_or_id tori;
+  symconst_symbol sym;  // old tori
   symconst_kind num;
+  type *tp;          /**< the source type, for analyses. default: type_unknown. */
 } symconst_attr;
 
 /** Sel attributes */
@@ -170,7 +168,7 @@ typedef union {
   callbegin_attr callbegin; /**< For CallBegin */
   alloc_attr     a;     /**< For Alloc. */
   io_attr        io;    /**< For InstOf */
-  type           *f;    /**< For Free. */
+  type          *f;     /**< For Free. */
   cast_attr      cast;  /**< For Cast. */
   int            phi0_pos;  /**< For Phi. Used to remember the value defined by
                    this Phi node.  Needed when the Phi is completed
@@ -216,6 +214,10 @@ struct ir_node {
 #endif
   /* ------- For analyses -------- */
   ir_loop *loop;           /**< the loop the node is in. Access routines in irloop.h */
+#ifdef  DO_HEAPANALYSIS
+  struct abstval *av;
+  struct section *sec;
+#endif
   /* ------- Opcode depending fields -------- */
   attr attr;               /**< attribute of this node. Depends on opcode.
                               Must be last field of struct ir_node. */
@@ -314,7 +316,6 @@ __get_irn_inter_arity (const ir_node *node) {
  */
 static INLINE int
 __get_irn_arity (const ir_node *node) {
-  assert(node);
   if (interprocedural_view) return __get_irn_inter_arity(node);
   return __get_irn_intra_arity(node);
 }
@@ -324,7 +325,7 @@ __get_irn_arity (const ir_node *node) {
  */
 static INLINE ir_node *
 __get_irn_intra_n (ir_node *node, int n) {
-  return (node->in[n + 1] = skip_nop(node->in[n + 1]));
+  return (node->in[n + 1] = skip_Id(node->in[n + 1]));
 }
 
 /**
@@ -335,9 +336,9 @@ __get_irn_inter_n (ir_node *node, int n) {
   /* handle Filter and Block specially */
   if (__get_irn_opcode(node) == iro_Filter) {
     assert(node->attr.filter.in_cg);
-    return (node->attr.filter.in_cg[n + 1] = skip_nop(node->attr.filter.in_cg[n + 1]));
+    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) {
-    return (node->attr.block.in_cg[n + 1] = skip_nop(node->attr.block.in_cg[n + 1]));
+    return (node->attr.block.in_cg[n + 1] = skip_Id(node->attr.block.in_cg[n + 1]));
   }
 
   return __get_irn_intra_n (node, n);