X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=scripts%2Fir_spec.py;h=a49aa3f750d59b641402d14d838408bc036d3010;hb=b90fb7dd7039bce89026f7cdeeb9b5e4989e9434;hp=f997b02d7e1888505c18ae72f03b6585ca293ffc;hpb=69af9c350d2771bf428e688623e72cbde5d46b4b;p=libfirm

diff --git a/scripts/ir_spec.py b/scripts/ir_spec.py
index f997b02d7..a49aa3f75 100755
--- a/scripts/ir_spec.py
+++ b/scripts/ir_spec.py
@@ -3,8 +3,8 @@ Start = dict(
 	mode       = "mode_T",
 	op_flags   = "cfopcode",
 	state      = "pinned",
-	knownBlock = True,
 	noconstr   = True,
+	optimize   = False
 ),
 
 End = dict(
@@ -12,8 +12,12 @@ End = dict(
 	op_flags   = "cfopcode",
 	state      = "pinned",
 	arity      = "dynamic",
-	knownBlock = True,
 	noconstr   = True,
+	optimize   = False
+),
+
+Id = dict(
+	ins = [ "pred" ]
 ),
 
 Phi = dict(
@@ -39,6 +43,7 @@ IJmp = dict(
 Const = dict(
 	mode       = "",
 	knownBlock = True,
+	attrs_name = "con",
 	attrs      = [
 		dict(
 			type = "tarval*",
@@ -48,10 +53,58 @@ Const = dict(
 ),
 
 Block = dict(
-	mode   = "mode_BB",
+	mode       = "mode_BB",
 	knownBlock = True,
+	block      = "NULL",
 	noconstr   = True,
+	optimize   = False,
 	arity      = "variable",
+
+	init = '''
+	/* macroblock header */
+	res->in[0] = res;
+
+	res->attr.block.is_dead     = 0;
+	res->attr.block.is_mb_head  = 1;
+	res->attr.block.has_label   = 0;
+	res->attr.block.irg         = irg;
+	res->attr.block.backedge    = new_backedge_arr(irg->obst, arity);
+	res->attr.block.in_cg       = NULL;
+	res->attr.block.cg_backedge = NULL;
+	res->attr.block.extblk      = NULL;
+	res->attr.block.mb_depth    = 0;
+	res->attr.block.label       = 0;
+
+	set_Block_matured(res, 1);
+	set_Block_block_visited(res, 0);
+	''',
+
+	d_pre = '''
+	int i;
+	int has_unknown = 0;
+	''',
+
+	d_post = '''
+	/* Create and initialize array for Phi-node construction. */
+	if (get_irg_phase_state(current_ir_graph) == phase_building) {
+		res->attr.block.graph_arr = NEW_ARR_D(ir_node *, current_ir_graph->obst,
+		                                      current_ir_graph->n_loc);
+		memset(res->attr.block.graph_arr, 0, sizeof(ir_node *)*current_ir_graph->n_loc);
+	}
+
+	for (i = arity - 1; i >= 0; i--)
+		if (is_Unknown(in[i])) {
+			has_unknown = 1;
+			break;
+		}
+
+	if (!has_unknown) res = optimize_node(res);
+
+	current_ir_graph->current_block = res;
+
+	IRN_VRFY_IRG(res, current_ir_graph);
+	''',
+
 	java_add   = '''
 	public void addPred(Node node) {
 		binding_cons.add_immBlock_pred(ptr, node.ptr);
@@ -101,6 +154,22 @@ Call = dict(
 	]
 ),
 
+Builtin = dict(
+	ins      = [ "mem" ],
+	arity    = "variable",
+	outs     = [ "M_regular", "X_regular", "X_except", "T_result", "M_except", "P_value_res_base" ],
+	attrs    = [
+		dict(
+			type = "ir_builtin_kind",
+			name = "kind"
+		),
+		dict(
+			type = "ir_type*",
+			name = "type"
+		)
+	]
+),
+
 binop = dict(
 	abstract = True,
 	ins      = [ "left", "right" ]
@@ -192,6 +261,15 @@ Div = dict(
 		dict(
 			name = "state",
 			type = "op_pin_state"
+		),
+		dict(
+			name = "no_remainder",
+			type = "int",
+			init = "0",
+			special = dict(
+				suffix = "RL",
+				init = "1"
+			)
 		)
 	]
 ),
@@ -238,10 +316,15 @@ Load = dict(
 	],
 	constructor_args = [
 		dict(
-			type = "cons_flags",
+			type = "ir_cons_flags",
 			name = "flags",
 		),
 	],
+	d_post = '''
+#if PRECISE_EXC_CONTEXT
+	firm_alloc_frag_arr(res, op_Load, &res->attr.load.exc.frag_arr);
+#endif
+	'''
 ),
 
 Store = dict(
@@ -249,10 +332,15 @@ Store = dict(
 	outs     = [ "M", "X_regular", "X_except" ],
 	constructor_args = [
 		dict(
-			type = "cons_flags",
+			type = "ir_cons_flags",
 			name = "flags",
 		),
 	],
+	d_post = '''
+#if PRECISE_EXC_CONTEXT
+	firm_alloc_frag_arr(res, op_Store, &res->attr.store.exc.frag_arr);
+#endif
+	'''
 ),
 
 Anchor = dict(
@@ -277,7 +365,7 @@ Bad = dict(
 
 Pin = dict(
 	ins      = [ "op" ],
-	mode     = "get_irn_mode(op);"
+	mode     = "get_irn_mode(irn_op)"
 ),
 
 Proj = dict(
@@ -285,7 +373,8 @@ Proj = dict(
 	attrs    = [
 		dict(
 			type = "long",
-			name = "proj"
+			name = "proj",
+			initname = ""
 		)
 	]
 ),
@@ -293,7 +382,7 @@ Proj = dict(
 Sel = dict(
 	ins    = [ "mem", "ptr" ],
 	arity  = "variable",
-	mode   = "mode_P",
+	mode   = "is_Method_type(get_entity_type(entity)) ? mode_P_code : mode_P_data",
 	attrs    = [
 		dict(
 			type = "ir_entity*",
@@ -304,6 +393,7 @@ Sel = dict(
 
 Sync = dict(
 	mode     = "mode_M",
+	optimize = False,
 	arity    = "dynamic"
 ),
 
@@ -313,13 +403,14 @@ Tuple = dict(
 ),
 
 Unknown = dict(
-	knownBlock = True
+	knownBlock = True,
+	block      = "get_irg_start_block(irg)",
+	nodbginfo  = True
 ),
 
 Confirm = dict(
 	ins      = [ "value", "bound" ],
-	block    = "get_nodes_block(value)",
-	mode     = "get_irn_mode(value)",
+	mode     = "get_irn_mode(irn_value)",
 	attrs    = [
 		dict(
 			name = "cmp",
@@ -350,6 +441,23 @@ Mux = dict(
 Cond = dict(
 	ins      = [ "selector" ],
 	outs     = [ "false", "true" ],
+	attrs    = [
+		dict(
+			name = "kind",
+			type = "cond_kind",
+			init = "dense"
+		),
+		dict(
+			name = "default_proj",
+			type = "long",
+			init = "0"
+		),
+		dict(
+			name = "jmp_pred",
+			type = "cond_jmp_predicate",
+			init = "COND_JMP_PRED_NONE"
+		)
+	]
 ),
 
 Cmp = dict(
@@ -358,7 +466,18 @@ Cmp = dict(
 ),
 
 Conv = dict(
-	is_a     = "unop"
+	is_a     = "unop",
+	attrs = [
+		dict(
+			name = "strict",
+			type = "int",
+			init = "0",
+			special = dict(
+				prefix = "strict",
+				init = "1"
+			)
+		)
+	]
 ),
 
 Alloc = dict(
@@ -390,4 +509,15 @@ Free = dict(
 		)
 	]
 ),
+
+CopyB = dict(
+	ins   = [ "mem", "dst", "src" ],
+	outs  = [ "M", "X_regular", "X_except" ],
+	attrs = [
+		dict(
+			name = "type",
+			type = "ir_type*"
+		)
+	]
+),
 )