X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=c1f553c8a6a72fa17a2feb614a0a1ba001876ed4;hb=f8ead9acbe48af00885e64a6f2f895d1b6cae434;hp=3c17da6c8a01c9f490463e13ec3f5ec965c7cefd;hpb=55d198f1d6c1b833556dc93ba1bf61c4b8bedad9;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 3c17da6c8..c1f553c8a 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       Handling of ia32 specific firm opcodes.
  * @author      Christian Wuerdig
- * @version     $Id$
  *
  * This file implements the creation of the architecture specific firm opcodes
  * and the corresponding node constructors for the ia32 assembler irg.
@@ -46,15 +45,16 @@
 #include "raw_bitset.h"
 #include "xmalloc.h"
 
-#include "../bearch.h"
-#include "../beinfo.h"
+#include "bearch.h"
+#include "beinfo.h"
 
 #include "bearch_ia32_t.h"
 #include "ia32_common_transform.h"
 #include "ia32_nodes_attr.h"
 #include "ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
-#include "gen_ia32_machine.h"
+
+struct obstack opcodes_obst;
 
 /**
  * Dumper interface for dumping ia32 nodes in vcg.
@@ -63,7 +63,7 @@
  * @param reason   indicates which kind of information should be dumped
  * @return 0 on success or != 0 on failure
  */
-static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
+static void ia32_dump_node(FILE *F, const ir_node *n, dump_reason_t reason)
 {
 	ir_mode *mode = NULL;
 
@@ -127,13 +127,12 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 
 		case dump_node_nodeattr_txt:
 			if (! is_ia32_Lea(n)) {
-				if (is_ia32_AddrModeS(n)) {
-					fprintf(F, "[AM S] ");
-				} else if (is_ia32_AddrModeD(n)) {
-					fprintf(F, "[AM D] ");
+				switch (get_ia32_op_type(n)) {
+				case ia32_Normal:    break;
+				case ia32_AddrModeS: fprintf(F, "[AM S] "); break;
+				case ia32_AddrModeD: fprintf(F, "[AM D] "); break;
 				}
 			}
-
 			break;
 
 		case dump_node_info_txt:
@@ -152,7 +151,7 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 					fprintf(F, "AM Source (Load)");
 					break;
 				default:
-					fprintf(F, "unknown (%d)", get_ia32_op_type(n));
+					fprintf(F, "unknown (%d)", (int)get_ia32_op_type(n));
 					break;
 			}
 			fprintf(F, "\n");
@@ -165,7 +164,7 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 				case ia32_am_binary: fputs("source (binary)\n", F); break;
 
 				default:
-					fprintf(F, "unknown (%d)\n", get_ia32_am_support(n));
+					fprintf(F, "unknown (%d)\n", (int)get_ia32_am_support(n));
 					break;
 			}
 
@@ -185,12 +184,10 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 			fprintf(F, "AM scale = %u\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			if (is_ia32_SwitchJmp(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);
-				fprintf(F, "condition_code = 0x%X\n", get_ia32_condcode(n));
-				fprintf(F, "ins_permuted = %u \n", attr->data.ins_permuted);
+			if (is_ia32_CMovcc(n) || is_ia32_Setcc(n) || is_ia32_Jcc(n)) {
+				const ia32_attr_t *attr = get_ia32_attr_const(n);
+				fprintf(F, "condition_code = 0x%X\n", (unsigned)get_ia32_condcode(n));
+				fprintf(F, "ins_permuted = %u\n", (unsigned)attr->data.ins_permuted);
 			}
 			else if (is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
 				fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
@@ -224,14 +221,8 @@ static void ia32_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 
 #ifndef NDEBUG
 			/* dump original ir node name */
-			fprintf(F, "orig node = ");
-			if (get_ia32_orig_node(n)) {
-				fprintf(F, "%s", get_ia32_orig_node(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
+			char const *orig = get_ia32_attr_const(n)->orig_node;
+			fprintf(F, "orig node = %s\n", orig ? orig : "n/a");
 #endif /* NDEBUG */
 
 			break;
@@ -470,6 +461,18 @@ int is_ia32_am_sc_sign(const ir_node *node)
 	return attr->data.am_sc_sign;
 }
 
+void set_ia32_am_tls_segment(ir_node *node, bool value)
+{
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.am_tls_segment = value;
+}
+
+bool get_ia32_am_tls_segment(const ir_node *node)
+{
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.am_tls_segment;
+}
+
 /**
  * Gets the addr mode const.
  */
@@ -661,9 +664,12 @@ unsigned get_ia32_latency(const ir_node *node)
 	return op_attr->latency;
 }
 
-/**
- * Returns the condition code of a node.
- */
+const ir_switch_table *get_ia32_switch_table(const ir_node *node)
+{
+	const ia32_switch_attr_t *attr = get_ia32_switch_attr_const(node);
+	return attr->table;
+}
+
 ia32_condition_code_t get_ia32_condcode(const ir_node *node)
 {
 	const ia32_condcode_attr_t *attr = get_ia32_condcode_attr_const(node);
@@ -679,12 +685,6 @@ void set_ia32_condcode(ir_node *node, ia32_condition_code_t 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;
-}
-
 /**
  * Returns the condition code of a node.
  */
@@ -694,15 +694,6 @@ unsigned get_ia32_copyb_size(const ir_node *node)
 	return attr->size;
 }
 
-/**
- * Get the list of available execution units.
- */
-const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->exec_units;
-}
-
 /**
  * Get the exception label attribute.
  */
@@ -745,15 +736,6 @@ void set_ia32_exc_label_id(ir_node *node, ir_label_t id)
 
 #ifndef NDEBUG
 
-/**
- * Returns the name of the original ir node.
- */
-const char *get_ia32_orig_node(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->orig_node;
-}
-
 static const char *ia32_get_old_node_name(const ir_node *irn)
 {
 	ir_graph       *irg  = get_irn_irg(irn);
@@ -776,25 +758,6 @@ void set_ia32_orig_node(ir_node *node, const ir_node *old)
 
 #endif /* NDEBUG */
 
-
-/**
- * Returns whether or not the node is an AddrModeS node.
- */
-int is_ia32_AddrModeS(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.tp == ia32_AddrModeS);
-}
-
-/**
- * Returns whether or not the node is an AddrModeD node.
- */
-int is_ia32_AddrModeD(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.tp == ia32_AddrModeD);
-}
-
 void ia32_swap_left_right(ir_node *node)
 {
 	ia32_attr_t *attr  = get_ia32_attr(node);
@@ -812,7 +775,6 @@ void ia32_swap_left_right(ir_node *node)
  */
 static void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
                                  const arch_register_req_t **in_reqs,
-                                 const be_execution_unit_t ***execution_units,
                                  int n_res)
 {
 	ir_graph        *irg  = get_irn_irg(node);
@@ -820,10 +782,9 @@ static void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	ia32_attr_t     *attr = get_ia32_attr(node);
 	backend_info_t  *info;
 
-	arch_irn_set_flags(node, flags);
-	arch_set_in_register_reqs(node, in_reqs);
+	arch_set_irn_flags(node, flags);
+	arch_set_irn_register_reqs_in(node, in_reqs);
 
-	attr->exec_units  = execution_units;
 #ifndef NDEBUG
 	attr->attr_type  |= IA32_ATTR_ia32_attr_t;
 #endif
@@ -835,15 +796,12 @@ static void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 
 static 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
-	irg_data->do_x87_sim = 1;
+	ir_graph *const irg = get_irn_irg(res);
+	ia32_request_x87_sim(irg);
 }
 
 static void init_ia32_asm_attributes(ir_node *res)
@@ -851,9 +809,10 @@ static void init_ia32_asm_attributes(ir_node *res)
 #ifndef NDEBUG
 	ia32_attr_t *attr  = get_ia32_attr(res);
 	attr->attr_type   |= IA32_ATTR_ia32_asm_attr_t;
-#else
-	(void) res;
 #endif
+
+	ir_graph *const irg = get_irn_irg(res);
+	ia32_request_x87_sim(irg); /* asm might have fp operands. */
 }
 
 static void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
@@ -914,15 +873,19 @@ static void init_ia32_climbframe_attributes(ir_node *res, unsigned count)
 	attr->count = count;
 }
 
-static void init_ia32_switch_attributes(ir_node *res, long default_pn)
+static void init_ia32_switch_attributes(ir_node *node,
+                                        const ir_switch_table *table)
 {
-	ia32_switch_attr_t *attr = (ia32_switch_attr_t*) get_irn_generic_attr(res);
+	ia32_switch_attr_t *attr = (ia32_switch_attr_t*) get_irn_generic_attr(node);
 #ifndef NDEBUG
 	attr->attr.attr_type |= IA32_ATTR_ia32_switch_attr_t;
 #endif
-	attr->default_pn = default_pn;
-}
+	attr->table = table;
 
+	be_foreach_out(node, o) {
+		arch_set_irn_register_req_out(node, o, arch_no_register_req);
+	}
+}
 
 /* default compare operation to compare attributes */
 static int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
@@ -985,24 +948,6 @@ static int ia32_compare_condcode_attr(const ir_node *a, const ir_node *b)
 	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(const ir_node *a, const ir_node *b)
 {
@@ -1068,7 +1013,7 @@ static unsigned ia32_hash_Immediate(const ir_node *irn)
 {
 	const ia32_immediate_attr_t *a = get_ia32_immediate_attr_const(irn);
 
-	return HASH_PTR(a->symconst) + (a->sc_sign << 16) + a->offset;
+	return hash_ptr(a->symconst) + (a->sc_sign << 16) + a->offset;
 }
 
 /** Compare node attributes for Immediates. */
@@ -1131,5 +1076,12 @@ static void ia32_copy_attr(ir_graph *irg, const ir_node *old_node,
 	new_info->flags = old_info->flags;
 }
 
+static void ia32_init_op(ir_op *op, unsigned latency)
+{
+	ia32_op_attr_t *attr = OALLOCZ(&opcodes_obst, ia32_op_attr_t);
+	attr->latency = latency;
+	set_op_attr(op, attr);
+}
+
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"