X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_new_nodes.c;h=e114de2613ab13176c6bfec1299fce85bc5070d4;hb=8737c443a02baf4aab54adb8cace71c59bdb7345;hp=bee435f268237b472c307789bb0f909f7651262f;hpb=f7e854b67832df74cfd24c42c81b7f45f2d29df3;p=libfirm

diff --git a/ir/be/sparc/sparc_new_nodes.c b/ir/be/sparc/sparc_new_nodes.c
index bee435f26..e114de261 100644
--- a/ir/be/sparc/sparc_new_nodes.c
+++ b/ir/be/sparc/sparc_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.
  *
@@ -22,6 +22,7 @@
  * @brief   This file implements the creation of the achitecture specific firm
  *          opcodes and the coresponding node constructors for the sparc
  *          assembler irg.
+ * @author  Hannes Rapp, Matthias Braun
  * @version $Id$
  */
 #include "config.h"
@@ -109,7 +110,8 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 		if (has_jmp_cond_attr(n)) {
 			const sparc_jmp_cond_attr_t *attr
 				= get_sparc_jmp_cond_attr_const(n);
-			fprintf(F, "pnc: %d (%s)\n", attr->pnc, get_pnc_string(attr->pnc));
+			fprintf(F, "relation: %d (%s)\n", attr->relation,
+			        get_relation_string(attr->relation));
 			fprintf(F, "unsigned: %s\n", attr->is_unsigned ? "true" : "false");
 		}
 		if (has_switch_jmp_attr(n)) {
@@ -136,15 +138,16 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 static void sparc_set_attr_imm(ir_node *res, ir_entity *entity,
                                int32_t immediate_value)
 {
-	sparc_attr_t *attr           = get_irn_generic_attr(res);
+	sparc_attr_t *attr           = (sparc_attr_t*)get_irn_generic_attr(res);
 	attr->immediate_value_entity = entity;
 	attr->immediate_value        = immediate_value;
 }
 
-static void init_sparc_jmp_cond_attr(ir_node *node, int pnc, bool is_unsigned)
+static void init_sparc_jmp_cond_attr(ir_node *node, ir_relation relation,
+                                     bool is_unsigned)
 {
 	sparc_jmp_cond_attr_t *attr = get_sparc_jmp_cond_attr(node);
-	attr->pnc         = pnc;
+	attr->relation    = relation;
 	attr->is_unsigned = is_unsigned;
 }
 
@@ -291,6 +294,7 @@ static void sparc_copy_attr(ir_graph *irg, const ir_node *old_node,
 	/* copy the attributes */
 	memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node)));
 	/* copy out flags */
+	new_info->flags = old_info->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;
@@ -299,7 +303,7 @@ static void sparc_copy_attr(ir_graph *irg, const ir_node *old_node,
 /**
  * compare some node's attributes
  */
-static int cmp_attr_sparc(ir_node *a, ir_node *b)
+static int cmp_attr_sparc(const ir_node *a, const ir_node *b)
 {
 	const sparc_attr_t *attr_a = get_sparc_attr_const(a);
 	const sparc_attr_t *attr_b = get_sparc_attr_const(b);
@@ -308,7 +312,7 @@ static int cmp_attr_sparc(ir_node *a, ir_node *b)
 		|| attr_a->immediate_value_entity != attr_b->immediate_value_entity;
 }
 
-static int cmp_attr_sparc_load_store(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_load_store(const ir_node *a, const ir_node *b)
 {
 	const sparc_load_store_attr_t *attr_a = get_sparc_load_store_attr_const(a);
 	const sparc_load_store_attr_t *attr_b = get_sparc_load_store_attr_const(b);
@@ -320,7 +324,7 @@ static int cmp_attr_sparc_load_store(ir_node *a, ir_node *b)
 			|| attr_a->load_store_mode != attr_b->load_store_mode;
 }
 
-static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_jmp_cond(const ir_node *a, const ir_node *b)
 {
 	const sparc_jmp_cond_attr_t *attr_a = get_sparc_jmp_cond_attr_const(a);
 	const sparc_jmp_cond_attr_t *attr_b = get_sparc_jmp_cond_attr_const(b);
@@ -328,11 +332,11 @@ static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b)
 	if (cmp_attr_sparc(a, b))
 		return 1;
 
-	return attr_a->pnc != attr_b->pnc
+	return attr_a->relation != attr_b->relation
 	    || attr_a->is_unsigned != attr_b->is_unsigned;
 }
 
-static int cmp_attr_sparc_switch_jmp(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_switch_jmp(const ir_node *a, const ir_node *b)
 {
 	const sparc_switch_jmp_attr_t *attr_a = get_sparc_switch_jmp_attr_const(a);
 	const sparc_switch_jmp_attr_t *attr_b = get_sparc_switch_jmp_attr_const(b);
@@ -343,7 +347,7 @@ static int cmp_attr_sparc_switch_jmp(ir_node *a, ir_node *b)
 	return attr_a->default_proj_num != attr_b->default_proj_num;
 }
 
-static int cmp_attr_sparc_fp(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_fp(const ir_node *a, const ir_node *b)
 {
 	const sparc_fp_attr_t *attr_a = get_sparc_fp_attr_const(a);
 	const sparc_fp_attr_t *attr_b = get_sparc_fp_attr_const(b);
@@ -354,7 +358,7 @@ static int cmp_attr_sparc_fp(ir_node *a, ir_node *b)
 	return attr_a->fp_mode != attr_b->fp_mode;
 }
 
-static int cmp_attr_sparc_fp_conv(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_fp_conv(const ir_node *a, const ir_node *b)
 {
 	const sparc_fp_conv_attr_t *attr_a = get_sparc_fp_conv_attr_const(a);
 	const sparc_fp_conv_attr_t *attr_b = get_sparc_fp_conv_attr_const(b);