X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=69d181e4c3cd78e8fbbdcc8bb0abe1bad367efb0;hb=02133dbaf1555fa1bc689b44c71845d574002947;hp=9e3e2fe6e76e1fb1971dfcf53092ffd502d85648;hpb=d1ea6b5491733b44c3ff046ed7fc1859f5dda8e5;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 9e3e2fe6e..69d181e4c 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -93,26 +93,33 @@ static int beo_base = -1;
 
 static const ir_op_ops be_node_op_ops;
 
+#define N   irop_flag_none
+#define L   irop_flag_labeled
+#define C   irop_flag_commutative
+#define X   irop_flag_cfopcode
+#define I   irop_flag_ip_cfopcode
+#define F   irop_flag_fragile
+#define Y   irop_flag_forking
+#define H   irop_flag_highlevel
+#define c   irop_flag_constlike
+#define K   irop_flag_keep
+
 void be_node_init(void) {
 	static int inited = 0;
-	int i;
 
 	if(inited)
 		return;
 
 	inited = 1;
 
-	beo_base = get_next_ir_opcode();
+	/* Acquire all needed opcodes. */
+	beo_base = get_next_ir_opcodes(beo_Last - 1);
 
-	/* Acquire all needed opcodes. We assume that they are consecutive! */
-	for(i = beo_Spill; i < beo_Last; ++i)
-		get_next_ir_opcode();
-
-	op_Spill  = new_ir_op(beo_base + beo_Spill,  "Spill",  op_pin_state_mem_pinned, 0, oparity_unary,    0, sizeof(be_spill_attr_t), &be_node_op_ops);
-	op_Reload = new_ir_op(beo_base + beo_Reload, "Reload", op_pin_state_mem_pinned, 0, oparity_zero,     0, sizeof(be_node_attr_t),  &be_node_op_ops);
-	op_Perm   = new_ir_op(beo_base + beo_Perm,   "Perm",   op_pin_state_pinned,     0, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
-	op_Copy   = new_ir_op(beo_base + beo_Copy,   "Copy",   op_pin_state_pinned,     0, oparity_unary,    0, sizeof(be_node_attr_t),  &be_node_op_ops);
-	op_Keep   = new_ir_op(beo_base + beo_Keep,   "Keep",   op_pin_state_pinned,     0, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Spill  = new_ir_op(beo_base + beo_Spill,  "Spill",  op_pin_state_mem_pinned, N, oparity_unary,    0, sizeof(be_spill_attr_t), &be_node_op_ops);
+	op_Reload = new_ir_op(beo_base + beo_Reload, "Reload", op_pin_state_mem_pinned, N, oparity_zero,     0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Perm   = new_ir_op(beo_base + beo_Perm,   "Perm",   op_pin_state_pinned,     N, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Copy   = new_ir_op(beo_base + beo_Copy,   "Copy",   op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Keep   = new_ir_op(beo_base + beo_Keep,   "Keep",   op_pin_state_pinned,     K, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
 
 	set_op_tag(op_Spill,  &be_node_tag);
 	set_op_tag(op_Reload, &be_node_tag);
@@ -541,9 +548,15 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 
 			if(get_irn_be_opcode(irn) == beo_Spill) {
 				be_spill_attr_t *a = (be_spill_attr_t *) at;
-				unsigned ofs = get_entity_offset_bytes(a->ent);
+
 				ir_fprintf(f, "spill context: %+F\n", a->spill_ctx);
-				ir_fprintf(f, "spill entity: %+F offset %x (%d)\n", a->ent, ofs, ofs);
+				if (a->ent) {
+					unsigned ofs = get_entity_offset_bytes(a->ent);
+					ir_fprintf(f, "spill entity: %+F offset %x (%d)\n", a->ent, ofs, ofs);
+				}
+				else {
+					ir_fprintf(f, "spill entity: n/a\n");
+				}
 			}
 			break;
 	}