X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firop_t.h;h=92f0402278e906e8402e703726c160439f0c4f6a;hb=346dfddce9be4420855b06ea40d2bf21dad9bc88;hp=532e21dca5b96e218b09c4f6f7f6fc3c83c71932;hpb=9a83b13f4097e77eb0239b76a3e97a51e55ea5cd;p=libfirm

diff --git a/ir/ir/irop_t.h b/ir/ir/irop_t.h
index 532e21dca..92f040227 100644
--- a/ir/ir/irop_t.h
+++ b/ir/ir/irop_t.h
@@ -41,6 +41,7 @@ typedef enum {
   irop_flag_ip_cfopcode = 0x00000008,	/**< operation manipulates interprocedural control flow */
   irop_flag_fragile     = 0x00000010,	/**< set if the operation can change the control flow because
                                              of an exception */
+  irop_flag_forking     = 0x00000020,   /**< the operation is a forking control flow */
 } irop_flags;
 
 
@@ -78,12 +79,19 @@ typedef ir_node *(*transform_node_func)(ir_node *n);
  */
 typedef int (*node_cmp_attr_func)(ir_node *a, ir_node *b);
 
+/**
+ * The reassociation operation.
+ * Called from a walker.  Returns non-zero if
+ * a reassociation rule was applied.
+ */
+typedef int (*reassociate_func)(ir_node *n);
+
 /** The type of an ir_op. */
 struct ir_op {
   opcode code;            /**< the unique opcode of the op */
   ident *name;            /**< the name of the op */
   size_t attr_size;       /**< Space needed in memory for private attributes */
-  op_pinned pinned;       /**< How to deal with the node in cse, pre. */
+  op_pin_state op_pin_state_pinned; /**< How to deal with the node in cse, pre. */
   op_arity opar;          /**< arity of operator. */
   int op_index;           /**< the index of the first data operand, 0 for most cases, 1 for Div etc. */
   unsigned flags;         /**< flags describing the behavior of the ir_op, a bitmaks of irop_flags */
@@ -93,6 +101,7 @@ struct ir_op {
   equivalent_node_func  equivalent_node;	/**< optimizes the node by returning an equivalent one. */
   transform_node_func   transform_node;		/**< optimizes the node by transforming it. */
   node_cmp_attr_func    node_cmp_attr;		/**< compares two node attributes. */
+  reassociate_func      reassociate;            /**< reassociate a tree */
 };
 
 /**
@@ -100,7 +109,7 @@ struct ir_op {
  *
  * @param code      the opcode, one of type \c opcode
  * @param name      the printable name of this opcode
- * @param p         wheater operations of this opcode are pinned or floating
+ * @param p         wheater operations of this opcode are op_pin_state_pinned or floating
  * @param flags     a bitmask of irop_flags describing the behavior of the ir operation
  * @param opar      the parity of this ir operation
  * @param op_index  if the parity is oparity_unary, oparity_binary or oparity_trinary the index
@@ -109,7 +118,7 @@ struct ir_op {
  *
  * @return The genenerated ir operation.
  */
-ir_op * new_ir_op(opcode code, const char *name, op_pinned p,
+ir_op * new_ir_op(opcode code, const char *name, op_pin_state p,
 		   unsigned flags, op_arity opar, int op_index, size_t attr_size);
 
 /**
@@ -150,4 +159,27 @@ static INLINE int is_op_fragile(const ir_op *op) {
   return op->flags & irop_flag_fragile;
 }
 
+/* Returns non-zero if operation is forking control flow */
+static INLINE int is_op_forking(const ir_op *op) {
+  return op->flags & irop_flag_forking;
+}
+
+static INLINE opcode __get_op_code(const ir_op *op) {
+  return op->code;
+}
+
+static INLINE ident *__get_op_ident(ir_op *op){
+  return op->name;
+}
+
+static INLINE op_pin_state __get_op_pinned(const ir_op *op) {
+  return op->op_pin_state_pinned;
+}
+
+
+#define get_op_code(op)         __get_op_code(op)
+#define get_op_ident(op)        __get_op_ident(op)
+#define get_op_pinned(op)       __get_op_pinned(op)
+
+
 #endif /* _IROP_T_H_ */