X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=229884abfa00a6b645dc1a90d68fc5dda59ed2cd;hb=ce7643e41305a037d682b3087da7e1f927f84b5e;hp=f427c970054a0db14654e1de5a29c704ccb74c5d;hpb=dde7cd234a42b319b6241136034507b3d189d900;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index f427c9700..229884abf 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include "irargs_t.h"
 #include "irprog_t.h"
@@ -185,14 +186,11 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 
 			/* dump pn code */
 			if (is_ia32_SwitchJmp(n)) {
-				fprintf(F, "pn_code = %ld\n", get_ia32_condcode(n));
+				fprintf(F, "default_pn = %ld\n", get_ia32_default_pn(n));
 			} else if (is_ia32_CMovcc(n) || is_ia32_Setcc(n) || is_ia32_Jcc(n)) {
 				ia32_attr_t *attr = get_ia32_attr(n);
-				long pnc = get_ia32_condcode(n);
-				fprintf(F, "pn_code = 0x%X (%s)\n", (unsigned) pnc,
-				        get_pnc_string(pnc & pn_Cmp_True));
+				fprintf(F, "condition_code = 0x%X\n", get_ia32_condcode(n));
 				fprintf(F, "ins_permuted = %u \n", attr->data.ins_permuted);
-				fprintf(F, "cmp_unsigned = %u \n", attr->data.cmp_unsigned);
 			}
 			else if (is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
 				fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
@@ -308,6 +306,20 @@ const ia32_condcode_attr_t *get_ia32_condcode_attr_const(const ir_node *node)
 	return cc_attr;
 }
 
+ia32_switch_attr_t *get_ia32_switch_attr(ir_node *node)
+{
+	ia32_attr_t        *attr        = get_ia32_attr(node);
+	ia32_switch_attr_t *switch_attr = CAST_IA32_ATTR(ia32_switch_attr_t, attr);
+	return switch_attr;
+}
+
+const ia32_switch_attr_t *get_ia32_switch_attr_const(const ir_node *node)
+{
+	const ia32_attr_t        *attr        = get_ia32_attr_const(node);
+	const ia32_switch_attr_t *switch_attr = CONST_CAST_IA32_ATTR(ia32_switch_attr_t, attr);
+	return switch_attr;
+}
+
 ia32_call_attr_t *get_ia32_call_attr(ir_node *node)
 {
 	ia32_attr_t      *attr      = get_ia32_attr(node);
@@ -362,7 +374,7 @@ const ia32_climbframe_attr_t *get_ia32_climbframe_attr_const(const ir_node *node
 ia32_op_type_t get_ia32_op_type(const ir_node *node)
 {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.tp;
+	return (ia32_op_type_t)attr->data.tp;
 }
 
 /**
@@ -377,7 +389,7 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp)
 ia32_am_type_t get_ia32_am_support(const ir_node *node)
 {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.am_arity;
+	return (ia32_am_type_t)attr->data.am_arity;
 }
 
 /**
@@ -649,58 +661,28 @@ unsigned get_ia32_latency(const ir_node *node)
 	return op_attr->latency;
 }
 
-/**
- * Returns the argument register requirements of an ia32 node.
- */
-const arch_register_req_t **get_ia32_in_req_all(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->in_req;
-}
-
-/**
- * Sets the argument register requirements of an ia32 node.
- */
-void set_ia32_in_req_all(ir_node *node, const arch_register_req_t **reqs)
-{
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->in_req      = reqs;
-}
-
-/**
- * Returns the argument register requirement at position pos of an ia32 node.
- */
-const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->in_req[pos];
-}
-
-/**
- * Sets the IN register requirements at position pos.
- */
-void set_ia32_req_in(ir_node *node, const arch_register_req_t *req, int pos)
-{
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->in_req[pos] = req;
-}
-
 /**
  * Returns the condition code of a node.
  */
-long get_ia32_condcode(const ir_node *node)
+ia32_condition_code_t get_ia32_condcode(const ir_node *node)
 {
 	const ia32_condcode_attr_t *attr = get_ia32_condcode_attr_const(node);
-	return attr->pn_code;
+	return attr->condition_code;
 }
 
 /**
  * Sets the condition code of a node
  */
-void set_ia32_condcode(ir_node *node, long code)
+void set_ia32_condcode(ir_node *node, ia32_condition_code_t code)
 {
 	ia32_condcode_attr_t *attr = get_ia32_condcode_attr(node);
-	attr->pn_code = code;
+	attr->condition_code = code;
+}
+
+long get_ia32_default_pn(const ir_node *node)
+{
+	const ia32_switch_attr_t *attr = get_ia32_switch_attr_const(node);
+	return attr->default_pn;
 }
 
 /**
@@ -774,11 +756,12 @@ const char *get_ia32_orig_node(const ir_node *node)
 
 static const char *ia32_get_old_node_name(const ir_node *irn)
 {
-	struct obstack *obst = env_cg->isa->name_obst;
+	ir_graph       *irg  = get_irn_irg(irn);
+	struct obstack *obst = be_get_be_obst(irg);
 
 	lc_eoprintf(firm_get_arg_env(), obst, "%+F", irn);
 	obstack_1grow(obst, 0);
-	return obstack_finish(obst);
+	return (const char*)obstack_finish(obst);
 }
 
 /**
@@ -838,7 +821,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	backend_info_t  *info;
 
 	arch_irn_set_flags(node, flags);
-	set_ia32_in_req_all(node, in_reqs);
+	arch_set_in_register_reqs(node, in_reqs);
 
 	attr->exec_units  = execution_units;
 #ifndef NDEBUG
@@ -852,13 +835,15 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 
 void init_ia32_x87_attributes(ir_node *res)
 {
+	ir_graph        *irg      = get_irn_irg(res);
+	ia32_irg_data_t *irg_data = ia32_get_irg_data(irg);
 #ifndef NDEBUG
 	ia32_attr_t *attr  = get_ia32_attr(res);
 	attr->attr_type   |= IA32_ATTR_ia32_x87_attr_t;
 #else
 	(void) res;
 #endif
-	ia32_current_cg->do_x87_sim = 1;
+	irg_data->do_x87_sim = 1;
 }
 
 void init_ia32_asm_attributes(ir_node *res)
@@ -875,7 +860,7 @@ void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
                                     int symconst_sign, int no_pic_adjust,
                                     long offset)
 {
-	ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
+	ia32_immediate_attr_t *attr = (ia32_immediate_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_immediate_attr_t;
@@ -888,7 +873,7 @@ void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 
 void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
 {
-	ia32_call_attr_t *attr = get_irn_generic_attr(res);
+	ia32_call_attr_t *attr = (ia32_call_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_call_attr_t;
@@ -899,7 +884,7 @@ void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
 
 void init_ia32_copyb_attributes(ir_node *res, unsigned size)
 {
-	ia32_copyb_attr_t *attr = get_irn_generic_attr(res);
+	ia32_copyb_attr_t *attr = (ia32_copyb_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_copyb_attr_t;
@@ -907,19 +892,19 @@ void init_ia32_copyb_attributes(ir_node *res, unsigned size)
 	attr->size = size;
 }
 
-void init_ia32_condcode_attributes(ir_node *res, long pnc)
+void init_ia32_condcode_attributes(ir_node *res, ia32_condition_code_t cc)
 {
-	ia32_condcode_attr_t *attr = get_irn_generic_attr(res);
+	ia32_condcode_attr_t *attr = (ia32_condcode_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_condcode_attr_t;
 #endif
-	attr->pn_code = pnc;
+	attr->condition_code = cc;
 }
 
 void init_ia32_climbframe_attributes(ir_node *res, unsigned count)
 {
-	ia32_climbframe_attr_t *attr = get_irn_generic_attr(res);
+	ia32_climbframe_attr_t *attr = (ia32_climbframe_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_climbframe_attr_t;
@@ -927,6 +912,15 @@ void init_ia32_climbframe_attributes(ir_node *res, unsigned count)
 	attr->count = count;
 }
 
+void init_ia32_switch_attributes(ir_node *res, long default_pn)
+{
+	ia32_switch_attr_t *attr = (ia32_switch_attr_t*) get_irn_generic_attr(res);
+#ifndef NDEBUG
+	attr->attr.attr_type |= IA32_ATTR_ia32_switch_attr_t;
+#endif
+	attr->default_pn = default_pn;
+}
+
 
 /* default compare operation to compare attributes */
 static int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
@@ -956,15 +950,14 @@ static int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
 	if (a->data.has_except_label != b->data.has_except_label)
 		return 1;
 
-	if (a->data.ins_permuted != b->data.ins_permuted
-			|| a->data.cmp_unsigned != b->data.cmp_unsigned)
+	if (a->data.ins_permuted != b->data.ins_permuted)
 		return 1;
 
 	return 0;
 }
 
 /** Compare nodes attributes for all "normal" nodes. */
-static int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
+static int ia32_compare_nodes_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_attr_t* attr_a = get_ia32_attr_const(a);
 	const ia32_attr_t* attr_b = get_ia32_attr_const(b);
@@ -973,7 +966,7 @@ static int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for nodes with condition code. */
-static int ia32_compare_condcode_attr(ir_node *a, ir_node *b)
+static int ia32_compare_condcode_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_condcode_attr_t *attr_a;
 	const ia32_condcode_attr_t *attr_b;
@@ -984,14 +977,32 @@ static int ia32_compare_condcode_attr(ir_node *a, ir_node *b)
 	attr_a = get_ia32_condcode_attr_const(a);
 	attr_b = get_ia32_condcode_attr_const(b);
 
-	if (attr_a->pn_code != attr_b->pn_code)
+	if (attr_a->condition_code != attr_b->condition_code)
+		return 1;
+
+	return 0;
+}
+
+/** Compare node attributes for nodes with condition code. */
+static int ia32_compare_switch_attr(const ir_node *a, const ir_node *b)
+{
+	const ia32_switch_attr_t *attr_a;
+	const ia32_switch_attr_t *attr_b;
+
+	if (ia32_compare_nodes_attr(a, b))
+		return 1;
+
+	attr_a = get_ia32_switch_attr_const(a);
+	attr_b = get_ia32_switch_attr_const(b);
+
+	if (attr_a->default_pn != attr_b->default_pn)
 		return 1;
 
 	return 0;
 }
 
 /** Compare node attributes for call nodes. */
-static int ia32_compare_call_attr(ir_node *a, ir_node *b)
+static int ia32_compare_call_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_call_attr_t *attr_a;
 	const ia32_call_attr_t *attr_b;
@@ -1012,7 +1023,7 @@ static int ia32_compare_call_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for CopyB nodes. */
-static int ia32_compare_copyb_attr(ir_node *a, ir_node *b)
+static int ia32_compare_copyb_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_copyb_attr_t *attr_a;
 	const ia32_copyb_attr_t *attr_b;
@@ -1031,7 +1042,7 @@ static int ia32_compare_copyb_attr(ir_node *a, ir_node *b)
 
 
 /** Compare ASM node attributes. */
-static int ia32_compare_asm_attr(ir_node *a, ir_node *b)
+static int ia32_compare_asm_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_asm_attr_t *attr_a;
 	const ia32_asm_attr_t *attr_b;
@@ -1059,7 +1070,7 @@ static unsigned ia32_hash_Immediate(const ir_node *irn)
 }
 
 /** Compare node attributes for Immediates. */
-static int ia32_compare_immediate_attr(ir_node *a, ir_node *b)
+static int ia32_compare_immediate_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_immediate_attr_t *attr_a = get_ia32_immediate_attr_const(a);
 	const ia32_immediate_attr_t *attr_b = get_ia32_immediate_attr_const(b);
@@ -1075,13 +1086,13 @@ static int ia32_compare_immediate_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for x87 nodes. */
-static int ia32_compare_x87_attr(ir_node *a, ir_node *b)
+static int ia32_compare_x87_attr(const ir_node *a, const ir_node *b)
 {
 	return ia32_compare_nodes_attr(a, b);
 }
 
 /** Compare node attributes for ClimbFrame nodes. */
-static int ia32_compare_climbframe_attr(ir_node *a, ir_node *b)
+static int ia32_compare_climbframe_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_climbframe_attr_t *attr_a;
 	const ia32_climbframe_attr_t *attr_b;
@@ -1114,6 +1125,7 @@ static void ia32_copy_attr(ir_graph *irg, const ir_node *old_node,
 	/* copy out flags */
 	new_info->out_infos =
 		DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos);
+	new_info->in_reqs = old_info->in_reqs;
 }
 
 /* Include the generated constructor functions */