X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=scripts%2Fgen_ir.py;h=6510768a72ecf870591c683a06ed7ff36ce56c2c;hb=0bbe7c5217326ae803be13bf42ff1c92a541e4a2;hp=690da1f5b0afab5146beb02b1f01938674efd311;hpb=b7dd849f8dd4bf73629adffec3fbe19bed0e458b;p=libfirm

diff --git a/scripts/gen_ir.py b/scripts/gen_ir.py
index 690da1f5b..6510768a7 100755
--- a/scripts/gen_ir.py
+++ b/scripts/gen_ir.py
@@ -3,7 +3,7 @@ import sys
 import re
 from jinja2 import Environment, Template
 from jinja2.filters import do_dictsort
-from spec_util import is_dynamic_pinned, verify_node, isAbstract, setdefault
+from spec_util import is_dynamic_pinned, verify_node, isAbstract, setdefault, trim_docstring
 from ir_spec import nodes
 
 def format_parameterlist(parameterlist):
@@ -217,6 +217,7 @@ def prepare_attr(attr):
 
 def preprocess_node(node):
 	verify_node(node)
+	node.doc = trim_docstring(node.__doc__)
 
 	setdefault(node, "attrs_name", node.name.lower())
 	setdefault(node, "block", "block")
@@ -272,6 +273,11 @@ def preprocess_node(node):
 				fqname = ".exc.pin_state",
 				init   = "pin_state"
 			))
+	if hasattr(node, "throws_init"):
+		initattrs.append(dict(
+			fqname = ".exc.throws_exception",
+			init   = node.throws_init
+		))
 
 	for arg in node.constructor_args:
 		arguments.append(prepare_attr(arg))
@@ -324,8 +330,8 @@ ir_node *new_rd_{{node.name}}(
 	res->attr.{{node.attrs_name}}{{attr["fqname"]}} = {{ attr["init"] -}};
 	{%- endfor %}
 	{{- node.init }}
-	res = optimize_node(res);
 	irn_verify_irg(res, irg);
+	res = optimize_node(res);
 	{{- node.init_after_opt }}
 	return res;
 }
@@ -380,15 +386,15 @@ irnode_h_template = env.from_string(
 '''/* Warning: automatically generated code */
 
 {%- for node in nodes|isnot('custom_is') %}
-static inline int _is_{{node.name}}(const ir_node *node)
+static inline int is_{{node.name}}_(const ir_node *node)
 {
 	assert(node != NULL);
-	return _get_irn_op(node) == op_{{node.name}};
+	return get_irn_op_(node) == op_{{node.name}};
 }
 {%- endfor -%}
 
 {% for node in nodes %}
-#define is_{{node.name}}(node)    _is_{{node.name}}(node)
+#define is_{{node.name}}(node)    is_{{node.name}}_(node)
 {%- endfor %}
 
 ''')
@@ -398,7 +404,7 @@ irnode_template = env.from_string(
 {% for node in nodes %}
 int (is_{{node.name}})(const ir_node *node)
 {
-	return _is_{{node.name}}(node);
+	return is_{{node.name}}_(node);
 }
 {% endfor %}
 
@@ -435,6 +441,27 @@ void (set_{{node.name}}_{{input[0]}})(ir_node *node, ir_node *{{input[0]|escape_
 {% endfor %}
 ''')
 
+irdump_template = env.from_string(
+'''/* Warning: automatically generated code */
+{% for node in nodes %}
+{%- if node.outs %}
+static const pns_lookup_t {{node.name}}_lut[] = {
+	{%- for out in node.outs %}
+	{ pn_{{node.name}}_{{out[0]}}, "{{out[0]}}" },
+	{%- endfor %}
+};
+{% endif -%}
+{%- endfor %}
+
+static const proj_lookup_t proj_lut[] = {
+	{%- for node in nodes -%}
+	{%- if node.outs %}
+	{ iro_{{node.name}}, ARRAY_SIZE({{node.name}}_lut), {{node.name}}_lut },
+	{%- endif %}
+	{%- endfor %}
+};
+''')
+
 irop_template = env.from_string(
 '''/* Warning: automatically generated code */
 {% for node in nodes %}
@@ -455,8 +482,11 @@ void init_op(void)
 			{{node|attr_size}}
 			NULL
 		{% endfilter %});
+	{%- if "uses_memory" in node.flags: %}
+	ir_op_set_memory_index(op_{{node.name}}, n_{{node.name}}_mem);
+	{%- endif -%}
 	{%- if "fragile" in node.flags: %}
-	ir_op_set_fragile_indices(op_{{node.name}}, n_{{node.name}}_mem, pn_{{node.name}}_X_regular, pn_{{node.name}}_X_except);
+	ir_op_set_fragile_indices(op_{{node.name}}, pn_{{node.name}}_X_regular, pn_{{node.name}}_X_except);
 	{%- endif -%}
 	{%- endfor %}
 
@@ -479,12 +509,21 @@ nodeops_h_template = env.from_string(
 
 #include "firm_types.h"
 
+#include "begin.h"
+
 /**
  * @addtogroup ir_node
  * @{
  */
 
 {% for node in nodes -%}
+
+/**
+ * @defgroup {{node.name}} {{node.name}} node
+ *
+ * {{node.doc}}
+ * @{
+ */
 {% if node.ins %}
 /**
  * Input numbers for {{node.name}} node
@@ -508,9 +547,6 @@ typedef enum {
 	pn_{{node.name}}_max = pn_{{node.name}}_{{node.outs[-1][0]}}
 } pn_{{node.name}};
 {% endif %}
-{%- endfor %}
-
-{% for node in nodes %}
 {%- if not node.noconstructor %}
 /**
  * Construct {{node.name|a_an}} node.
@@ -560,14 +596,9 @@ FIRM_API ir_node *new_{{node.name}}(
 		{{node|nodeparameters}}
 	{% endfilter %});
 {%- endif %}
-{% endfor %}
-
-{% for node in nodes %}
-/** Return true of the node is a {{node.name}} node. */
+/** Return true if the node is a {{node.name}} node. */
 FIRM_API int is_{{node.name}}(const ir_node *node);
-{%- endfor %}
 
-{% for node in nodes %}
 {% for input in node.ins -%}
 FIRM_API ir_node *get_{{node.name}}_{{input[0]}}(const ir_node *node);
 FIRM_API void set_{{node.name}}_{{input[0]}}(ir_node *node, ir_node *{{input[0]|escape_keywords}});
@@ -576,10 +607,14 @@ FIRM_API void set_{{node.name}}_{{input[0]}}(ir_node *node, ir_node *{{input[0]|
 FIRM_API {{attr.type}} get_{{node.name}}_{{attr.name}}(const ir_node *node);
 FIRM_API void set_{{node.name}}_{{attr.name}}(ir_node *node, {{attr.type}} {{attr.name}});
 {% endfor -%}
+/** @} */
+
 {% endfor -%}
 
 /** @} */
 
+#include "end.h"
+
 #endif
 
 ''')
@@ -589,7 +624,9 @@ opcodes_h_template = env.from_string(
 #ifndef FIRM_IR_OPCODES_H
 #define FIRM_IR_OPCODES_H
 
-/** The opcodes of the libFirm predefined operations. */
+/** The opcodes of the libFirm predefined operations.
+ * @ingroup ir_op
+ */
 typedef enum ir_opcode {
 {%- for node in nodes %}
 	iro_{{node.name}},
@@ -619,10 +656,12 @@ typedef enum ir_opcode {
 } ir_opcode;
 
 {% for node in nodes %}
+/** @ingroup {{node.name}} */
 FIRM_API ir_op *op_{{node.name}};
 {%- endfor %}
 
 {% for node in nodes %}
+/** @ingroup {{node.name}} */
 FIRM_API ir_op *get_op_{{node.name}}(void);
 {%- endfor %}
 
@@ -671,6 +710,10 @@ def main(argv):
 	file.write(irop_template.render(nodes = real_nodes))
 	file.close()
 
+	file = open(gendir + "/gen_irdump.c.inl", "w")
+	file.write(irdump_template.render(nodes = real_nodes))
+	file.close()
+
 	file = open(gendir2 + "/opcodes.h", "w")
 	file.write(opcodes_h_template.render(nodes = real_nodes))
 	file.close()