X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fia32%2Fbearch_ia32.c;h=20e8a343dca7998fc276c8f3cf227cd10a332c1e;hb=c1290d60b0536494704dce14a479f26cbc075225;hp=502f590535a676c4f5eae233d7c293f10f5eca23;hpb=7438ae082c9ec7658ccd006b40aa62084aedca2d;p=libfirm

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index 502f59053..20e8a343d 100644
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -74,6 +74,7 @@ static ir_node *my_skip_proj(const ir_node *n) {
 	return (ir_node *)n;
 }
 
+
 /**
  * Return register requirements for an ia32 node.
  * If the node returns a tuple (mode_T) then the proj's
@@ -82,11 +83,16 @@ static ir_node *my_skip_proj(const ir_node *n) {
 static const arch_register_req_t *ia32_get_irn_reg_req(const void *self, arch_register_req_t *req, const ir_node *irn, int pos) {
 	const ia32_register_req_t *irn_req;
 	long                       node_pos = pos == -1 ? 0 : pos;
-	ir_mode                   *mode     = get_irn_mode(irn);
+	ir_mode                   *mode     = is_Block(irn) ? NULL : get_irn_mode(irn);
 	firm_dbg_module_t         *mod      = firm_dbg_register(DEBUG_MODULE);
 
-	if (mode == mode_T || mode == mode_M) {
-		DBG((mod, LEVEL_1, "ignoring mode_T, mode_M node %+F\n", irn));
+	if (is_Block(irn) || mode == mode_M || mode == mode_X) {
+		DBG((mod, LEVEL_1, "ignoring Block, mode_M, mode_X node %+F\n", irn));
+		return NULL;
+	}
+
+	if (mode == mode_T && pos < 0) {
+		DBG((mod, LEVEL_1, "ignoring request OUT requirements for node %+F\n", irn));
 		return NULL;
 	}
 
@@ -156,6 +162,10 @@ static void ia32_set_irn_reg(const void *self, ir_node *irn, const arch_register
 	int                   pos = 0;
 	const ia32_irn_ops_t *ops = self;
 
+	if (get_irn_mode(irn) == mode_X) {
+		return;
+	}
+
 	DBG((ops->cg->mod, LEVEL_1, "ia32 assigned register %s to node %+F\n", reg->name, irn));
 
 	if (is_Proj(irn)) {
@@ -179,6 +189,11 @@ static const arch_register_t *ia32_get_irn_reg(const void *self, const ir_node *
 	const arch_register_t *reg = NULL;
 
 	if (is_Proj(irn)) {
+
+		if (get_irn_mode(irn) == mode_X) {
+			return NULL;
+		}
+
 		pos = ia32_translate_proj_pos(irn);
 		irn = my_skip_proj(irn);
 	}
@@ -233,6 +248,135 @@ static void ia32_set_stack_bias(const void *self, ir_node *irn, int bias) {
 	}
 }
 
+typedef struct {
+	be_abi_call_flags_bits_t flags;
+	const arch_isa_t *isa;
+	ir_graph *irg;
+} ia32_abi_env_t;
+
+static void *ia32_abi_init(const be_abi_call_t *call, const arch_env_t *aenv, ir_graph *irg)
+{
+	ia32_abi_env_t *env    = xmalloc(sizeof(env[0]));
+	be_abi_call_flags_t fl = be_abi_call_get_flags(call);
+	env->flags = fl.bits;
+	env->irg   = irg;
+	env->isa   = aenv->isa;
+	return env;
+}
+
+static void ia32_abi_dont_save_regs(void *self, pset *s)
+{
+	ia32_abi_env_t *env = self;
+	if(env->flags.try_omit_fp)
+		pset_insert_ptr(s, env->isa->bp);
+}
+
+static const arch_register_t *ia32_abi_prologue(void *self, ir_node **mem, pmap *reg_map)
+{
+	ia32_abi_env_t *env              = self;
+	const arch_register_t *frame_reg = env->isa->sp;
+
+	if(!env->flags.try_omit_fp) {
+		int reg_size         = get_mode_size_bytes(env->isa->bp->reg_class->mode);
+		ir_node *bl          = get_irg_start_block(env->irg);
+		ir_node *curr_sp     = be_abi_reg_map_get(reg_map, env->isa->sp);
+		ir_node *curr_bp     = be_abi_reg_map_get(reg_map, env->isa->bp);
+		ir_node *curr_no_reg = be_abi_reg_map_get(reg_map, &ia32_gp_regs[REG_XXX]);
+		ir_node *store_bp;
+
+		curr_sp  = be_new_IncSP(env->isa->sp, env->irg, bl, curr_sp, *mem, reg_size, be_stack_dir_along);
+		store_bp = new_rd_ia32_Store(NULL, env->irg, bl, curr_sp, curr_no_reg, curr_bp, *mem, mode_T);
+		set_ia32_am_support(store_bp, ia32_am_Dest);
+		set_ia32_am_flavour(store_bp, ia32_B);
+		set_ia32_op_type(store_bp, ia32_AddrModeD);
+		*mem     = new_r_Proj(env->irg, bl, store_bp, mode_M, 0);
+		curr_bp  = be_new_Copy(env->isa->bp->reg_class, env->irg, bl, curr_sp);
+		be_set_constr_single_reg(curr_bp, BE_OUT_POS(0), env->isa->bp);
+		be_node_set_flags(curr_bp, BE_OUT_POS(0), arch_irn_flags_ignore);
+
+		be_abi_reg_map_set(reg_map, env->isa->sp, curr_sp);
+		be_abi_reg_map_set(reg_map, env->isa->bp, curr_bp);
+	}
+
+	return frame_reg;
+}
+
+static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_map)
+{
+	ia32_abi_env_t *env = self;
+	ir_node *curr_sp     = be_abi_reg_map_get(reg_map, env->isa->sp);
+	ir_node *curr_bp     = be_abi_reg_map_get(reg_map, env->isa->bp);
+	ir_node *curr_no_reg = be_abi_reg_map_get(reg_map, &ia32_gp_regs[REG_XXX]);
+
+	if(env->flags.try_omit_fp) {
+		curr_sp = be_new_IncSP(env->isa->sp, env->irg, bl, curr_sp, *mem, BE_STACK_FRAME_SIZE, be_stack_dir_against);
+	}
+
+	else {
+		ir_node *load_bp;
+		ir_mode *mode_bp = env->isa->bp->reg_class->mode;
+
+		curr_sp = be_new_SetSP(env->isa->sp, env->irg, bl, curr_sp, curr_bp, *mem);
+		load_bp = new_rd_ia32_Load(NULL, env->irg, bl, curr_sp, curr_no_reg, *mem, mode_T);
+		set_ia32_am_support(load_bp, ia32_am_Source);
+		set_ia32_am_flavour(load_bp, ia32_B);
+		set_ia32_op_type(load_bp, ia32_AddrModeS);
+		set_ia32_ls_mode(load_bp, mode_bp);
+		curr_bp = new_r_Proj(env->irg, bl, load_bp, mode_bp, 0);
+		*mem    = new_r_Proj(env->irg, bl, load_bp, mode_M, 1);
+	}
+
+	be_abi_reg_map_set(reg_map, env->isa->sp, curr_sp);
+	be_abi_reg_map_set(reg_map, env->isa->bp, curr_bp);
+}
+
+/**
+ * Produces the type which sits between the stack args and the locals on the stack.
+ * it will contain the return address and space to store the old base pointer.
+ * @return The Firm type modeling the ABI between type.
+ */
+static ir_type *ia32_abi_get_between_type(void *self)
+{
+	static ir_type *omit_fp_between_type = NULL;
+	static ir_type *between_type         = NULL;
+
+	ia32_abi_env_t *env = self;
+
+	if(!between_type) {
+		entity *old_bp_ent;
+		entity *ret_addr_ent;
+		entity *omit_fp_ret_addr_ent;
+
+		ir_type *old_bp_type   = new_type_primitive(new_id_from_str("bp"), mode_P);
+		ir_type *ret_addr_type = new_type_primitive(new_id_from_str("return_addr"), mode_P);
+
+		between_type           = new_type_class(new_id_from_str("ia32_between_type"));
+		old_bp_ent             = new_entity(between_type, new_id_from_str("old_bp"), old_bp_type);
+		ret_addr_ent           = new_entity(between_type, new_id_from_str("ret_addr"), ret_addr_type);
+
+		set_entity_offset_bytes(old_bp_ent, 0);
+		set_entity_offset_bytes(ret_addr_ent, get_type_size_bytes(old_bp_type));
+		set_type_size_bytes(between_type, get_type_size_bytes(old_bp_type) + get_type_size_bytes(ret_addr_type));
+
+		omit_fp_between_type   = new_type_class(new_id_from_str("ia32_between_type_omit_fp"));
+		omit_fp_ret_addr_ent   = new_entity(omit_fp_between_type, new_id_from_str("ret_addr"), ret_addr_type);
+
+		set_entity_offset_bytes(omit_fp_ret_addr_ent, 0);
+		set_type_size_bytes(omit_fp_between_type, get_type_size_bytes(ret_addr_type));
+	}
+
+	return env->flags.try_omit_fp ? omit_fp_between_type : between_type;
+}
+
+static const be_abi_callbacks_t ia32_abi_callbacks = {
+	ia32_abi_init,
+	free,
+	ia32_abi_get_between_type,
+	ia32_abi_dont_save_regs,
+	ia32_abi_prologue,
+	ia32_abi_epilogue,
+};
+
 /* fill register allocator interface */
 
 static const arch_irn_ops_if_t ia32_irn_ops_if = {
@@ -273,7 +417,7 @@ static void ia32_prepare_graph(void *self) {
 
 	cg->mod = firm_dbg_register("firm.be.ia32.transform");
 	irg_walk_blkwise_graph(cg->irg, ia32_place_consts_set_modes, ia32_transform_node, cg);
-	dump_ir_block_graph_sched(cg->irg, "-transformed");
+	be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
 
 	edges_deactivate(cg->irg);
 	dead_node_elimination(cg->irg);
@@ -283,7 +427,7 @@ static void ia32_prepare_graph(void *self) {
 
 	if (cg->opt.doam) {
 		irg_walk_blkwise_graph(cg->irg, NULL, ia32_optimize_am, cg);
-		dump_ir_block_graph_sched(cg->irg, "-am");
+		be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
 	}
 }
 
@@ -340,6 +484,9 @@ static void ia32_finish_irg_walker(ir_node *irn, void *env) {
 
 	/* check if there is a sub which need to be transformed */
 	ia32_transform_sub_to_neg_add(irn, cg);
+
+	/* transform a LEA into an Add if possible */
+	ia32_transform_lea_to_add(irn, cg);
 }
 
 /**
@@ -433,6 +580,9 @@ static void transform_to_Store(ia32_transform_env_t *env) {
 	if (mode_is_float(mode)) {
 		new_op = new_rd_ia32_fStore(env->dbg, env->irg, env->block, ptr, noreg, val, nomem, mode_T);
 	}
+	else if (get_mode_size_bits(mode) == 8) {
+		new_op = new_rd_ia32_Store8Bit(env->dbg, env->irg, env->block, ptr, noreg, val, nomem, mode_T);
+	}
 	else {
 		new_op = new_rd_ia32_Store(env->dbg, env->irg, env->block, ptr, noreg, val, nomem, mode_T);
 	}
@@ -509,7 +659,7 @@ static void ia32_codegen(void *self) {
 	}
 
 	ia32_finish_irg(irg, cg);
-	dump_ir_block_graph_sched(irg, "-finished");
+	be_dump(irg, "-finished", dump_ir_block_graph_sched);
 	ia32_gen_routine(out, irg, cg);
 
 	cur_reg_set = NULL;
@@ -556,6 +706,7 @@ static void *ia32_cg_init(FILE *F, const be_irg_t *birg) {
 	cg->opt.doam      = 1;
 	cg->opt.placecnst = 1;
 	cg->opt.immops    = 1;
+	cg->opt.extbb     = 1;
 
 #ifndef NDEBUG
 	if (isa->name_obst_size) {
@@ -598,7 +749,12 @@ static ia32_isa_t ia32_isa_template = {
 	&ia32_gp_regs[REG_EBP],  /* base pointer register */
 	-1,                      /* stack direction */
 	0,                       /* number of code generator objects so far */
-	NULL                     /* name obstack */
+	NULL,                    /* 16bit register names */
+	NULL,                    /* 8bit register names */
+#ifndef NDEBUG
+	NULL,                    /* name obstack */
+	0                        /* name obst size */
+#endif
 };
 
 /**
@@ -617,6 +773,12 @@ static void *ia32_init(void) {
 	ia32_register_init(isa);
 	ia32_create_opcodes();
 
+	isa->regs_16bit = pmap_create();
+	isa->regs_8bit  = pmap_create();
+
+	ia32_build_16bit_reg_map(isa->regs_16bit);
+	ia32_build_8bit_reg_map(isa->regs_8bit);
+
 #ifndef NDEBUG
 	isa->name_obst = xcalloc(1, sizeof(*(isa->name_obst)));
 	obstack_init(isa->name_obst);
@@ -636,6 +798,9 @@ static void *ia32_init(void) {
 static void ia32_done(void *self) {
 	ia32_isa_t *isa = self;
 
+	pmap_destroy(isa->regs_16bit);
+	pmap_destroy(isa->regs_8bit);
+
 #ifndef NDEBUG
 	//printf("name obst size = %d bytes\n", isa->name_obst_size);
 	obstack_free(isa->name_obst, NULL);
@@ -668,33 +833,6 @@ const arch_register_class_t *ia32_get_reg_class_for_mode(const void *self, const
 		return &ia32_reg_classes[CLASS_ia32_gp];
 }
 
-/**
- * Produces the type which sits between the stack args and the locals on the stack.
- * it will contain the return address and space to store the old base pointer.
- * @return The Firm type modeling the ABI between type.
- */
-static ir_type *get_between_type(void)
-{
-	static ir_type *between_type = NULL;
-	static entity *old_bp_ent    = NULL;
-
-	if(!between_type) {
-		entity *ret_addr_ent;
-		ir_type *ret_addr_type = new_type_primitive(new_id_from_str("return_addr"), mode_P);
-		ir_type *old_bp_type   = new_type_primitive(new_id_from_str("bp"), mode_P);
-
-		between_type           = new_type_class(new_id_from_str("ia32_between_type"));
-		old_bp_ent             = new_entity(between_type, new_id_from_str("old_bp"), old_bp_type);
-		ret_addr_ent           = new_entity(between_type, new_id_from_str("ret_addr"), ret_addr_type);
-
-		set_entity_offset_bytes(old_bp_ent, 0);
-		set_entity_offset_bytes(ret_addr_ent, get_type_size_bytes(old_bp_type));
-		set_type_size_bytes(between_type, get_type_size_bytes(old_bp_type) + get_type_size_bytes(ret_addr_type));
-	}
-
-	return between_type;
-}
-
 /**
  * Get the ABI restrictions for procedure calls.
  * @param self        The this pointer.
@@ -702,14 +840,13 @@ static ir_type *get_between_type(void)
  * @param abi         The abi object to be modified
  */
 void ia32_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi) {
-	ir_type  *between_type;
 	ir_type  *tp;
 	ir_mode  *mode;
 	unsigned  cc        = get_method_calling_convention(method_type);
 	int       n         = get_method_n_params(method_type);
 	int       biggest_n = -1;
 	int       stack_idx = 0;
-	int       i, ignore;
+	int       i, ignore_1, ignore_2;
 	ir_mode **modes;
 	const arch_register_t *reg;
 	be_abi_call_flags_t call_flags;
@@ -721,11 +858,8 @@ void ia32_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *ab
 	call_flags.bits.fp_free               = 0;
 	call_flags.bits.call_has_imm          = 1;
 
-	/* get the between type and the frame pointer save entity */
-	between_type = get_between_type();
-
 	/* set stack parameter passing style */
-	be_abi_call_set_flags(abi, call_flags, between_type);
+	be_abi_call_set_flags(abi, call_flags, &ia32_abi_callbacks);
 
 	/* collect the mode for each type */
 	modes = alloca(n * sizeof(modes[0]));
@@ -738,7 +872,7 @@ void ia32_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *ab
 	/* set register parameters  */
 	if (cc & cc_reg_param) {
 		/* determine the number of parameters passed via registers */
-		biggest_n = ia32_get_n_regparam_class(n, modes, &ignore, &ignore);
+		biggest_n = ia32_get_n_regparam_class(n, modes, &ignore_1, &ignore_2);
 
 		/* loop over all parameters and set the register requirements */
 		for (i = 0; i <= biggest_n; i++) {
@@ -753,7 +887,7 @@ void ia32_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *ab
 
 	/* set stack parameters */
 	for (i = stack_idx; i < n; i++) {
-		be_abi_call_param_stack(abi, i);
+		be_abi_call_param_stack(abi, i, 1);
 	}
 
 
@@ -816,7 +950,7 @@ list_sched_selector_t ia32_sched_selector;
  * Returns the reg_pressure scheduler with to_appear_in_schedule() overloaded
  */
 static const list_sched_selector_t *ia32_get_list_sched_selector(const void *self) {
-	memcpy(&ia32_sched_selector, trivial_selector, sizeof(list_sched_selector_t));
+	memcpy(&ia32_sched_selector, reg_pressure_selector, sizeof(list_sched_selector_t));
 	ia32_sched_selector.to_appear_in_schedule = ia32_to_appear_in_schedule;
 	return &ia32_sched_selector;
 }