X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fmips_new_nodes.c;h=267dc8cb527702ff83915bc036713c70902b7661;hb=97c6f4665bc5071a86ece7fd9d6eaeeb30581bd3;hp=73762e1dbad05ebfb531b02f0389203b7f47f7da;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/mips/mips_new_nodes.c b/ir/be/mips/mips_new_nodes.c
index 73762e1db..267dc8cb5 100644
--- a/ir/be/mips/mips_new_nodes.c
+++ b/ir/be/mips/mips_new_nodes.c
@@ -18,9 +18,12 @@
  */
 
 /**
- * This file implements the creation of the achitecture specific firm opcodes
- * and the coresponding node constructors for the mips assembler irg.
- * $Id$
+ * @file
+ * @brief    This file implements the creation of the achitecture specific firm
+ *           opcodes and the coresponding node constructors for the mips
+ *           assembler irg.
+ * @author   Matthias Braun, Mehdi
+ * @version  $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -155,15 +158,15 @@ static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 
 			/* dump OUT requirements */
-			if (attr->n_res > 0) {
+			if (ARR_LEN(attr->slots) > 0) {
 				reqs = get_mips_out_req_all(n);
 				dump_reg_req(F, n, reqs, 1);
 			}
 
 			/* dump assigned registers */
 			slots = get_mips_slots(n);
-			if (slots && attr->n_res > 0) {
-				for (i = 0; i < attr->n_res; i++) {
+			if (slots && ARR_LEN(attr->slots) > 0) {
+				for (i = 0; i < ARR_LEN(attr->slots); i++) {
 					if (slots[i]) {
 						fprintf(F, "reg #%d = %s\n", i, slots[i]->name);
 					}
@@ -195,9 +198,6 @@ static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, " (%d)\n", attr->flags);
 
-			if(attr->modes.load_store_mode != NULL) {
-				fprintf(F, " load_store_mode %s\n", get_mode_name(attr->modes.load_store_mode));
-			}
 			if(attr->stack_entity != NULL) {
 				fprintf(F, " stack entity %s\n", get_entity_name(attr->stack_entity));
 			}
@@ -205,8 +205,8 @@ static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				tarval_snprintf(buf, sizeof(buf), attr->tv);
 				fprintf(F, " tarval %s\n", buf);
 			}
-			if(attr->symconst_id != NULL) {
-				fprintf(F, " symconst '%s'\n", get_id_str(attr->symconst_id));
+			if(attr->symconst != NULL) {
+				fprintf(F, " symconst '%s'\n", get_entity_name(attr->symconst));
 			}
 
 			fprintf(F, "=== mips attr end ===\n");
@@ -231,20 +231,21 @@ static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
  *                                       |___/
  ***************************************************************************************************/
 
-/**
- * Wraps get_irn_generic_attr() as it takes no const ir_node, so we need to do a cast.
- * Firm was made by people hating const :-(
- */
-mips_attr_t *get_mips_attr(const ir_node *node) {
+mips_attr_t *get_mips_attr(ir_node *node) {
 	assert(is_mips_irn(node) && "need mips node to get attributes");
-	return (mips_attr_t *)get_irn_generic_attr((ir_node *)node);
+	return (mips_attr_t *) get_irn_generic_attr(node);
+}
+
+const mips_attr_t *get_mips_attr_const(const ir_node *node) {
+	assert(is_mips_irn(node) && "need mips node to get attributes");
+	return get_irn_generic_attr_const(node);
 }
 
 /**
  * Returns the argument register requirements of a mips node.
  */
 const arch_register_req_t **get_mips_in_req_all(const ir_node *node) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->in_req;
 }
 
@@ -252,7 +253,7 @@ const arch_register_req_t **get_mips_in_req_all(const ir_node *node) {
  * Returns the result register requirements of an mips node.
  */
 const arch_register_req_t **get_mips_out_req_all(const ir_node *node) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->out_req;
 }
 
@@ -260,7 +261,7 @@ const arch_register_req_t **get_mips_out_req_all(const ir_node *node) {
  * Returns the argument register requirement at position pos of an mips node.
  */
 const arch_register_req_t *get_mips_in_req(const ir_node *node, int pos) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->in_req[pos];
 }
 
@@ -268,7 +269,7 @@ const arch_register_req_t *get_mips_in_req(const ir_node *node, int pos) {
  * Returns the result register requirement at position pos of an mips node.
  */
 const arch_register_req_t *get_mips_out_req(const ir_node *node, int pos) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->out_req[pos];
 }
 
@@ -292,14 +293,14 @@ void set_mips_req_in(ir_node *node, const arch_register_req_t *req, int pos) {
  * Returns the register flag of an mips node.
  */
 arch_irn_flags_t get_mips_flags(const ir_node *node) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->flags;
 }
 
 /**
  * Sets the register flag of an mips node.
  */
-void set_mips_flags(const ir_node *node, arch_irn_flags_t flags) {
+void set_mips_flags(ir_node *node, arch_irn_flags_t flags) {
 	mips_attr_t *attr = get_mips_attr(node);
 	attr->flags      = flags;
 }
@@ -308,7 +309,7 @@ void set_mips_flags(const ir_node *node, arch_irn_flags_t flags) {
  * Returns the result register slots of an mips node.
  */
 const arch_register_t **get_mips_slots(const ir_node *node) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 	return attr->slots;
 }
 
@@ -316,10 +317,10 @@ const arch_register_t **get_mips_slots(const ir_node *node) {
  * Returns the name of the OUT register at position pos.
  */
 const char *get_mips_out_reg_name(const ir_node *node, int pos) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 
 	assert(is_mips_irn(node) && "Not an mips node.");
-	assert(pos < attr->n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
 	return arch_register_get_name(attr->slots[pos]);
@@ -329,10 +330,10 @@ const char *get_mips_out_reg_name(const ir_node *node, int pos) {
  * Returns the index of the OUT register at position pos within its register class.
  */
 int get_mips_out_regnr(const ir_node *node, int pos) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 
 	assert(is_mips_irn(node) && "Not an mips node.");
-	assert(pos < attr->n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
 	return arch_register_get_index(attr->slots[pos]);
@@ -342,29 +343,21 @@ int get_mips_out_regnr(const ir_node *node, int pos) {
  * Returns the OUT register at position pos.
  */
 const arch_register_t *get_mips_out_reg(const ir_node *node, int pos) {
-	mips_attr_t *attr = get_mips_attr(node);
+	const mips_attr_t *attr = get_mips_attr_const(node);
 
 	assert(is_mips_irn(node) && "Not an mips node.");
-	assert(pos < attr->n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
 	return attr->slots[pos];
 }
 
-/**
- * Sets the number of results.
- */
-void set_mips_n_res(ir_node *node, int n_res) {
-	mips_attr_t *attr = get_mips_attr(node);
-	attr->n_res      = n_res;
-}
-
 /**
  * Returns the number of results.
  */
 int get_mips_n_res(const ir_node *node) {
-	mips_attr_t *attr = get_mips_attr(node);
-	return attr->n_res;
+	const mips_attr_t *attr = get_mips_attr_const(node);
+	return ARR_LEN(attr->slots);
 }
 
 /**
@@ -375,15 +368,38 @@ void init_mips_attributes(ir_node *node, arch_irn_flags_t flags, const arch_regi
 												  const be_execution_unit_t ***execution_units,
 												  int n_res, unsigned latency)
 {
-	mips_attr_t *attr = get_mips_attr(node);
+	ir_graph       *irg  = get_irn_irg(node);
+	struct obstack *obst = get_irg_obstack(irg);
+	mips_attr_t    *attr = get_mips_attr(node);
 
-	attr->flags = flags;
+	attr->flags   = flags;
 	attr->out_req = out_reqs;
+	attr->in_req  = in_reqs;
 
-	attr->n_res = n_res;
-	attr->in_req = in_reqs;
+	attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
+	memset(attr->slots, 0, n_res * sizeof(attr->slots[0]));
+}
 
-	memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+static
+int mips_compare_attr(ir_node *node_a, ir_node *node_b)
+{
+	const mips_attr_t *a = get_mips_attr_const(node_a);
+	const mips_attr_t *b = get_mips_attr_const(node_b);
+
+	if(a->tv != b->tv)
+		return 1;
+	if(a->symconst != b->symconst)
+		return 1;
+	if(a->stack_entity != b->stack_entity)
+		return 1;
+	if(a->flags != b->flags)
+		return 1;
+	if(ARR_LEN(a->slots) != ARR_LEN(b->slots))
+		return 1;
+	if(a->switch_default_pn != b->switch_default_pn)
+		return 1;
+
+	return 0;
 }
 
 /************************************************************************
@@ -395,6 +411,7 @@ void init_mips_attributes(ir_node *node, arch_irn_flags_t flags, const arch_regi
  *                                |___/
  ************************************************************************/
 
+#if 0
 // test if a tarval can be expressed in a 16bit immediate value
 static int is_tarval_16(ir_node* node)
 {
@@ -464,6 +481,7 @@ void mips_init_opcode_transforms(void) {
 	op_mips_sr->ops.transform_node  = mips_transform_sr;
 	op_mips_slt->ops.transform_node = mips_transform_slt;
 }
+#endif
 
 /***************************************************************************************
  *                  _                            _                   _