move dump_color and edge_kind enum to internal headers

[r27613]

diff --git a/include/libfirm/irdump.h b/include/libfirm/irdump.h
index 55d1868..fcb62b9 100644 (file)
--- a/include/libfirm/irdump.h
+++ b/include/libfirm/irdump.h
@@ -46,60 +46,6 @@
 #include "firm_types.h"
 #include "begin.h"
 
-/**
- * Symbolic names for the different dumping colors.
- */
-typedef enum ird_color_t {
-       ird_color_prog_background,
-       ird_color_block_background,
-       ird_color_dead_block_background,
-       ird_color_block_inout,
-       ird_color_default_node,
-       ird_color_phi,
-       ird_color_memory,
-       ird_color_controlflow,
-       ird_color_const,
-       ird_color_anchor,
-       ird_color_proj,
-       ird_color_uses_memory,
-       ird_color_error,
-       ird_color_entity,
-       ird_color_count
-} ird_color_t;
-
-/**
- * Edge kinds.
- */
-typedef enum {
-       data_edge           = 0x01,   /**< A data edge between two basic blocks. */
-       block_edge          = 0x02,   /**< An edge from a node to its basic block. */
-       cf_edge             = 0x03,   /**< A regularly control flow edge. */
-       exc_cf_edge         = 0x04,   /**< An exceptional control flow edge. */
-       mem_edge            = 0x05,   /**< A memory edge. */
-       dominator_edge      = 0x06,   /**< A dominator edge from a block to its immediate dominator. */
-       node2type_edge      = 0x07,   /**< An edge from an IR node to a type. */
-
-       ent_type_edge       = 0x11,   /**< An edge from an entity to its type. */
-       ent_own_edge        = 0x12,   /**< An edge from an entity to its owner type. */
-       ent_overwrites_edge = 0x13,   /**< An edge from an entity to the entity it overwrites. */
-       ent_value_edge      = 0x14,   /**< An edge from an entity to its value entity. */
-       ent_corr_edge       = 0x15,   /**< An edge from an entity to the member entity its initializes. */
-
-       meth_par_edge       = 0x21,   /**< An edge from a method type to one of its parameter types. */
-       meth_res_edge       = 0x22,   /**< An edge from a method type to one of its result types. */
-       type_super_edge     = 0x23,   /**< An edge from a class type to its super/basis type. */
-       union_edge          = 0x24,   /**< An edge from a union type to its member types. */
-       ptr_pts_to_edge     = 0x25,   /**< An edge from a pointer type to its points-to type. */
-       arr_elt_type_edge   = 0x26,   /**< An edge from an array type to its element type. */
-       arr_ent_edge        = 0x27,   /**< An edge from a array type to its element entity. */
-       type_member_edge    = 0x28,   /**< An edge from a compound type to its member entities. */
-
-       /* additional flags */
-       intra_edge          = 0,      /**< Intra edge flag: edge do not cross basic block boundaries */
-       inter_edge          = 0x40,   /**< Inter edge flag: edge cross basic block boundaries */
-       back_edge           = 0x80    /**< Backwards edge flag. */
-} edge_kind;
-
 /* **************************************************************************** */
 /*                                 GRAPH DUMPERS                                */
 /* **************************************************************************** */

diff --git a/ir/ir/irdump_t.h b/ir/ir/irdump_t.h
index 4c07c8b..b999765 100644 (file)
--- a/ir/ir/irdump_t.h
+++ b/ir/ir/irdump_t.h
@@ -28,6 +28,60 @@
 #include "irdump.h"
 #include "irgraph_t.h"
 
+/**
+ * Symbolic names for the different dumping colors.
+ */
+typedef enum ird_color_t {
+       ird_color_prog_background,
+       ird_color_block_background,
+       ird_color_dead_block_background,
+       ird_color_block_inout,
+       ird_color_default_node,
+       ird_color_phi,
+       ird_color_memory,
+       ird_color_controlflow,
+       ird_color_const,
+       ird_color_anchor,
+       ird_color_proj,
+       ird_color_uses_memory,
+       ird_color_error,
+       ird_color_entity,
+       ird_color_count
+} ird_color_t;
+
+/**
+ * Edge kinds.
+ */
+typedef enum {
+       data_edge           = 0x01,   /**< A data edge between two basic blocks. */
+       block_edge          = 0x02,   /**< An edge from a node to its basic block. */
+       cf_edge             = 0x03,   /**< A regularly control flow edge. */
+       exc_cf_edge         = 0x04,   /**< An exceptional control flow edge. */
+       mem_edge            = 0x05,   /**< A memory edge. */
+       dominator_edge      = 0x06,   /**< A dominator edge from a block to its immediate dominator. */
+       node2type_edge      = 0x07,   /**< An edge from an IR node to a type. */
+
+       ent_type_edge       = 0x11,   /**< An edge from an entity to its type. */
+       ent_own_edge        = 0x12,   /**< An edge from an entity to its owner type. */
+       ent_overwrites_edge = 0x13,   /**< An edge from an entity to the entity it overwrites. */
+       ent_value_edge      = 0x14,   /**< An edge from an entity to its value entity. */
+       ent_corr_edge       = 0x15,   /**< An edge from an entity to the member entity its initializes. */
+
+       meth_par_edge       = 0x21,   /**< An edge from a method type to one of its parameter types. */
+       meth_res_edge       = 0x22,   /**< An edge from a method type to one of its result types. */
+       type_super_edge     = 0x23,   /**< An edge from a class type to its super/basis type. */
+       union_edge          = 0x24,   /**< An edge from a union type to its member types. */
+       ptr_pts_to_edge     = 0x25,   /**< An edge from a pointer type to its points-to type. */
+       arr_elt_type_edge   = 0x26,   /**< An edge from an array type to its element type. */
+       arr_ent_edge        = 0x27,   /**< An edge from a array type to its element entity. */
+       type_member_edge    = 0x28,   /**< An edge from a compound type to its member entities. */
+
+       /* additional flags */
+       intra_edge          = 0,      /**< Intra edge flag: edge do not cross basic block boundaries */
+       inter_edge          = 0x40,   /**< Inter edge flag: edge cross basic block boundaries */
+       back_edge           = 0x80    /**< Backwards edge flag. */
+} edge_kind;
+
 /* Attributes of nodes */
 #define PRINT_DEFAULT_NODE_ATTR
 #define DEFAULT_NODE_ATTR " "