X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=6a017c45a00c52799ea20700ea46c7e2a3e20379;hb=97927c8e372f337e8342b698072facf4ffa453ad;hp=7d06d039a163d70621ed43c2161d18b8f1538ce2;hpb=3a5f96eb2a12ff342c96c1b9db8d16d382b15d28;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 7d06d039a..6a017c45a 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -7,7 +7,7 @@
  *
  * This file provides Perm, Copy, Spill and Reload nodes.
  *
- * Copyright (C) 2005 Universitaet Karlsruhe
+ * Copyright (C) 2005-2006 Universitaet Karlsruhe
  * Released under the GPL
  */
 
@@ -89,8 +89,7 @@ typedef struct {
 /** The be_Stack attribute type. */
 typedef struct {
 	be_node_attr_t node_attr;
-	int offset;           /**< The offset by which the stack shall be increased/decreased. */
-	be_stack_dir_t dir;   /**< The direction in which the stack shall be modified (expand or shrink). */
+	int offset;           /**< The offset by which the stack shall be expanded/shrinked. */
 } be_stack_attr_t;
 
 /** The be_Frame attribute type. */
@@ -124,6 +123,7 @@ ir_op *op_be_Call;
 ir_op *op_be_Return;
 ir_op *op_be_IncSP;
 ir_op *op_be_AddSP;
+ir_op *op_be_SubSP;
 ir_op *op_be_SetSP;
 ir_op *op_be_RegParams;
 ir_op *op_be_StackParam;
@@ -201,9 +201,10 @@ void be_node_init(void) {
 	op_be_Copy       = new_ir_op(beo_base + beo_Copy,       "be_Copy",       op_pin_state_floats,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
 	op_be_Keep       = new_ir_op(beo_base + beo_Keep,       "be_Keep",       op_pin_state_pinned,     K, oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
 	op_be_CopyKeep   = new_ir_op(beo_base + beo_CopyKeep,   "be_CopyKeep",   op_pin_state_pinned,     K, oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
-	op_be_Call       = new_ir_op(beo_base + beo_Call,       "be_Call",       op_pin_state_pinned,     N, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
+	op_be_Call       = new_ir_op(beo_base + beo_Call,       "be_Call",       op_pin_state_pinned,     F, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
 	op_be_Return     = new_ir_op(beo_base + beo_Return,     "be_Return",     op_pin_state_pinned,     X, oparity_variable, 0, sizeof(be_return_attr_t),  &be_node_op_ops);
 	op_be_AddSP      = new_ir_op(beo_base + beo_AddSP,      "be_AddSP",      op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
+	op_be_SubSP      = new_ir_op(beo_base + beo_SubSP,      "be_SubSP",      op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
 	op_be_SetSP      = new_ir_op(beo_base + beo_SetSP,      "be_SetSP",      op_pin_state_pinned,     N, oparity_binary,   0, sizeof(be_stack_attr_t),   &be_node_op_ops);
 	op_be_IncSP      = new_ir_op(beo_base + beo_IncSP,      "be_IncSP",      op_pin_state_pinned,     N, oparity_binary,   0, sizeof(be_stack_attr_t),   &be_node_op_ops);
 	op_be_RegParams  = new_ir_op(beo_base + beo_RegParams,  "be_RegParams",  op_pin_state_pinned,     N, oparity_zero,     0, sizeof(be_node_attr_t),    &be_node_op_ops);
@@ -223,6 +224,7 @@ void be_node_init(void) {
 	set_op_tag(op_be_Call,       &be_node_tag);
 	set_op_tag(op_be_Return,     &be_node_tag);
 	set_op_tag(op_be_AddSP,      &be_node_tag);
+	set_op_tag(op_be_SubSP,      &be_node_tag);
 	set_op_tag(op_be_SetSP,      &be_node_tag);
 	set_op_tag(op_be_IncSP,      &be_node_tag);
 	set_op_tag(op_be_RegParams,  &be_node_tag);
@@ -365,6 +367,7 @@ ir_node *be_new_Reload(const arch_register_class_t *cls, const arch_register_cla
 	init_node_attr(res, 2);
 	be_node_set_reg_class(res, 0, cls_frame);
 	be_node_set_reg_class(res, -1, cls);
+	be_node_set_flags(res, -1, arch_irn_flags_rematerializable);
 	return res;
 }
 
@@ -380,6 +383,18 @@ ir_node *be_get_Reload_frame(const ir_node *irn)
 	return get_irn_n(irn, be_pos_Reload_frame);
 }
 
+ir_node *be_get_Spill_val(const ir_node *irn)
+{
+	assert(be_is_Spill(irn));
+	return get_irn_n(irn, be_pos_Spill_val);
+}
+
+ir_node *be_get_Spill_frame(const ir_node *irn)
+{
+	assert(be_is_Spill(irn));
+	return get_irn_n(irn, be_pos_Spill_frame);
+}
+
 ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[])
 {
 	int i;
@@ -398,19 +413,28 @@ ir_node *be_new_MemPerm(const arch_env_t *arch_env, ir_graph *irg, ir_node *bl,
 	int i;
 	ir_node *frame = get_irg_frame(irg);
 	const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1);
-	ir_node *irn = new_ir_node(NULL, irg, bl, op_be_MemPerm, mode_T, n, in);
+	ir_node *irn;
+	const arch_register_t *sp = arch_env->isa->sp;
 	be_memperm_attr_t *attr;
+	ir_node **real_in;
 
-	init_node_attr(irn, n);
+	real_in = alloca((n+1) * sizeof(real_in[0]));
+	real_in[0] = frame;
+	memcpy(&real_in[1], in, n * sizeof(real_in[0]));
+
+	irn =  new_ir_node(NULL, irg, bl, op_be_MemPerm, mode_T, n+1, real_in);
+
+	init_node_attr(irn, n + 1);
+	be_node_set_reg_class(irn, 0, sp->reg_class);
 	for(i = 0; i < n; ++i) {
-		be_node_set_reg_class(irn, i, cls_frame);
+		be_node_set_reg_class(irn, i + 1, cls_frame);
 		be_node_set_reg_class(irn, OUT_POS(i), cls_frame);
 	}
 
 	attr = get_irn_attr(irn);
 
-	attr->in_entities = obstack_alloc(irg->obst, n*sizeof(attr->in_entities[0]));
-	memset(attr->in_entities, 0, n*sizeof(attr->in_entities[0]));
+	attr->in_entities = obstack_alloc(irg->obst, n * sizeof(attr->in_entities[0]));
+	memset(attr->in_entities, 0, n * sizeof(attr->in_entities[0]));
 	attr->out_entities = obstack_alloc(irg->obst, n*sizeof(attr->out_entities[0]));
 	memset(attr->out_entities, 0, n*sizeof(attr->out_entities[0]));
 
@@ -521,17 +545,15 @@ int be_Return_get_n_rets(ir_node *ret)
 	return a->num_ret_vals;
 }
 
-ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *mem, unsigned offset, be_stack_dir_t dir)
+ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, int offset)
 {
 	be_stack_attr_t *a;
 	ir_node *irn;
-	ir_node *in[2];
+	ir_node *in[1];
 
 	in[0]     = old_sp;
-	in[1]     = mem;
-	irn       = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, 2, in);
+	irn       = new_ir_node(NULL, irg, bl, op_be_IncSP, sp->reg_class->mode, sizeof(in) / sizeof(in[0]), in);
 	a         = init_node_attr(irn, 1);
-	a->dir    = dir;
 	a->offset = offset;
 
 	be_node_set_flags(irn, -1, arch_irn_flags_ignore | arch_irn_flags_modify_sp);
@@ -567,6 +589,29 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_
 	return irn;
 }
 
+ir_node *be_new_SubSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *sz)
+{
+	be_node_attr_t *a;
+	ir_node *irn;
+	ir_node *in[be_pos_SubSP_last];
+
+	in[be_pos_SubSP_old_sp] = old_sp;
+	in[be_pos_SubSP_size]   = sz;
+
+	irn = new_ir_node(NULL, irg, bl, op_be_SubSP, mode_T, be_pos_SubSP_last, in);
+	a   = init_node_attr(irn, be_pos_SubSP_last);
+
+	be_node_set_flags(irn, OUT_POS(pn_be_SubSP_res), arch_irn_flags_ignore | arch_irn_flags_modify_sp);
+
+	/* Set output constraint to stack register. */
+	be_set_constr_single_reg(irn, be_pos_SubSP_old_sp, sp);
+	be_node_set_reg_class(irn, be_pos_SubSP_size, arch_register_get_class(sp));
+	be_set_constr_single_reg(irn, OUT_POS(pn_be_SubSP_res), sp);
+	a->reg_data[pn_be_SubSP_res].reg = sp;
+
+	return irn;
+}
+
 ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *op, ir_node *mem)
 {
 	be_node_attr_t *a;
@@ -583,9 +628,8 @@ ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_
 
 	/* Set output constraint to stack register. */
 	be_set_constr_single_reg(irn, OUT_POS(0), sp);
-	be_node_set_reg_class(irn, 1, sp->reg_class);
-	be_node_set_reg_class(irn, 2, sp->reg_class);
-	be_node_set_irn_reg(NULL, irn, sp);
+	be_node_set_reg_class(irn, be_pos_AddSP_size, sp->reg_class);
+	be_node_set_reg_class(irn, be_pos_AddSP_old_sp, sp->reg_class);
 
 	return irn;
 }
@@ -744,7 +788,7 @@ int be_has_frame_entity(const ir_node *irn)
 	}
 }
 
-entity *be_get_frame_entity(const ir_node *irn)
+entity* be_get_frame_entity(const ir_node *irn)
 {
 	if(be_has_frame_entity(irn)) {
 		be_frame_attr_t *a = get_irn_attr(irn);
@@ -753,22 +797,12 @@ entity *be_get_frame_entity(const ir_node *irn)
 	return NULL;
 }
 
-void be_set_frame_entity(const ir_node *irn, entity* ent)
-{
-	be_frame_attr_t *a;
-
-	assert(be_has_frame_entity(irn));
-
-	a = get_irn_attr(irn);
-	a->ent = ent;
-}
-
 void be_set_MemPerm_in_entity(const ir_node *irn, int n, entity *ent)
 {
 	be_memperm_attr_t *attr = get_irn_attr(irn);
 
 	assert(be_is_MemPerm(irn));
-	assert(n < get_irn_arity(irn));
+	assert(n < be_get_MemPerm_entity_arity(irn));
 
 	attr->in_entities[n] = ent;
 }
@@ -778,7 +812,7 @@ entity* be_get_MemPerm_in_entity(const ir_node* irn, int n)
 	be_memperm_attr_t *attr = get_irn_attr(irn);
 
 	assert(be_is_MemPerm(irn));
-	assert(n < get_irn_arity(irn));
+	assert(n < be_get_MemPerm_entity_arity(irn));
 
 	return attr->in_entities[n];
 }
@@ -788,7 +822,7 @@ void be_set_MemPerm_out_entity(const ir_node *irn, int n, entity *ent)
 	be_memperm_attr_t *attr = get_irn_attr(irn);
 
 	assert(be_is_MemPerm(irn));
-	assert(n < get_irn_arity(irn));
+	assert(n < be_get_MemPerm_entity_arity(irn));
 
 	attr->out_entities[n] = ent;
 }
@@ -798,11 +832,16 @@ entity* be_get_MemPerm_out_entity(const ir_node* irn, int n)
 	be_memperm_attr_t *attr = get_irn_attr(irn);
 
 	assert(be_is_MemPerm(irn));
-	assert(n < get_irn_arity(irn));
+	assert(n < be_get_MemPerm_entity_arity(irn));
 
 	return attr->out_entities[n];
 }
 
+int be_get_MemPerm_entity_arity(const ir_node *irn)
+{
+	return get_irn_arity(irn) - 1;
+}
+
 static void be_limited(void *data, bitset_t *bs)
 {
 	be_req_t *req = data;
@@ -898,34 +937,20 @@ ir_node *be_get_IncSP_mem(ir_node *irn) {
 	return get_irn_n(irn, 1);
 }
 
-void be_set_IncSP_offset(ir_node *irn, unsigned offset)
+void be_set_IncSP_offset(ir_node *irn, int offset)
 {
 	be_stack_attr_t *a = get_irn_attr(irn);
 	assert(be_is_IncSP(irn));
 	a->offset = offset;
 }
 
-unsigned be_get_IncSP_offset(const ir_node *irn)
+int be_get_IncSP_offset(const ir_node *irn)
 {
 	be_stack_attr_t *a = get_irn_attr(irn);
 	assert(be_is_IncSP(irn));
 	return a->offset;
 }
 
-void be_set_IncSP_direction(ir_node *irn, be_stack_dir_t dir)
-{
-	be_stack_attr_t *a = get_irn_attr(irn);
-	assert(be_is_IncSP(irn));
-	a->dir = dir;
-}
-
-be_stack_dir_t be_get_IncSP_direction(const ir_node *irn)
-{
-	be_stack_attr_t *a = get_irn_attr(irn);
-	assert(be_is_IncSP(irn));
-	return a->dir;
-}
-
 ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn)
 {
 	ir_node *bl     = get_nodes_block(irn);
@@ -1051,7 +1076,7 @@ static arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn)
 		XXX(StackParam, stackparam);
 #undef XXX
 		default:
-		return 0;
+		return arch_irn_class_normal;
 	}
 
 	return 0;
@@ -1068,6 +1093,16 @@ static entity *be_node_get_frame_entity(const void *self, const ir_node *irn)
 	return be_get_frame_entity(irn);
 }
 
+static void be_node_set_frame_entity(const void *self, ir_node *irn, entity *ent)
+{
+	be_frame_attr_t *a;
+
+	assert(be_has_frame_entity(irn));
+
+	a = get_irn_attr(irn);
+	a->ent = ent;
+}
+
 static void be_node_set_frame_offset(const void *self, ir_node *irn, int offset)
 {
 	if(be_has_frame_entity(irn)) {
@@ -1076,6 +1111,17 @@ static void be_node_set_frame_offset(const void *self, ir_node *irn, int offset)
 	}
 }
 
+static int be_node_get_sp_bias(const void *self, const ir_node *irn)
+{
+	int result = 0;
+
+	if(be_is_IncSP(irn)) {
+		result = be_get_IncSP_offset(irn);
+	}
+
+	return result;
+}
+
 /*
   ___ ____  _   _   _   _                 _ _
  |_ _|  _ \| \ | | | | | | __ _ _ __   __| | | ___ _ __
@@ -1092,7 +1138,13 @@ static const arch_irn_ops_if_t be_node_irn_ops_if = {
 	be_node_classify,
 	be_node_get_flags,
 	be_node_get_frame_entity,
-	be_node_set_frame_offset
+	be_node_set_frame_entity,
+	be_node_set_frame_offset,
+	be_node_get_sp_bias,
+	NULL,    /* get_inverse             */
+	NULL,    /* get_op_estimated_cost   */
+	NULL,    /* possible_memory_operand */
+	NULL,    /* perform_memory_operand  */
 };
 
 static const arch_irn_ops_t be_node_irn_ops = {
@@ -1212,10 +1264,19 @@ static entity *phi_get_frame_entity(const void *_self, const ir_node *irn)
 	return NULL;
 }
 
+static void phi_set_frame_entity(const void *_self, ir_node *irn, entity *ent)
+{
+}
+
 static void phi_set_frame_offset(const void *_self, ir_node *irn, int bias)
 {
 }
 
+static int phi_get_sp_bias(const void* self, const ir_node *irn)
+{
+	return 0;
+}
+
 static const arch_irn_ops_if_t phi_irn_ops = {
 	phi_get_irn_reg_req,
 	phi_set_irn_reg,
@@ -1223,7 +1284,13 @@ static const arch_irn_ops_if_t phi_irn_ops = {
 	phi_classify,
 	phi_get_flags,
 	phi_get_frame_entity,
-	phi_set_frame_offset
+	phi_set_frame_entity,
+	phi_set_frame_offset,
+	phi_get_sp_bias,
+	NULL,    /* get_inverse             */
+	NULL,    /* get_op_estimated_cost   */
+	NULL,    /* possible_memory_operand */
+	NULL,    /* perform_memory_operand  */
 };
 
 static const arch_irn_handler_t phi_irn_handler = {
@@ -1369,11 +1436,12 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 			case beo_IncSP:
 				{
 					be_stack_attr_t *a = (be_stack_attr_t *) at;
-					if (a->offset == BE_STACK_FRAME_SIZE)
+					if (a->offset == BE_STACK_FRAME_SIZE_EXPAND)
 						fprintf(f, "offset: FRAME_SIZE\n");
+					else if(a->offset == BE_STACK_FRAME_SIZE_SHRINK)
+						fprintf(f, "offset: -FRAME SIZE\n");
 					else
 						fprintf(f, "offset: %u\n", a->offset);
-					fprintf(f, "direction: %s\n", a->dir == be_stack_dir_expand ? "expand" : "shrink");
 				}
 				break;
 			case beo_Call:
@@ -1387,7 +1455,7 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 			case beo_MemPerm:
 				{
 					int i;
-					for(i = 0; i < get_irn_arity(irn); ++i) {
+					for(i = 0; i < be_get_MemPerm_entity_arity(irn); ++i) {
 						entity *in, *out;
 						in = be_get_MemPerm_in_entity(irn, i);
 						out = be_get_MemPerm_out_entity(irn, i);