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

diff --git a/ir/be/sparc/sparc_new_nodes.c b/ir/be/sparc/sparc_new_nodes.c
index a365595c5..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"
@@ -35,7 +36,6 @@
 #include "ircons_t.h"
 #include "iropt_t.h"
 #include "irop.h"
-#include "irvrfy_t.h"
 #include "irprintf.h"
 #include "xmalloc.h"
 
@@ -45,29 +45,33 @@
 #include "sparc_new_nodes.h"
 #include "gen_sparc_regalloc_if.h"
 
-static bool has_symconst_attr(const ir_node *node)
+bool sparc_has_load_store_attr(const ir_node *node)
 {
-	return is_sparc_SymConst(node) || is_sparc_FrameAddr(node);
+	return is_sparc_Ld(node) || is_sparc_St(node) || is_sparc_Ldf(node)
+	    || is_sparc_Stf(node);
 }
 
-static bool has_load_store_attr(const ir_node *node)
+static bool has_jmp_cond_attr(const ir_node *node)
 {
-	return is_sparc_Ld(node) || is_sparc_St(node);
+	return is_sparc_Bicc(node) || is_sparc_fbfcc(node);
 }
 
-static bool has_jmp_cond_attr(const ir_node *node)
+static bool has_switch_jmp_attr(const ir_node *node)
 {
-	return is_sparc_BXX(node);
+	return is_sparc_SwitchJmp(node);
 }
 
-static bool has_jmp_switch_attr(const ir_node *node)
+static bool has_fp_attr(const ir_node *node)
 {
-	return is_sparc_SwitchJmp(node);
+	return is_sparc_fadd(node) || is_sparc_fsub(node)
+	    || is_sparc_fmul(node) || is_sparc_fdiv(node)
+	    || is_sparc_fftoi(node) || is_sparc_fitof(node)
+	    || is_sparc_fneg(node) || is_sparc_fcmp(node);
 }
 
-static bool has_save_attr(const ir_node *node)
+static bool has_fp_conv_attr(const ir_node *node)
 {
-	return is_sparc_Save(node);
+	return is_sparc_fftof(node);
 }
 
 /**
@@ -78,6 +82,8 @@ static bool has_save_attr(const ir_node *node)
  */
 static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 {
+	const sparc_attr_t *attr;
+
 	switch (reason) {
 	case dump_node_opcode_txt:
 		fprintf(F, "%s", get_irn_opname(n));
@@ -88,37 +94,40 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 
 	case dump_node_info_txt:
 		arch_dump_reqs_and_registers(F, n);
-		if (has_save_attr(n)) {
-			const sparc_save_attr_t *attr = get_sparc_save_attr_const(n);
-			fprintf(F, "initial stacksize: %d\n", attr->initial_stacksize);
-		}
-		if (has_symconst_attr(n)) {
-			const sparc_symconst_attr_t *attr = get_sparc_symconst_attr_const(n);
-			ir_fprintf(F, "entity: %+F\n", attr->entity);
-			fprintf(F, "fp_offset: %d\n", attr->fp_offset);
+		attr = get_sparc_attr_const(n);
+		if (attr->immediate_value_entity) {
+			ir_fprintf(F, "entity: %+F (offset %d)\n",
+			           attr->immediate_value_entity, attr->immediate_value);
+		} else {
+			ir_fprintf(F, "immediate value: %d\n", attr->immediate_value);
 		}
-		if (has_load_store_attr(n)) {
+		if (sparc_has_load_store_attr(n)) {
 			const sparc_load_store_attr_t *attr = get_sparc_load_store_attr_const(n);
 			ir_fprintf(F, "load store mode: %+F\n", attr->load_store_mode);
-			ir_fprintf(F, "entity: (sign %d) %+F\n", attr->entity_sign,
-			           attr->entity);
-			fprintf(F, "offset: %ld\n", attr->offset);
 			fprintf(F, "is frame entity: %s\n",
 			        attr->is_frame_entity ? "true" : "false");
 		}
 		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->proj_num,
-			        get_pnc_string(attr->proj_num));
+			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_jmp_switch_attr(n)) {
-			const sparc_jmp_switch_attr_t *attr
-				= get_sparc_jmp_switch_attr_const(n);
-			fprintf(F, "n projs: %d\n", attr->n_projs);
+		if (has_switch_jmp_attr(n)) {
+			const sparc_switch_jmp_attr_t *attr
+				= get_sparc_switch_jmp_attr_const(n);
 			fprintf(F, "default proj: %ld\n", attr->default_proj_num);
 		}
+		if (has_fp_attr(n)) {
+			const sparc_fp_attr_t *attr = get_sparc_fp_attr_const(n);
+			ir_fprintf(F, "fp_mode: %+F\n", attr->fp_mode);
+		}
+		if (has_fp_conv_attr(n)) {
+			const sparc_fp_conv_attr_t *attr = get_sparc_fp_conv_attr_const(n);
+			ir_fprintf(F, "conv from: %+F\n", attr->src_mode);
+			ir_fprintf(F, "conv to: %+F\n", attr->dest_mode);
+		}
 		break;
 
 	case dump_node_nodeattr_txt:
@@ -126,46 +135,22 @@ static void sparc_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 	}
 }
 
-static void sparc_set_attr_imm(ir_node *res, int immediate_value)
+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);
-	attr->immediate_value = immediate_value;
+	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 proj_num,
+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->proj_num    = proj_num;
+	attr->relation    = relation;
 	attr->is_unsigned = is_unsigned;
 }
 
-void set_sparc_jmp_switch_n_projs(ir_node *node, int n_projs)
-{
-	sparc_jmp_switch_attr_t *attr = get_sparc_jmp_switch_attr(node);
-	attr->n_projs = n_projs;
-}
-
-void set_sparc_jmp_switch_default_proj_num(ir_node *node, long def_proj_num)
-{
-	sparc_jmp_switch_attr_t *attr = get_sparc_jmp_switch_attr(node);
-	attr->default_proj_num = def_proj_num;
-}
-
-
-
-int get_sparc_jmp_switch_n_projs(const ir_node *node)
-{
-	const sparc_jmp_switch_attr_t *attr = get_sparc_jmp_switch_attr_const(node);
-	return attr->n_projs;
-}
-
-long get_sparc_jmp_switch_default_proj_num(const ir_node *node)
-{
-	const sparc_jmp_switch_attr_t *attr = get_sparc_jmp_switch_attr_const(node);
-	return attr->default_proj_num;
-}
-
 sparc_attr_t *get_sparc_attr(ir_node *node)
 {
 	assert(is_sparc_irn(node));
@@ -180,28 +165,16 @@ const sparc_attr_t *get_sparc_attr_const(const ir_node *node)
 
 sparc_load_store_attr_t *get_sparc_load_store_attr(ir_node *node)
 {
-	assert(has_load_store_attr(node));
+	assert(sparc_has_load_store_attr(node));
 	return (sparc_load_store_attr_t*) get_irn_generic_attr_const(node);
 }
 
 const sparc_load_store_attr_t *get_sparc_load_store_attr_const(const ir_node *node)
 {
-	assert(has_load_store_attr(node));
+	assert(sparc_has_load_store_attr(node));
 	return (const sparc_load_store_attr_t*) get_irn_generic_attr_const(node);
 }
 
-sparc_symconst_attr_t *get_sparc_symconst_attr(ir_node *node)
-{
-	assert(has_symconst_attr(node));
-	return (sparc_symconst_attr_t*) get_irn_generic_attr_const(node);
-}
-
-const sparc_symconst_attr_t *get_sparc_symconst_attr_const(const ir_node *node)
-{
-	assert(has_symconst_attr(node));
-	return (const sparc_symconst_attr_t*) get_irn_generic_attr_const(node);
-}
-
 sparc_jmp_cond_attr_t *get_sparc_jmp_cond_attr(ir_node *node)
 {
 	assert(has_jmp_cond_attr(node));
@@ -214,61 +187,40 @@ const sparc_jmp_cond_attr_t *get_sparc_jmp_cond_attr_const(const ir_node *node)
 	return (const sparc_jmp_cond_attr_t*) get_irn_generic_attr_const(node);
 }
 
-sparc_jmp_switch_attr_t *get_sparc_jmp_switch_attr(ir_node *node)
-{
-	assert(has_jmp_switch_attr(node));
-	return (sparc_jmp_switch_attr_t*) get_irn_generic_attr_const(node);
-}
-
-const sparc_jmp_switch_attr_t *get_sparc_jmp_switch_attr_const(const ir_node *node)
-{
-	assert(has_jmp_switch_attr(node));
-	return (const sparc_jmp_switch_attr_t*) get_irn_generic_attr_const(node);
-}
-
-sparc_save_attr_t *get_sparc_save_attr(ir_node *node)
+sparc_switch_jmp_attr_t *get_sparc_switch_jmp_attr(ir_node *node)
 {
-	assert(has_save_attr(node));
-	return (sparc_save_attr_t*) get_irn_generic_attr_const(node);
+	assert(has_switch_jmp_attr(node));
+	return (sparc_switch_jmp_attr_t*) get_irn_generic_attr_const(node);
 }
 
-const sparc_save_attr_t *get_sparc_save_attr_const(const ir_node *node)
+const sparc_switch_jmp_attr_t *get_sparc_switch_jmp_attr_const(const ir_node *node)
 {
-	assert(has_save_attr(node));
-	return (const sparc_save_attr_t*) get_irn_generic_attr_const(node);
+	assert(has_switch_jmp_attr(node));
+	return (const sparc_switch_jmp_attr_t*) get_irn_generic_attr_const(node);
 }
 
-/**
- * Returns the argument register requirements of a sparc node.
- */
-const arch_register_req_t **get_sparc_in_req_all(const ir_node *node)
+sparc_fp_attr_t *get_sparc_fp_attr(ir_node *node)
 {
-	const sparc_attr_t *attr = get_sparc_attr_const(node);
-	return attr->in_req;
+	assert(has_fp_attr(node));
+	return (sparc_fp_attr_t*) get_irn_generic_attr(node);
 }
 
-void set_sparc_in_req_all(ir_node *node, const arch_register_req_t **reqs)
+const sparc_fp_attr_t *get_sparc_fp_attr_const(const ir_node *node)
 {
-	sparc_attr_t *attr = get_sparc_attr(node);
-	attr->in_req = reqs;
+	assert(has_fp_attr(node));
+	return (const sparc_fp_attr_t*) get_irn_generic_attr_const(node);
 }
 
-/**
- * Returns the argument register requirement at position pos of an sparc node.
- */
-const arch_register_req_t *get_sparc_in_req(const ir_node *node, int pos)
+sparc_fp_conv_attr_t *get_sparc_fp_conv_attr(ir_node *node)
 {
-	const sparc_attr_t *attr = get_sparc_attr_const(node);
-	return attr->in_req[pos];
+	assert(has_fp_conv_attr(node));
+	return (sparc_fp_conv_attr_t*) get_irn_generic_attr(node);
 }
 
-/**
- * Sets the IN register requirements at position pos.
- */
-void set_sparc_req_in(ir_node *node, const arch_register_req_t *req, int pos)
+const sparc_fp_conv_attr_t *get_sparc_fp_conv_attr_const(const ir_node *node)
 {
-	sparc_attr_t *attr  = get_sparc_attr(node);
-	attr->in_req[pos] = req;
+	assert(has_fp_conv_attr(node));
+	return (const sparc_fp_conv_attr_t*) get_irn_generic_attr_const(node);
 }
 
 /**
@@ -281,45 +233,50 @@ static void init_sparc_attributes(ir_node *node, arch_irn_flags_t flags,
 {
 	ir_graph        *irg  = get_irn_irg(node);
 	struct obstack  *obst = get_irg_obstack(irg);
-	sparc_attr_t *attr = get_sparc_attr(node);
 	backend_info_t  *info;
 	(void) execution_units;
 
 	arch_irn_set_flags(node, flags);
-	attr->in_req  = in_reqs;
-	attr->is_load_store = false;
+	arch_set_in_register_reqs(node, in_reqs);
 
 	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]));
 }
 
-/* CUSTOM ATTRIBUTE INIT FUNCTIONS */
 static void init_sparc_load_store_attributes(ir_node *res, ir_mode *ls_mode,
-											ir_entity *entity,
-											int entity_sign, long offset,
-											bool is_frame_entity)
+											ir_entity *entity, int32_t offset,
+											bool is_frame_entity,
+											bool is_reg_reg)
+{
+	sparc_load_store_attr_t *attr     = get_sparc_load_store_attr(res);
+	attr->base.immediate_value_entity = entity;
+	attr->base.immediate_value        = offset;
+	attr->load_store_mode             = ls_mode;
+	attr->is_frame_entity             = is_frame_entity;
+	attr->is_reg_reg                  = is_reg_reg;
+}
+
+static void init_sparc_fp_attributes(ir_node *res, ir_mode *fp_mode)
 {
-	sparc_load_store_attr_t *attr = get_sparc_load_store_attr(res);
-	attr->load_store_mode    = ls_mode;
-	attr->entity             = entity;
-	attr->entity_sign        = entity_sign;
-	attr->is_frame_entity    = is_frame_entity;
-	attr->offset             = offset;
-	attr->base.is_load_store = true;
+	sparc_fp_attr_t *attr = get_sparc_fp_attr(res);
+	attr->fp_mode = fp_mode;
 }
 
-static void init_sparc_symconst_attributes(ir_node *res, ir_entity *entity)
+static void init_sparc_fp_conv_attributes(ir_node *res, ir_mode *src_mode,
+                                          ir_mode *dest_mode)
 {
-	sparc_symconst_attr_t *attr = get_sparc_symconst_attr(res);
-	attr->entity    = entity;
-	attr->fp_offset = 0;
+	sparc_fp_conv_attr_t *attr = get_sparc_fp_conv_attr(res);
+	attr->src_mode = src_mode;
+	attr->dest_mode = dest_mode;
 }
 
-static void init_sparc_save_attr(ir_node *res, int initial_stacksize)
+static void init_sparc_switch_jmp_attributes(ir_node *res, long default_pn,
+                                             ir_entity *jump_table)
 {
-	sparc_save_attr_t *attr = get_sparc_save_attr(res);
-	attr->initial_stacksize = initial_stacksize;
+	sparc_switch_jmp_attr_t *attr = get_sparc_switch_jmp_attr(res);
+	attr->default_proj_num = default_pn;
+	attr->jump_table       = jump_table;
 }
 
 /**
@@ -337,84 +294,80 @@ 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;
 }
 
 /**
  * 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);
 
 	return attr_a->immediate_value != attr_b->immediate_value
-			|| attr_a->is_load_store != attr_b->is_load_store;
+		|| attr_a->immediate_value_entity != attr_b->immediate_value_entity;
 }
 
-
-/* CUSTOM ATTRIBUTE CMP FUNCTIONS */
-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);
 
 	if (cmp_attr_sparc(a, b))
-			return 1;
+		return 1;
 
-	return attr_a->entity != attr_b->entity
-			|| attr_a->entity_sign != attr_b->entity_sign
-			|| attr_a->is_frame_entity != attr_b->is_frame_entity
-			|| attr_a->load_store_mode != attr_b->load_store_mode
-			|| attr_a->offset != attr_b->offset;
+	return attr_a->is_frame_entity != attr_b->is_frame_entity
+			|| attr_a->load_store_mode != attr_b->load_store_mode;
 }
 
-static int cmp_attr_sparc_symconst(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_jmp_cond(const ir_node *a, const ir_node *b)
 {
-	const sparc_symconst_attr_t *attr_a = get_sparc_symconst_attr_const(a);
-	const sparc_symconst_attr_t *attr_b = get_sparc_symconst_attr_const(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);
 
 	if (cmp_attr_sparc(a, b))
-			return 1;
+		return 1;
 
-	return attr_a->entity != attr_b->entity
-			|| attr_a->fp_offset != attr_b->fp_offset;
+	return attr_a->relation != attr_b->relation
+	    || attr_a->is_unsigned != attr_b->is_unsigned;
 }
 
-static int cmp_attr_sparc_jmp_cond(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_switch_jmp(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);
+	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);
 
 	if (cmp_attr_sparc(a, b))
-			return 1;
+		return 1;
 
-	return attr_a->proj_num != attr_b->proj_num
-		|| attr_a->is_unsigned != attr_b->is_unsigned;
+	return attr_a->default_proj_num != attr_b->default_proj_num;
 }
 
-static int cmp_attr_sparc_jmp_switch(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_fp(const ir_node *a, const ir_node *b)
 {
-	const sparc_jmp_switch_attr_t *attr_a = get_sparc_jmp_switch_attr_const(a);
-	const sparc_jmp_switch_attr_t *attr_b = get_sparc_jmp_switch_attr_const(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);
 
 	if (cmp_attr_sparc(a, b))
-			return 1;
+		return 1;
 
-	return attr_a->default_proj_num != attr_b->default_proj_num
-			|| attr_a->n_projs != attr_b->n_projs;
+	return attr_a->fp_mode != attr_b->fp_mode;
 }
 
-static int cmp_attr_sparc_save(ir_node *a, ir_node *b)
+static int cmp_attr_sparc_fp_conv(const ir_node *a, const ir_node *b)
 {
-	const sparc_save_attr_t *attr_a = get_sparc_save_attr_const(a);
-	const sparc_save_attr_t *attr_b = get_sparc_save_attr_const(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);
 
 	if (cmp_attr_sparc(a, b))
-			return 1;
+		return 1;
 
-	return attr_a->initial_stacksize != attr_b->initial_stacksize;
+	return attr_a->src_mode != attr_b->src_mode
+	    || attr_a->dest_mode != attr_b->dest_mode;;
 }
 
 /* Include the generated constructor functions */