X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fbearch_ia32.c;h=3647a61d40973095476b8b4f4737f244706676f1;hb=e07b61c6ed5d198a484761f8a40a4f26520d964d;hp=fbb4f7a13dd4b1293beeafb47419a16b800d8e3f;hpb=18be1ca2bcd353289b17b7cde78852fbcbb88e44;p=libfirm

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index fbb4f7a13..3647a61d4 100644
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -180,7 +180,8 @@ ir_node *ia32_new_Fpu_truncate(ia32_code_gen_t *cg) {
 /**
  * Returns the admissible noreg register node for input register pos of node irn.
  */
-ir_node *ia32_get_admissible_noreg(ia32_code_gen_t *cg, ir_node *irn, int pos) {
+static ir_node *ia32_get_admissible_noreg(ia32_code_gen_t *cg, ir_node *irn, int pos)
+{
 	const arch_register_req_t *req;
 
 	req = arch_get_register_req(cg->arch_env, irn, pos);
@@ -544,8 +545,8 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
  */
 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);
+	ia32_abi_env_t      *env = XMALLOC(ia32_abi_env_t);
+	be_abi_call_flags_t  fl  = be_abi_call_get_flags(call);
 	env->flags = fl.bits;
 	env->irg   = irg;
 	env->aenv  = aenv;
@@ -818,12 +819,14 @@ static int ia32_possible_memory_operand(const ir_node *irn, unsigned int i)
 
 	if (!is_ia32_irn(irn)                              ||  /* must be an ia32 irn */
 	    get_ia32_op_type(irn) != ia32_Normal           ||  /* must not already be a addressmode irn */
-	    !(get_ia32_am_support(irn) & ia32_am_Source)   ||  /* must be capable of source addressmode */
 	    !ia32_is_spillmode_compatible(mode, spillmode) ||
 	    is_ia32_use_frame(irn))                            /* must not already use frame */
 		return 0;
 
-	switch (get_ia32_am_arity(irn)) {
+	switch (get_ia32_am_support(irn)) {
+		case ia32_am_none:
+			return 0;
+
 		case ia32_am_unary:
 			return i == n_ia32_unary_op;
 
@@ -852,7 +855,7 @@ static int ia32_possible_memory_operand(const ir_node *irn, unsigned int i)
 			}
 
 		default:
-			panic("Unknown arity");
+			panic("Unknown AM type");
 	}
 }
 
@@ -874,8 +877,8 @@ static void ia32_perform_memory_operand(ir_node *irn, ir_node *spill,
 	set_ia32_use_frame(irn);
 	set_ia32_need_stackent(irn);
 
-	if (i == n_ia32_binary_left                  &&
-	    get_ia32_am_arity(irn) == ia32_am_binary &&
+	if (i == n_ia32_binary_left                    &&
+	    get_ia32_am_support(irn) == ia32_am_binary &&
 	    /* immediates are only allowed on the right side */
 	    !is_ia32_Immediate(get_irn_n(irn, n_ia32_binary_right))) {
 		ia32_swap_left_right(irn);
@@ -1019,7 +1022,7 @@ static void ia32_before_sched(void *self) {
 	(void) self;
 }
 
-static void turn_back_am(ir_node *node)
+ir_node *turn_back_am(ir_node *node)
 {
 	ir_graph *irg   = current_ir_graph;
 	dbg_info *dbgi  = get_irn_dbg_info(node);
@@ -1037,15 +1040,13 @@ static void turn_back_am(ir_node *node)
 		set_ia32_is_reload(load);
 	set_irn_n(node, n_ia32_mem, new_NoMem());
 
-	switch (get_ia32_am_arity(node)) {
+	switch (get_ia32_am_support(node)) {
 		case ia32_am_unary:
 			set_irn_n(node, n_ia32_unary_op, load_res);
 			break;
 
 		case ia32_am_binary:
 			if (is_ia32_Immediate(get_irn_n(node, n_ia32_binary_right))) {
-				assert(is_ia32_Cmp(node)  || is_ia32_Cmp8Bit(node) ||
-				       is_ia32_Test(node) || is_ia32_Test8Bit(node));
 				set_irn_n(node, n_ia32_binary_left, load_res);
 			} else {
 				set_irn_n(node, n_ia32_binary_right, load_res);
@@ -1053,7 +1054,7 @@ static void turn_back_am(ir_node *node)
 			break;
 
 		default:
-			panic("Unknown arity");
+			panic("Unknown AM type");
 	}
 	noreg = ia32_new_NoReg_gp(ia32_current_cg);
 	set_irn_n(node, n_ia32_base,  noreg);
@@ -1079,6 +1080,8 @@ static void turn_back_am(ir_node *node)
 	set_ia32_op_type(node, ia32_Normal);
 	if (sched_is_scheduled(node))
 		sched_add_before(node, load);
+
+	return load_res;
 }
 
 static ir_node *flags_remat(ir_node *node, ir_node *after)
@@ -1577,7 +1580,7 @@ static const arch_code_generator_if_t ia32_code_gen_if = {
  */
 static void *ia32_cg_init(be_irg_t *birg) {
 	ia32_isa_t      *isa = (ia32_isa_t *)birg->main_env->arch_env;
-	ia32_code_gen_t *cg  = xcalloc(1, sizeof(*cg));
+	ia32_code_gen_t *cg  = XMALLOCZ(ia32_code_gen_t);
 
 	cg->impl      = &ia32_code_gen_if;
 	cg->irg       = birg->irg;
@@ -1739,7 +1742,7 @@ static arch_env_t *ia32_init(FILE *file_handle) {
 
 	set_tarval_output_modes();
 
-	isa = xmalloc(sizeof(*isa));
+	isa = XMALLOC(ia32_isa_t);
 	memcpy(isa, &ia32_isa_template, sizeof(*isa));
 
 	if(mode_fpcw == NULL) {
@@ -1762,7 +1765,7 @@ static arch_env_t *ia32_init(FILE *file_handle) {
 	ia32_build_8bit_reg_map_high(isa->regs_8bit_high);
 
 #ifndef NDEBUG
-	isa->name_obst = xmalloc(sizeof(*isa->name_obst));
+	isa->name_obst = XMALLOC(struct obstack);
 	obstack_init(isa->name_obst);
 #endif /* NDEBUG */