X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=206bf3f495afbd375a133c36b063e75d86d61cc4;hb=8c9bd910f70b291d3ffc76d87dd514236152053f;hp=1154477ceebd0fa4b1c7e57ff855af57e4791e10;hpb=e3b48a6e175876384ae07a4f243b6f37697bb6d7;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 1154477ce..206bf3f49 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 
+#include "irargs_t.h"
 #include "irprog_t.h"
 #include "irgraph_t.h"
 #include "irnode_t.h"
@@ -46,8 +47,10 @@
 #include "xmalloc.h"
 
 #include "../bearch_t.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"
@@ -70,7 +73,7 @@
 static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
                          int inout) {
 	char *dir = inout ? "out" : "in";
-	int   max = inout ? get_ia32_n_res(n) : get_irn_arity(n);
+	int   max = inout ? (int) arch_irn_get_n_outs(n) : get_irn_arity(n);
 	char  buf[1024];
 	int   i;
 
@@ -139,7 +142,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 	int          bad  = 0;
 	int          i, n_res, flags;
 	const arch_register_req_t **reqs;
-	const arch_register_t     **slots;
 
 	switch (reason) {
 		case dump_node_opcode_txt:
@@ -188,10 +190,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			break;
 
 		case dump_node_mode_txt:
-			if (is_ia32_Ld(n) || is_ia32_St(n)) {
-				mode = get_ia32_ls_mode(n);
-				fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
-			}
+			mode = get_ia32_ls_mode(n);
+			if (mode != NULL)
+				fprintf(F, "[%s]", get_mode_name(mode));
 			break;
 
 		case dump_node_nodeattr_txt:
@@ -206,7 +207,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			break;
 
 		case dump_node_info_txt:
-			n_res = get_ia32_n_res(n);
+			n_res = arch_irn_get_n_outs(n);
 			fprintf(F, "=== IA32 attr begin ===\n");
 
 			/* dump IN requirements */
@@ -222,12 +223,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 
 			/* dump assigned registers */
-			slots = get_ia32_slots(n);
-			if (slots && n_res > 0) {
+			if (n_res > 0) {
 				for (i = 0; i < n_res; i++) {
-					const arch_register_t *reg;
-
-					reg = slots[i];
+					const arch_register_t *reg = arch_irn_get_register(n, i);
 
 					fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
 				}
@@ -293,7 +291,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
 			}
 
-			fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
+			fprintf(F, "n_res = %d\n", arch_irn_get_n_outs(n));
 			fprintf(F, "use_frame = %d\n", is_ia32_use_frame(n));
 			fprintf(F, "commutative = %d\n", is_ia32_commutative(n));
 			fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
@@ -302,7 +300,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 
 			/* dump flags */
 			fprintf(F, "flags =");
-			flags = get_ia32_flags(n);
+			flags = arch_irn_get_flags(n);
 			if (flags == arch_irn_flags_none) {
 				fprintf(F, " none");
 			}
@@ -313,12 +311,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				if (flags & arch_irn_flags_rematerializable) {
 					fprintf(F, " remat");
 				}
-				if (flags & arch_irn_flags_ignore) {
-					fprintf(F, " ignore");
-				}
-				if (flags & arch_irn_flags_modify_sp) {
-					fprintf(F, " modify_sp");
-				}
 				if (flags & arch_irn_flags_modify_flags) {
 					fprintf(F, " modify_flags");
 				}
@@ -797,43 +789,6 @@ void set_ia32_req_in(ir_node *node, const arch_register_req_t *req, int pos) {
 	attr->in_req[pos] = req;
 }
 
-/**
- * Returns the register flag of an ia32 node.
- */
-arch_irn_flags_t get_ia32_flags(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.flags;
-}
-
-/**
- * Sets the register flag of an ia32 node.
- */
-void set_ia32_flags(ir_node *node, arch_irn_flags_t flags) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.flags  = flags;
-}
-
-void add_ia32_flags(ir_node *node, arch_irn_flags_t flags) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.flags  |= flags;
-}
-
-/**
- * Returns the result register slots of an ia32 node.
- */
-const arch_register_t **get_ia32_slots(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->slots;
-}
-
-/**
- * Returns the number of results.
- */
-int get_ia32_n_res(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return ARR_LEN(attr->slots);
-}
-
 /**
  * Returns the condition code of a node.
  */
@@ -861,24 +816,6 @@ unsigned get_ia32_copyb_size(const ir_node *node)
 	return attr->size;
 }
 
-/**
- * Sets the flags for the n'th out.
- */
-void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	assert(pos < ARR_LEN(attr->out_flags) && "Invalid OUT position.");
-	attr->out_flags[pos] = flags;
-}
-
-/**
- * Gets the flags for the n'th out.
- */
-arch_irn_flags_t get_ia32_out_flags(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	assert(pos < ARR_LEN(attr->out_flags) && "Invalid OUT position.");
-	return attr->out_flags[pos];
-}
-
 /**
  * Get the list of available execution units.
  */
@@ -928,15 +865,27 @@ void set_ia32_exc_label_id(ir_node *node, ir_label_t id) {
 /**
  * Returns the name of the original ir node.
  */
-const char *get_ia32_orig_node(const ir_node *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)
+{
+	struct obstack *obst = env_cg->isa->name_obst;
+
+	lc_eoprintf(firm_get_arg_env(), obst, "%+F", irn);
+	obstack_1grow(obst, 0);
+	return obstack_finish(obst);
+}
+
 /**
  * Sets the name of the original ir node.
  */
-void set_ia32_orig_node(ir_node *node, const char *name) {
+void set_ia32_orig_node(ir_node *node, const ir_node *old)
+{
+	const char  *name = ia32_get_old_node_name(old);
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->orig_node   = name;
 }
@@ -970,54 +919,6 @@ int is_ia32_AddrModeD(const ir_node *node) {
 	return (attr->data.tp == ia32_AddrModeD);
 }
 
-/**
- * Checks if node is a Load or xLoad/vfLoad.
- */
-int is_ia32_Ld(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Load ||
-	       op == iro_ia32_xLoad ||
-	       op == iro_ia32_vfld ||
-	       op == iro_ia32_fld;
-}
-
-/**
- * Checks if node is a Store or xStore/vfStore.
- */
-int is_ia32_St(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Store ||
-	       op == iro_ia32_Store8Bit ||
-	       op == iro_ia32_xStore ||
-	       op == iro_ia32_vfst ||
-	       op == iro_ia32_fst ||
-	       op == iro_ia32_fstp;
-}
-
-/**
- * Returns the name of the OUT register at position pos.
- */
-const char *get_ia32_out_reg_name(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-
-	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
-	assert(attr->slots[pos]  && "No register assigned");
-
-	return arch_register_get_name(attr->slots[pos]);
-}
-
-/**
- * Returns the index of the OUT register at position pos within its register class.
- */
-int get_ia32_out_regnr(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-
-	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
-	assert(attr->slots[pos]  && "No register assigned");
-
-	return arch_register_get_index(attr->slots[pos]);
-}
-
 void ia32_swap_left_right(ir_node *node)
 {
 	ia32_attr_t *attr  = get_ia32_attr(node);
@@ -1030,18 +931,6 @@ void ia32_swap_left_right(ir_node *node)
 	set_irn_n(node, n_ia32_binary_right, left);
 }
 
-/**
- * Returns the OUT register at position pos.
- */
-const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-
-	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
-	assert(attr->slots[pos]  && "No register assigned");
-
-	return attr->slots[pos];
-}
-
 /**
  * Initializes the nodes attributes.
  */
@@ -1054,8 +943,9 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	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;
 
-	set_ia32_flags(node, flags);
+	arch_irn_set_flags(node, flags);
 	set_ia32_in_req_all(node, in_reqs);
 	set_ia32_out_req_all(node, out_reqs);
 
@@ -1064,12 +954,9 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	attr->attr_type  |= IA32_ATTR_ia32_attr_t;
 #endif
 
-	attr->out_flags = NEW_ARR_D(int, obst, n_res);
-	memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0]));
-
-	attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
-	/* void* cast to suppress an incorrect warning on MSVC */
-	memset((void*)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+	info            = be_get_info(node);
+	info->out_infos = NEW_ARR_D(reg_out_info_t, obst, n_res);
+	memset(info->out_infos, 0, n_res * sizeof(info->out_infos[0]));
 }
 
 void
@@ -1109,7 +996,7 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 	attr->offset   = offset;
 }
 
-void init_ia32_call_attributes(ir_node *const res, unsigned const pop, ir_type *const call_tp)
+void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
 {
 	ia32_call_attr_t *attr = get_irn_generic_attr(res);
 
@@ -1151,7 +1038,8 @@ init_ia32_condcode_attributes(ir_node *res, long pnc) {
  ***************************************************************************************/
 
 /* default compare operation to compare attributes */
-int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
+int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
+{
 	if (a->data.tp != b->data.tp)
 		return 1;
 
@@ -1173,9 +1061,6 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
 	    || a->frame_ent != b->frame_ent)
 		return 1;
 
-	if (a->data.tp != b->data.tp)
-		return 1;
-
 	if (a->data.has_except_label != b->data.has_except_label)
 		return 1;
 
@@ -1313,16 +1198,17 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 	struct obstack    *obst     = get_irg_obstack(irg);
 	const ia32_attr_t *attr_old = get_ia32_attr_const(old_node);
 	ia32_attr_t       *attr_new = get_ia32_attr(new_node);
+	backend_info_t    *old_info = be_get_info(old_node);
+	backend_info_t    *new_info;
+
+	new_info = be_get_info(new_node);
 
 	/* copy the attributes */
 	memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node)));
 
 	/* copy out flags */
-	attr_new->out_flags =
-		DUP_ARR_D(int, obst, attr_old->out_flags);
-	/* copy register assignments */
-	attr_new->slots =
-		DUP_ARR_D(arch_register_t*, obst, attr_old->slots);
+	new_info->out_infos =
+		DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos);
 }
 
 /* Include the generated constructor functions */