- completely get rid of useless assertion (skip_Id() want's non-const nodes)

[libfirm] / include / libfirm / irop.h

diff --git a/include/libfirm/irop.h b/include/libfirm/irop.h
index ef2dbe6..182c259 100644 (file)
--- a/include/libfirm/irop.h
+++ b/include/libfirm/irop.h
@@ -92,7 +92,7 @@ typedef enum {
        iro_Load, iro_Store, iro_Alloc, iro_Free, iro_Sync,
        iro_Proj, iro_Tuple, iro_Id, iro_Bad, iro_Confirm,
        iro_Unknown, iro_Filter, iro_Break, iro_CallBegin, iro_EndReg, iro_EndExcept,
-       iro_NoMem, iro_Mux, iro_Psi, iro_CopyB,
+       iro_NoMem, iro_Mux, iro_Min, iro_Max, iro_CopyB,
        iro_InstOf, iro_Raise, iro_Bound,
        iro_Pin,
        iro_ASM,
@@ -186,7 +186,8 @@ extern ir_op *op_EndExcept;       ir_op *get_op_EndExcept (void);
 
 extern ir_op *op_NoMem;           ir_op *get_op_NoMem     (void);
 extern ir_op *op_Mux;             ir_op *get_op_Mux       (void);
-extern ir_op *op_Psi;             ir_op *get_op_Psi       (void);
+extern ir_op *op_Min;             ir_op *get_op_Min       (void);
+extern ir_op *op_Max;             ir_op *get_op_Max       (void);
 extern ir_op *op_CopyB;           ir_op *get_op_CopyB     (void);
 
 extern ir_op *op_InstOf;          ir_op *get_op_InstOf    (void);
@@ -268,7 +269,7 @@ typedef unsigned (*hash_func)(const ir_node *self);
  * This operation evaluates an IR node into a tarval if possible,
  * returning tarval_bad otherwise.
  */
-typedef tarval *(*computed_value_func)(ir_node *self);
+typedef tarval *(*computed_value_func)(const ir_node *self);
 
 /**
  * The equivalent node operation.
@@ -371,21 +372,24 @@ typedef int (*dump_node_func)(ir_node *self, FILE *F, dump_reason_t reason);
  * io_op Operations.
  */
 typedef struct {
-       hash_func             hash;             /**< Calculate a hash value for an IR node. */
-       computed_value_func   computed_value;   /**< Evaluates a node into a tarval if possible. */
-       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. */
-       copy_attr_func        copy_attr;        /**< Copy node attributes. */
-       get_type_func         get_type;         /**< Return the type of a node. */
-       get_type_attr_func    get_type_attr;    /**< Return the type attribute of a node. */
-       get_entity_attr_func  get_entity_attr;  /**< Return the entity attribute of a node. */
-       verify_node_func      verify_node;      /**< Verify the node. */
-       verify_proj_node_func verify_proj_node; /**< Verify the Proj node. */
-       dump_node_func        dump_node;        /**< Dump a node. */
-       op_func               generic;          /**< A generic function pointer. */
-       const arch_irn_ops_t *be_ops;           /**< callbacks used by the backend. */
+       hash_func             hash;                 /**< Calculate a hash value for an IR node. */
+       computed_value_func   computed_value;       /**< Evaluates a node into a tarval if possible. */
+       computed_value_func   computed_value_Proj;  /**< Evaluates a Proj node into a tarval if possible. */
+       equivalent_node_func  equivalent_node;      /**< Optimizes the node by returning an equivalent one. */
+       equivalent_node_func  equivalent_node_Proj; /**< Optimizes the Proj node by returning an equivalent one. */
+       transform_node_func   transform_node;       /**< Optimizes the node by transforming it. */
+       equivalent_node_func  transform_node_Proj;  /**< Optimizes the Proj node by transforming it. */
+       node_cmp_attr_func    node_cmp_attr;        /**< Compares two node attributes. */
+       reassociate_func      reassociate;          /**< Reassociate a tree. */
+       copy_attr_func        copy_attr;            /**< Copy node attributes. */
+       get_type_func         get_type;             /**< Return the type of a node. */
+       get_type_attr_func    get_type_attr;        /**< Return the type attribute of a node. */
+       get_entity_attr_func  get_entity_attr;      /**< Return the entity attribute of a node. */
+       verify_node_func      verify_node;          /**< Verify the node. */
+       verify_proj_node_func verify_proj_node;     /**< Verify the Proj node. */
+       dump_node_func        dump_node;            /**< Dump a node. */
+       op_func               generic;              /**< A generic function pointer. */
+       const arch_irn_ops_t *be_ops;               /**< callbacks used by the backend. */
 } ir_op_ops;
 
 /**