added registration facility for own data in an ir graph (like already

		done in ir_node)

[r4643]

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 42afbee..8765bbe 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -18,6 +18,8 @@
 # include <string.h>
 #endif
 
+#include <stddef.h>
+
 # include "xmalloc.h"
 # include "ircons.h"
 # include "irgraph_t.h"
@@ -32,6 +34,18 @@
 # include "firmstat.h"
 # include "irgwalk.h"
 
+/**
+ * Indicates, whether additional data can be registered to graphs.
+ * If set to 1, this is not possible anymore.
+ */
+static int forbid_new_data = 0;
+
+/**
+ * The amount of additional space for custom data to be allocated upon
+ * creating a new graph.
+ */
+static size_t additional_graph_data_size = 0;
+
 ir_graph *current_ir_graph;
 INLINE ir_graph *get_current_ir_graph(void) {
   return current_ir_graph;
@@ -63,7 +77,24 @@ void (set_interprocedural_view)(int state) {
 
 static ident* frame_type_suffix = NULL;
 void init_irgraph(void) {
-  frame_type_suffix = new_id_from_chars(FRAME_TP_SUFFIX, strlen(FRAME_TP_SUFFIX));
+  frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
+       forbid_new_data = 1;
+}
+
+/**
+ * Allocate a new ir graph.
+ * This function respects the registered graph data. The only reason for
+ * this function is, that there are two locations, where graphs are
+ * allocated (new_r_ir_graph, new_const_code_irg).
+ * @return Memory for a new graph.
+ */
+ir_graph *alloc_graph(void)
+{
+       size_t size = sizeof(ir_graph) + additional_graph_data_size;
+       char *ptr = xmalloc(size);
+       memset(ptr, 0, size);
+
+       return (ir_graph *) (ptr + additional_graph_data_size);
 }
 
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -89,8 +120,7 @@ new_r_ir_graph (entity *ent, int n_loc)
   ir_node *first_block;
   ir_node *projX;
 
-  res = (ir_graph *) xmalloc (sizeof (ir_graph));
-  memset(res, 0, sizeof (ir_graph));
+  res = alloc_graph();
   res->kind = k_ir_graph;
 
   /* inform statistics here, as blocks will be already build on this graph */
@@ -198,8 +228,7 @@ ir_graph *new_const_code_irg(void) {
   ir_graph *res;
   ir_node *projX;
 
-  res = (ir_graph *) xmalloc (sizeof(*res));
-  memset(res, 0, sizeof(*res));
+  res = alloc_graph();
 
   /* inform statistics here, as blocks will be already build on this graph */
   stat_new_graph(res, NULL);
@@ -717,3 +746,13 @@ void normalize_proj_nodes(ir_graph *irg)
   irg_walk_graph(irg, NULL, normalize_proj_walker, NULL);
        set_irg_outs_inconsistent(irg);
 }
+
+size_t register_additional_graph_data(size_t size)
+{
+       assert(!forbid_new_data && "Too late to register additional node data");
+
+       if(forbid_new_data)
+               return 0;
+
+       return additional_graph_data_size += size;
+}

diff --git a/ir/ir/irgraph.h b/ir/ir/irgraph.h
index 46379bc..354b194 100644 (file)
--- a/ir/ir/irgraph.h
+++ b/ir/ir/irgraph.h
@@ -18,6 +18,7 @@
  * @author Martin Trapp, Christian Schaefer
  */
 
+#include <stddef.h>
 
 #include "irop.h"
 
@@ -430,4 +431,34 @@ void          set_irg_block_visited (ir_graph *irg, unsigned long i);
 /** put the proj's into the same block as its predecessors */
 void normalize_proj_nodes(ir_graph *irg);
 
+/**
+ * Access custom graph data.
+ * The data must have been registered with
+ * register_additional_graph_data() before.
+ * @param graph The graph to get the data from.
+ * @param type The type of the data you registered.
+ * @param off The value returned by register_additional_graph_data().
+ * @return A pointer of type @p type.
+ */
+#define get_irg_data(graph,type,off) \
+  (assert(off > 0 && "Invalid graph data offset"), (type *) ((char *) (graph) - (off)))
+
+/**
+ * Get the pointer to the node some custom data belongs to.
+ * @param data The pointer to the custom data.
+ * @param off The number as returned by register_additional_graph_data().
+ * @return A pointer to the ir node the custom data belongs to.
+ */
+#define get_irg_data_base(data,off) \
+  (assert(off > 0 && "Invalid graph data offset"), (ir_graph *) ((char *) (data) + (off)))
+
+/**
+ * Request additional data to be allocated with an ir graph.
+ * @param size The size of the additional data required.
+ * @return A positive number, if the opration was successful, which
+ * must be passed to the access macro get_irg_data(), 0 if the
+ * registration failed.
+ */
+size_t register_additional_graph_data(size_t size);
+
 # endif /* _IRGRAPH_H_ */