X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=scripts%2Fgen_ir.py;h=7ce02dee5f3aff71c441e81e45d81431261a9ba2;hb=c2eb9779d5af4480bc27186f2a1ce45e1961ae8d;hp=5c4181680e68e117ba4b275ce5eb9b19ca56ed2b;hpb=066e8d77df9e9019463c09935124e44b0716b3e1;p=libfirm

diff --git a/scripts/gen_ir.py b/scripts/gen_ir.py
index 5c4181680..7ce02dee5 100755
--- a/scripts/gen_ir.py
+++ b/scripts/gen_ir.py
@@ -17,6 +17,17 @@ def format_nodeparameters(node):
 	parameters = map(lambda arg: arg["type"] + " " + arg["name"], node.arguments)
 	return format_parameterlist(parameters)
 
+def format_nodeparametershelp(node):
+	res = ""
+	for param in node.arguments:
+		res += " * @param %-9s %s\n" % (param["name"], param["comment"])
+	return res
+
+def format_a_an(text):
+	if text[0] in "aAeEuUoOiI":
+		return "an " + text
+	return "a " + text
+
 def format_blockparameter(node):
 	if hasattr(node, "knownBlock"):
 		if hasattr(node, "knownGraph"):
@@ -25,6 +36,14 @@ def format_blockparameter(node):
 	else:
 		return "ir_node *block"
 
+def format_blockparameterhelp(node):
+	if hasattr(node, "knownBlock"):
+		if hasattr(node, "knownGraph"):
+			return ""
+		return " * @param irg       The IR graph the node belongs to.\n"
+	else:
+		return " * @param block     The IR block the node belongs to.\n"
+
 def format_blockargument(node):
 	if hasattr(node, "knownBlock"):
 		if hasattr(node, "knownGraph"):
@@ -62,14 +81,14 @@ def format_insdecl(node):
 		res += "\n\tNEW_ARR_A(ir_node *, r_in, r_arity);"
 		i = 0
 		for input in node.ins:
-			res += "\n\tr_in[" + `i` + "] = irn_" + input + ";"
+			res += "\n\tr_in[" + `i` + "] = irn_" + input[0] + ";"
 			i += 1
 		res += "\n\tmemcpy(&r_in[" + `insarity` + "], in, sizeof(ir_node *) * arity);\n\t"
 	else:
 		res = "ir_node *in[" + `arity` + "];"
 		i = 0
 		for input in node.ins:
-			res += "\n\tin[" + `i` + "] = irn_" + input + ";"
+			res += "\n\tin[" + `i` + "] = irn_" + input[0] + ";"
 			i += 1
 	return res
 
@@ -160,10 +179,13 @@ def format_parameters(string):
 	return format_arguments(string, voidwhenempty = True)
 
 env = Environment()
+env.filters['a_an']            = format_a_an
 env.filters['parameterlist']   = format_parameterlist
 env.filters['nodearguments']   = format_nodearguments
 env.filters['nodeparameters']  = format_nodeparameters
+env.filters['nodeparametershelp'] = format_nodeparametershelp
 env.filters['blockparameter']  = format_blockparameter
+env.filters['blockparameterhelp'] = format_blockparameterhelp
 env.filters['blockargument']   = format_blockargument
 env.filters['irgassign']       = format_irgassign
 env.filters['curblock']        = format_curblock
@@ -182,9 +204,16 @@ env.filters['escape_keywords'] = format_escape_keywords
 
 def prepare_attr(attr):
 	if "init" in attr:
-		return dict(type = attr["type"], name = attr["name"], init = attr["init"])
+		return dict(
+			type = attr["type"],
+			name = attr["name"],
+			init = attr["init"],
+			comment = attr["comment"])
 	else:
-		return dict(type = attr["type"], name = attr["name"])
+		return dict(
+			type = attr["type"],
+			name = attr["name"],
+			comment = attr["comment"])
 
 def preprocess_node(node):
 	verify_node(node)
@@ -196,21 +225,34 @@ def preprocess_node(node):
 	arguments = [ ]
 	initattrs = [ ]
 	for input in node.ins:
-		arguments.append(dict(type = "ir_node *", name = "irn_" + input))
+		arguments.append(dict(
+				type    = "ir_node *",
+				name    = "irn_" + input[0],
+				comment = input[1]))
 
 	if node.arity == "variable" or node.arity == "dynamic":
-		arguments.append(dict(type = "int", name = "arity"))
-		arguments.append(dict(type = "ir_node **", name = "in"))
+		arguments.append(dict(
+				type    = "int",
+				name    = "arity",
+				comment = "size of additional inputs array"))
+		arguments.append(dict(
+				type    = "ir_node *const *",
+				name    = "in",
+				comment = "additional inputs"))
 
 	if not hasattr(node, "mode"):
-		arguments.append(dict(type = "ir_mode *", name = "mode"))
+		arguments.append(dict(
+				type    = "ir_mode *",
+				name    = "mode",
+				comment = "mode of the operations result"))
 		node.mode = "mode"
 
 	for attr in node.attrs:
 		attr["fqname"] = "." + attr["name"]
-
-		if not "init" in attr:
-			arguments.append(prepare_attr(attr))
+		if "init" in attr:
+			continue
+		arguments.append(attr)
+		#arguments.append(prepare_attr(attr))
 
 	# dynamic pin state means more constructor arguments
 	if is_dynamic_pinned(node):
@@ -222,8 +264,9 @@ def preprocess_node(node):
 		else:
 			node.constructor_args.append(
 				dict(
-					name = "pin_state",
-					type = "op_pin_state"
+					name    = "pin_state",
+					type    = "op_pin_state",
+					comment = "pinned state",
 				)
 			)
 			initattrs.append(dict(
@@ -233,22 +276,17 @@ def preprocess_node(node):
 
 	for arg in node.constructor_args:
 		arguments.append(prepare_attr(arg))
-		if arg["type"] == "ir_cons_flags":
-			name = arg["name"]
-			initattrs.append(dict(fqname = ".exc.pin_state",
-				init = name + " & cons_floats ? op_pin_state_floats : op_pin_state_pinned"))
-			initattrs.append(dict(fqname = ".volatility",
-				init = name + " & cons_volatile ? volatility_is_volatile : volatility_non_volatile"))
-			initattrs.append(dict(fqname = ".aligned",
-				init = name + " & cons_unaligned ? align_non_aligned : align_is_aligned"))
 
 	node.arguments = arguments
 	node.initattrs = initattrs
 
 #############################
 
-constructor_template = env.from_string('''
+gen_ircons_c_inl_template = env.from_string(
+'''/* Warning: automatically generated code */
 
+{%- for node in nodes %}
+{%- if not node.noconstructor %}
 ir_node *new_rd_{{node.name}}(
 	{%- filter parameters %}
 		dbg_info *dbgi
@@ -289,6 +327,7 @@ ir_node *new_rd_{{node.name}}(
 	{{- node.init }}
 	res = optimize_node(res);
 	irn_verify_irg(res, irg);
+	{{- node.init_after_opt }}
 	return res;
 }
 
@@ -334,6 +373,8 @@ ir_node *new_{{node.name}}(
 			{{node|nodearguments}}
 		{% endfilter %});
 }
+{% endif %}
+{%- endfor %}
 ''')
 
 irnode_h_template = env.from_string(
@@ -380,16 +421,16 @@ void (set_{{node.name}}_{{attr.name}})(ir_node *node, {{attr.type}} {{attr.name}
 
 {%- for node in nodes %}
 {%- for in in node.ins %}
-ir_node *(get_{{node.name}}_{{in}})(const ir_node *node)
+ir_node *(get_{{node.name}}_{{in[0]}})(const ir_node *node)
 {
 	assert(is_{{node.name}}(node));
 	return get_irn_n(node, {{node.ins.index(in)}});
 }
 
-void (set_{{node.name}}_{{in}})(ir_node *node, ir_node *{{in|escape_keywords}})
+void (set_{{node.name}}_{{in[0]}})(ir_node *node, ir_node *{{in[0]|escape_keywords}})
 {
 	assert(is_{{node.name}}(node));
-	set_irn_n(node, {{node.ins.index(in)}}, {{in|escape_keywords}});
+	set_irn_n(node, {{node.ins.index(in)}}, {{in[0]|escape_keywords}});
 }
 {% endfor %}
 {% endfor %}
@@ -456,6 +497,58 @@ typedef enum {
 {% endif %}
 {%- endfor %}
 
+{% for node in nodes %}
+{%- if not node.noconstructor %}
+/**
+ * Construct {{node.name|a_an}} node.
+ *
+ * @param dbgi      A pointer to debug information.
+{{ node|blockparameterhelp -}}
+{{ node|nodeparametershelp -}}
+ */
+FIRM_API ir_node *new_rd_{{node.name}}(
+	{%- filter parameters %}
+		dbg_info *dbgi
+		{{node|blockparameter}}
+		{{node|nodeparameters}}
+	{% endfilter %});
+
+/**
+ * Construct {{node.name|a_an}} node.
+ *
+{{ node|blockparameterhelp -}}
+{{ node|nodeparametershelp -}}
+ */
+FIRM_API ir_node *new_r_{{node.name}}(
+	{%- filter parameters %}
+		{{node|blockparameter}}
+		{{node|nodeparameters}}
+	{% endfilter %});
+
+/**
+ * Construct {{node.name|a_an}} node.
+ *
+ * @param dbgi      A pointer to debug information.
+{{ node|nodeparametershelp -}}
+ */
+FIRM_API ir_node *new_d_{{node.name}}(
+	{%- filter parameters %}
+		dbg_info *dbgi
+		{{node|nodeparameters}}
+	{% endfilter %});
+
+/**
+ * Construct {{node.name|a_an}} node.
+ *
+{{ node|nodeparametershelp -}}
+ */
+FIRM_API ir_node *new_{{node.name}}(
+	{%- filter parameters %}
+		{{node|nodeparameters}}
+	{% endfilter %});
+{%- endif %}
+{% endfor %}
+
 {% for node in nodes %}
 /** Return true of the node is a {{node.name}} node. */
 FIRM_API int is_{{node.name}}(const ir_node *node);
@@ -463,8 +556,8 @@ FIRM_API int is_{{node.name}}(const ir_node *node);
 
 {% for node in nodes %}
 {% for in in node.ins -%}
-FIRM_API ir_node *get_{{node.name}}_{{in}}(const ir_node *node);
-void set_{{node.name}}_{{in}}(ir_node *node, ir_node *{{in|escape_keywords}});
+FIRM_API ir_node *get_{{node.name}}_{{in[0]}}(const ir_node *node);
+void set_{{node.name}}_{{in[0]}}(ir_node *node, ir_node *{{in[0]|escape_keywords}});
 {% endfor -%}
 {% for attr in node.attrs|hasnot("noprop") -%}
 FIRM_API {{attr.type}} get_{{node.name}}_{{attr.name}}(const ir_node *node);
@@ -546,19 +639,10 @@ def main(argv):
 	# hardcoded path to libfirm/include/libfirm
 	gendir2 = argv[2] + "/../../include/libfirm"
 
-	# List of TODOs
-	niymap = [ "ASM", "Const", "Phi", "SymConst" ]
-
 	real_nodes = prepare_nodes()
-	file = open(gendir + "/gen_ir_cons.c.inl", "w")
-	for node in real_nodes:
-		if node.name in niymap:
-			continue
 
-		if not isAbstract(node) and not hasattr(node, "noconstructor"):
-			file.write(constructor_template.render(vars()))
-
-	file.write("\n")
+	file = open(gendir + "/gen_ir_cons.c.inl", "w")
+	file.write(gen_ircons_c_inl_template.render(nodes = real_nodes))
 	file.close()
 
 	file = open(gendir + "/gen_irnode.h", "w")