X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=62ed8d46e0a41567c1f3d5ad4e1faa4f8a92559d;hb=e73a20bf2f7d542f4e6921b5d907c33d004c5f0a;hp=7452cb9ef0792bac58594a0d37f773ac3ed55924;hpb=ad9464a5db0b98cb926aae609abe84db70b74291;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 7452cb9ef..62ed8d46e 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.
  *
@@ -21,14 +21,14 @@
  * @file
  * @brief       Handling of ia32 specific firm opcodes.
  * @author      Christian Wuerdig
- * @version     $Id$
  *
- * This file implements the creation of the achitecture specific firm opcodes
+ * This file implements the creation of the architecture specific firm opcodes
  * and the corresponding node constructors for the ia32 assembler irg.
  */
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include "irargs_t.h"
 #include "irprog_t.h"
@@ -45,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.
@@ -62,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;
 
@@ -151,7 +152,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");
@@ -164,7 +165,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;
 			}
 
@@ -184,15 +185,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, "pn_code = %ld\n", get_ia32_condcode(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, "ins_permuted = %u \n", attr->data.ins_permuted);
-				fprintf(F, "cmp_unsigned = %u \n", attr->data.cmp_unsigned);
+			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));
@@ -308,6 +304,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 +372,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 +387,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;
 }
 
 /**
@@ -458,6 +468,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.
  */
@@ -649,22 +671,25 @@ unsigned get_ia32_latency(const ir_node *node)
 	return op_attr->latency;
 }
 
-/**
- * Returns the condition code of a node.
- */
-long get_ia32_condcode(const ir_node *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);
-	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;
 }
 
 /**
@@ -676,15 +701,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.
  */
@@ -743,7 +759,7 @@ static const char *ia32_get_old_node_name(const ir_node *irn)
 
 	lc_eoprintf(firm_get_arg_env(), obst, "%+F", irn);
 	obstack_1grow(obst, 0);
-	return obstack_finish(obst);
+	return (const char*)obstack_finish(obst);
 }
 
 /**
@@ -792,20 +808,18 @@ void ia32_swap_left_right(ir_node *node)
 /**
  * Initializes the nodes attributes.
  */
-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)
+static void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
+                                 const arch_register_req_t **in_reqs,
+                                 int n_res)
 {
 	ir_graph        *irg  = get_irn_irg(node);
 	struct obstack  *obst = get_irg_obstack(irg);
 	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
@@ -815,7 +829,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	memset(info->out_infos, 0, n_res * sizeof(info->out_infos[0]));
 }
 
-void init_ia32_x87_attributes(ir_node *res)
+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);
@@ -828,7 +842,7 @@ void init_ia32_x87_attributes(ir_node *res)
 	irg_data->do_x87_sim = 1;
 }
 
-void init_ia32_asm_attributes(ir_node *res)
+static void init_ia32_asm_attributes(ir_node *res)
 {
 #ifndef NDEBUG
 	ia32_attr_t *attr  = get_ia32_attr(res);
@@ -838,11 +852,11 @@ void init_ia32_asm_attributes(ir_node *res)
 #endif
 }
 
-void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
-                                    int symconst_sign, int no_pic_adjust,
-                                    long offset)
+static 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;
@@ -853,9 +867,10 @@ void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 	attr->offset        = offset;
 }
 
-void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
+static 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;
@@ -864,9 +879,9 @@ void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
 	attr->call_tp = call_tp;
 }
 
-void init_ia32_copyb_attributes(ir_node *res, unsigned size)
+static 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;
@@ -874,19 +889,20 @@ void init_ia32_copyb_attributes(ir_node *res, unsigned size)
 	attr->size = size;
 }
 
-void init_ia32_condcode_attributes(ir_node *res, long pnc)
+static 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)
+static 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;
@@ -894,6 +910,22 @@ void init_ia32_climbframe_attributes(ir_node *res, unsigned count)
 	attr->count = count;
 }
 
+static void init_ia32_switch_attributes(ir_node *node,
+                                        const ir_switch_table *table)
+{
+	unsigned n_outs = arch_get_irn_n_outs(node);
+	unsigned o;
+
+	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->table = table;
+
+	for (o = 0; o < n_outs; ++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)
@@ -923,15 +955,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);
@@ -940,7 +971,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;
@@ -951,14 +982,14 @@ 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 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;
@@ -979,7 +1010,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;
@@ -998,7 +1029,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;
@@ -1022,11 +1053,11 @@ 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. */
-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);
@@ -1042,13 +1073,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;
@@ -1082,6 +1113,14 @@ static void ia32_copy_attr(ir_graph *irg, const ir_node *old_node,
 	new_info->out_infos =
 		DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos);
 	new_info->in_reqs = old_info->in_reqs;
+	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 */