X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flibfirm%2Firop.h;h=32891a358bb9bca4d9a6a7c8b9c19df6abe628c2;hb=2c7e601484413ad272d685f9f0cb3ecc27b251f7;hp=0b063043204068b4f38dee24e10948e6009d1adc;hpb=d217f68a9e53ec6e800ae31ca3af8ed8b6f9ece9;p=libfirm

diff --git a/include/libfirm/irop.h b/include/libfirm/irop.h
index 0b0630432..32891a358 100644
--- a/include/libfirm/irop.h
+++ b/include/libfirm/irop.h
@@ -62,29 +62,27 @@ typedef enum {
 /** The irop flags */
 typedef enum {
 	irop_flag_none         = 0, /**< Nothing. */
-	irop_flag_labeled      = 1U << 0, /**< If set, output edge labels on in-edges in vcg graph. */
-	irop_flag_commutative  = 1U << 1, /**< This operation is commutative. */
-	irop_flag_cfopcode     = 1U << 2, /**< This operation is a control flow operation. */
-	irop_flag_fragile      = 1U << 3, /**< Set if the operation can change the
+	irop_flag_commutative  = 1U <<  0, /**< This operation is commutative. */
+	irop_flag_cfopcode     = 1U <<  1, /**< This operation is a control flow operation. */
+	irop_flag_fragile      = 1U <<  2, /**< Set if the operation can change the
 	                                       control flow because of an exception.
 	                                   */
-	irop_flag_forking      = 1U << 4, /**< Forking control flow at this operation. */
-	irop_flag_highlevel    = 1U << 5, /**< This operation is a pure high-level one and can be
+	irop_flag_forking      = 1U <<  3, /**< Forking control flow at this operation. */
+	irop_flag_highlevel    = 1U <<  4, /**< This operation is a pure high-level one and can be
 	                                      skipped in low-level optimizations. */
-	irop_flag_constlike    = 1U << 6, /**< This operation has no arguments and is some
+	irop_flag_constlike    = 1U <<  5, /**< This operation has no arguments and is some
 	                                       kind of a constant. */
-	irop_flag_always_opt   = 1U << 7, /**< This operation must always be optimized .*/
-	irop_flag_keep         = 1U << 8, /**< This operation can be kept in End's keep-alive list. */
-	irop_flag_start_block  = 1U << 9, /**< This operation is always placed in the Start block. */
-	irop_flag_uses_memory  = 1U << 10, /**< This operation has a memory input and may change the memory state. */
-	irop_flag_dump_noblock = 1U << 11, /**< node should be dumped outside any blocks */
-	irop_flag_dump_noinput = 1U << 12, /**< node is a placeholder for "no input" */
-	irop_flag_cse_neutral  = 1U << 13, /**< This operation is CSE neutral to its users. */
+	irop_flag_keep         = 1U <<  6, /**< This operation can be kept in End's keep-alive list. */
+	irop_flag_start_block  = 1U <<  7, /**< This operation is always placed in the Start block. */
+	irop_flag_uses_memory  = 1U <<  8, /**< This operation has a memory input and may change the memory state. */
+	irop_flag_dump_noblock = 1U <<  9, /**< node should be dumped outside any blocks */
+	irop_flag_cse_neutral  = 1U << 10, /**< This operation is CSE neutral to its users. */
 	/** This operation jumps to an unknown destination. The CFG is a
 	 * conservative aproximation in this case. You cannot change the destination
 	 * of an unknown_jump */
-	irop_flag_unknown_jump = 1U << 14,
+	irop_flag_unknown_jump = 1U << 11,
 } irop_flags;
+ENUM_BITSET(irop_flags)
 
 /** Returns the ident for the opcode name */
 FIRM_API ident *get_op_ident(const ir_op *op);
@@ -248,7 +246,7 @@ typedef struct {
 	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. */
+	transform_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. */
@@ -271,7 +269,6 @@ typedef struct {
  * @param opar      the parity of this IR operation
  * @param op_index  if the parity is oparity_unary, oparity_binary or oparity_trinary the index
  *                  of the left operand
- * @param ops       operations for this opcode, iff NULL default operations are used
  * @param attr_size attribute size for this IR operation
  *
  * @return The generated IR operation.
@@ -280,8 +277,22 @@ typedef struct {
  * The behavior of new opcode depends on the operations \c ops and the \c flags.
  */
 FIRM_API ir_op *new_ir_op(unsigned code, const char *name, op_pin_state p,
-                          unsigned flags, op_arity opar, int op_index,
-                          size_t attr_size, const ir_op_ops *ops);
+                          irop_flags flags, op_arity opar, int op_index,
+                          size_t attr_size);
+
+/** Returns one more than the highest opcode code in use. */
+FIRM_API unsigned ir_get_n_opcodes(void);
+
+/**
+ * Returns the opcode with code @p code.
+ *
+ * @p code has to be smaller than get_irp_n_opcode(), returns NULL if
+ * no opcode with the code exists.
+ */
+FIRM_API ir_op *ir_get_opcode(unsigned code);
+
+/** Sets the generic function pointer of all opcodes to NULL */
+FIRM_API void ir_clear_opcodes_generic_func(void);
 
 /**
  * Sets memory input of operation using memory