X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_new_nodes.c;h=0c8f546a29ae46c91462834c6250477a23e258e2;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=bf8d987cfb60adcc51d24a8e816035ec6335a3c4;hpb=9d3c8631459f431c313160dab5778e8a7b88dd92;p=libfirm

diff --git a/ir/be/arm/arm_new_nodes.c b/ir/be/arm/arm_new_nodes.c
index bf8d987cf..0c8f546a2 100644
--- a/ir/be/arm/arm_new_nodes.c
+++ b/ir/be/arm/arm_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.
  *
@@ -23,7 +23,6 @@
  *         opcodes and the corresponding node constructors for the arm
  *         assembler irg.
  * @author Oliver Richter, Tobias Gneist
- * @version $Id$
  */
 #include "config.h"
 
@@ -40,30 +39,15 @@
 #include "irprintf.h"
 #include "xmalloc.h"
 
-#include "../bearch.h"
+#include "bearch.h"
 
 #include "arm_nodes_attr.h"
 #include "arm_new_nodes.h"
 #include "arm_optimize.h"
 
-#include "../beabi.h"
+#include "beabi.h"
 #include "bearch_arm_t.h"
 
-const char *arm_get_fpa_imm_name(long imm_value)
-{
-	static const char *fpa_imm[] = {
-		"0",
-		"1",
-		"2",
-		"3",
-		"4",
-		"5",
-		"10",
-		"0.5"
-	};
-	return fpa_imm[imm_value];
-}
-
 static bool arm_has_symconst_attr(const ir_node *node)
 {
 	return is_arm_SymConst(node) || is_arm_FrameAddr(node) || is_arm_Bl(node);
@@ -100,7 +84,7 @@ static bool has_farith_attr(const ir_node *node)
  * @param n        the node to dump
  * @param reason   indicates which kind of information should be dumped
  */
-static void arm_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
+static void arm_dump_node(FILE *F, const ir_node *n, dump_reason_t reason)
 {
 	switch (reason) {
 	case dump_node_opcode_txt:
@@ -214,13 +198,13 @@ static void arm_dump_node(FILE *F, ir_node *n, dump_reason_t reason)
 arm_attr_t *get_arm_attr(ir_node *node)
 {
 	assert(is_arm_irn(node) && "need arm node to get attributes");
-	return get_irn_generic_attr(node);
+	return (arm_attr_t*)get_irn_generic_attr(node);
 }
 
 const arm_attr_t *get_arm_attr_const(const ir_node *node)
 {
 	assert(is_arm_irn(node) && "need arm node to get attributes");
-	return get_irn_generic_attr_const(node);
+	return (const arm_attr_t*)get_irn_generic_attr_const(node);
 }
 
 static bool has_symconst_attr(const ir_node *node)
@@ -231,61 +215,73 @@ static bool has_symconst_attr(const ir_node *node)
 arm_SymConst_attr_t *get_arm_SymConst_attr(ir_node *node)
 {
 	assert(has_symconst_attr(node));
-	return get_irn_generic_attr(node);
+	return (arm_SymConst_attr_t*)get_irn_generic_attr(node);
 }
 
 const arm_SymConst_attr_t *get_arm_SymConst_attr_const(const ir_node *node)
 {
 	assert(has_symconst_attr(node));
-	return get_irn_generic_attr_const(node);
+	return (const arm_SymConst_attr_t*)get_irn_generic_attr_const(node);
 }
 
 static const arm_fConst_attr_t *get_arm_fConst_attr_const(const ir_node *node)
 {
 	assert(is_arm_fConst(node));
-	return get_irn_generic_attr_const(node);
+	return (const arm_fConst_attr_t*)get_irn_generic_attr_const(node);
 }
 
 static arm_fConst_attr_t *get_arm_fConst_attr(ir_node *node)
 {
 	assert(is_arm_fConst(node));
-	return get_irn_generic_attr(node);
+	return (arm_fConst_attr_t*)get_irn_generic_attr(node);
 }
 
 arm_farith_attr_t *get_arm_farith_attr(ir_node *node)
 {
 	assert(has_farith_attr(node));
-	return get_irn_generic_attr(node);
+	return (arm_farith_attr_t*)get_irn_generic_attr(node);
 }
 
 const arm_farith_attr_t *get_arm_farith_attr_const(const ir_node *node)
 {
 	assert(has_farith_attr(node));
-	return get_irn_generic_attr_const(node);
+	return (const arm_farith_attr_t*)get_irn_generic_attr_const(node);
 }
 
 arm_CondJmp_attr_t *get_arm_CondJmp_attr(ir_node *node)
 {
 	assert(is_arm_B(node));
-	return get_irn_generic_attr(node);
+	return (arm_CondJmp_attr_t*)get_irn_generic_attr(node);
 }
 
 const arm_CondJmp_attr_t *get_arm_CondJmp_attr_const(const ir_node *node)
 {
 	assert(is_arm_B(node));
-	return get_irn_generic_attr_const(node);
+	return (const arm_CondJmp_attr_t*)get_irn_generic_attr_const(node);
 }
 
 arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr(ir_node *node)
 {
 	assert(is_arm_SwitchJmp(node));
-	return get_irn_generic_attr(node);
+	return (arm_SwitchJmp_attr_t*)get_irn_generic_attr(node);
 }
 
 const arm_SwitchJmp_attr_t *get_arm_SwitchJmp_attr_const(const ir_node *node)
 {
 	assert(is_arm_SwitchJmp(node));
-	return get_irn_generic_attr_const(node);
+	return (const arm_SwitchJmp_attr_t*)get_irn_generic_attr_const(node);
+}
+
+arm_CopyB_attr_t *get_arm_CopyB_attr(ir_node *node)
+{
+	assert(is_arm_CopyB(node));
+	return (arm_CopyB_attr_t*)get_irn_generic_attr(node);
+}
+
+const arm_CopyB_attr_t *get_arm_CopyB_attr_const(const ir_node *node)
+{
+	assert(is_arm_CopyB(node));
+	return (const arm_CopyB_attr_t*)get_irn_generic_attr_const(node);
 }
 
 ir_tarval *get_fConst_value(const ir_node *node)
@@ -300,56 +296,30 @@ void set_fConst_value(ir_node *node, ir_tarval *tv)
 	attr->tv = tv;
 }
 
-pn_Cmp get_arm_CondJmp_pnc(const ir_node *node)
+ir_relation get_arm_CondJmp_relation(const ir_node *node)
 {
 	const arm_CondJmp_attr_t *attr = get_arm_CondJmp_attr_const(node);
-	return attr->pnc;
+	return attr->relation;
 }
 
-void set_arm_CondJmp_pnc(ir_node *node, pn_Cmp pnc)
+void set_arm_CondJmp_relation(ir_node *node, ir_relation relation)
 {
 	arm_CondJmp_attr_t *attr = get_arm_CondJmp_attr(node);
-	attr->pnc = pnc;
-}
-
-int get_arm_SwitchJmp_n_projs(const ir_node *node)
-{
-	const arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr_const(node);
-	return attr->n_projs;
-}
-
-void set_arm_SwitchJmp_n_projs(ir_node *node, int n_projs)
-{
-	arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr(node);
-	attr->n_projs = n_projs;
-}
-
-long get_arm_SwitchJmp_default_proj_num(const ir_node *node)
-{
-	const arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr_const(node);
-	return attr->default_proj_num;
-}
-
-void set_arm_SwitchJmp_default_proj_num(ir_node *node, long default_proj_num)
-{
-	arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr(node);
-	attr->default_proj_num = default_proj_num;
+	attr->relation = relation;
 }
 
 /* Set the ARM machine node attributes to default values. */
-static void init_arm_attributes(ir_node *node, int flags,
+static void init_arm_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)
 {
 	ir_graph       *irg  = get_irn_irg(node);
 	struct obstack *obst = get_irg_obstack(irg);
 	arm_attr_t     *attr = get_arm_attr(node);
 	backend_info_t *info;
-	(void) execution_units;
 
-	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->is_load_store    = false;
 
 	info            = be_get_info(node);
@@ -362,7 +332,7 @@ static void init_arm_load_store_attributes(ir_node *res, ir_mode *ls_mode,
                                            int entity_sign, long offset,
                                            bool is_frame_entity)
 {
-	arm_load_store_attr_t *attr = get_irn_generic_attr(res);
+	arm_load_store_attr_t *attr = get_arm_load_store_attr(res);
 	attr->load_store_mode    = ls_mode;
 	attr->entity             = entity;
 	attr->entity_sign        = entity_sign;
@@ -375,7 +345,7 @@ static void init_arm_shifter_operand(ir_node *res, unsigned immediate_value,
                                      arm_shift_modifier_t shift_modifier,
                                      unsigned shift_immediate)
 {
-	arm_shifter_operand_t *attr = get_irn_generic_attr(res);
+	arm_shifter_operand_t *attr = get_arm_shifter_operand_attr(res);
 	attr->immediate_value = immediate_value;
 	attr->shift_modifier  = shift_modifier;
 	attr->shift_immediate = shift_immediate;
@@ -383,7 +353,7 @@ static void init_arm_shifter_operand(ir_node *res, unsigned immediate_value,
 
 static void init_arm_cmp_attr(ir_node *res, bool ins_permuted, bool is_unsigned)
 {
-	arm_cmp_attr_t *attr = get_irn_generic_attr(res);
+	arm_cmp_attr_t *attr = get_arm_cmp_attr(res);
 	attr->ins_permuted = ins_permuted;
 	attr->is_unsigned  = is_unsigned;
 }
@@ -391,31 +361,45 @@ static void init_arm_cmp_attr(ir_node *res, bool ins_permuted, bool is_unsigned)
 static void init_arm_SymConst_attributes(ir_node *res, ir_entity *entity,
                                          int symconst_offset)
 {
-	arm_SymConst_attr_t *attr = get_irn_generic_attr(res);
+	arm_SymConst_attr_t *attr = get_arm_SymConst_attr(res);
 	attr->entity    = entity;
 	attr->fp_offset = symconst_offset;
 }
 
 static void init_arm_farith_attributes(ir_node *res, ir_mode *mode)
 {
-	arm_farith_attr_t *attr = get_irn_generic_attr(res);
+	arm_farith_attr_t *attr = get_arm_farith_attr(res);
 	attr->mode = mode;
 }
 
 static void init_arm_CopyB_attributes(ir_node *res, unsigned size)
 {
-	arm_CopyB_attr_t *attr = get_irn_generic_attr(res);
+	arm_CopyB_attr_t *attr = get_arm_CopyB_attr(res);
 	attr->size = size;
 }
 
-static int cmp_attr_arm(ir_node *a, ir_node *b)
+static void init_arm_SwitchJmp_attributes(ir_node *res,
+                                          const ir_switch_table *table)
+{
+	unsigned n_outs = arch_get_irn_n_outs(res);
+	unsigned o;
+
+	arm_SwitchJmp_attr_t *attr = get_arm_SwitchJmp_attr(res);
+	attr->table = table;
+
+	for (o = 0; o < n_outs; ++o) {
+		arch_set_irn_register_req_out(res, o, arch_no_register_req);
+	}
+}
+
+static int cmp_attr_arm(const ir_node *a, const ir_node *b)
 {
 	(void) a;
 	(void) b;
 	return 0;
 }
 
-static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b)
+static int cmp_attr_arm_SymConst(const ir_node *a, const ir_node *b)
 {
 	const arm_SymConst_attr_t *attr_a;
 	const arm_SymConst_attr_t *attr_b;
@@ -423,13 +407,13 @@ static int cmp_attr_arm_SymConst(ir_node *a, ir_node *b)
 	if (cmp_attr_arm(a, b))
 		return 1;
 
-	attr_a = get_irn_generic_attr_const(a);
-	attr_b = get_irn_generic_attr_const(b);
+	attr_a = get_arm_SymConst_attr_const(a);
+	attr_b = get_arm_SymConst_attr_const(b);
 	return attr_a->entity != attr_b->entity
 		|| attr_a->fp_offset != attr_b->fp_offset;
 }
 
-static int cmp_attr_arm_CopyB(ir_node *a, ir_node *b)
+static int cmp_attr_arm_CopyB(const ir_node *a, const ir_node *b)
 {
 	const arm_CopyB_attr_t *attr_a;
 	const arm_CopyB_attr_t *attr_b;
@@ -437,12 +421,12 @@ static int cmp_attr_arm_CopyB(ir_node *a, ir_node *b)
 	if (cmp_attr_arm(a, b))
 		return 1;
 
-	attr_a = get_irn_generic_attr_const(a);
-	attr_b = get_irn_generic_attr_const(b);
+	attr_a = get_arm_CopyB_attr_const(a);
+	attr_b = get_arm_CopyB_attr_const(b);
 	return attr_a->size != attr_b->size;
 }
 
-static int cmp_attr_arm_CondJmp(ir_node *a, ir_node *b)
+static int cmp_attr_arm_CondJmp(const ir_node *a, const ir_node *b)
 {
 	(void) a;
 	(void) b;
@@ -450,7 +434,7 @@ static int cmp_attr_arm_CondJmp(ir_node *a, ir_node *b)
 	return 1;
 }
 
-static int cmp_attr_arm_SwitchJmp(ir_node *a, ir_node *b)
+static int cmp_attr_arm_SwitchJmp(const ir_node *a, const ir_node *b)
 {
 	(void) a;
 	(void) b;
@@ -458,7 +442,7 @@ static int cmp_attr_arm_SwitchJmp(ir_node *a, ir_node *b)
 	return 1;
 }
 
-static int cmp_attr_arm_fConst(ir_node *a, ir_node *b)
+static int cmp_attr_arm_fConst(const ir_node *a, const ir_node *b)
 {
 	const arm_fConst_attr_t *attr_a;
 	const arm_fConst_attr_t *attr_b;
@@ -504,7 +488,7 @@ const arm_cmp_attr_t *get_arm_cmp_attr_const(const ir_node *node)
 	return (const arm_cmp_attr_t*) get_irn_generic_attr_const(node);
 }
 
-static int cmp_attr_arm_load_store(ir_node *a, ir_node *b)
+static int cmp_attr_arm_load_store(const ir_node *a, const ir_node *b)
 {
 	const arm_load_store_attr_t *attr_a;
 	const arm_load_store_attr_t *attr_b;
@@ -512,8 +496,8 @@ static int cmp_attr_arm_load_store(ir_node *a, ir_node *b)
 	if (cmp_attr_arm(a, b))
 		return 1;
 
-	attr_a = get_arm_load_store_attr(a);
-	attr_b = get_arm_load_store_attr(b);
+	attr_a = get_arm_load_store_attr_const(a);
+	attr_b = get_arm_load_store_attr_const(b);
 	if (attr_a->entity != attr_b->entity
 			|| attr_a->entity_sign != attr_b->entity_sign
 			|| attr_a->offset != attr_b->offset)
@@ -522,7 +506,7 @@ static int cmp_attr_arm_load_store(ir_node *a, ir_node *b)
 	return 0;
 }
 
-static int cmp_attr_arm_shifter_operand(ir_node *a, ir_node *b)
+static int cmp_attr_arm_shifter_operand(const ir_node *a, const ir_node *b)
 {
 	const arm_shifter_operand_t *attr_a;
 	const arm_shifter_operand_t *attr_b;
@@ -530,8 +514,8 @@ static int cmp_attr_arm_shifter_operand(ir_node *a, ir_node *b)
 	if (cmp_attr_arm(a, b))
 		return 1;
 
-	attr_a = get_arm_shifter_operand_attr(a);
-	attr_b = get_arm_shifter_operand_attr(b);
+	attr_a = get_arm_shifter_operand_attr_const(a);
+	attr_b = get_arm_shifter_operand_attr_const(b);
 	if (attr_a->shift_modifier != attr_b->shift_modifier
 			|| attr_a->immediate_value != attr_b->immediate_value
 			|| attr_a->shift_immediate != attr_b->shift_immediate)
@@ -540,7 +524,7 @@ static int cmp_attr_arm_shifter_operand(ir_node *a, ir_node *b)
 	return 0;
 }
 
-static int cmp_attr_arm_cmp(ir_node *a, ir_node *b)
+static int cmp_attr_arm_cmp(const ir_node *a, const ir_node *b)
 {
 	const arm_cmp_attr_t *attr_a;
 	const arm_cmp_attr_t *attr_b;
@@ -548,15 +532,15 @@ static int cmp_attr_arm_cmp(ir_node *a, ir_node *b)
 	if (cmp_attr_arm(a, b))
 		return 1;
 
-	attr_a = get_irn_generic_attr_const(a);
-	attr_b = get_irn_generic_attr_const(b);
+	attr_a = get_arm_cmp_attr_const(a);
+	attr_b = get_arm_cmp_attr_const(b);
 	if (attr_a->ins_permuted != attr_b->ins_permuted
 			|| attr_a->is_unsigned != attr_b->is_unsigned)
 		return 1;
 	return 0;
 }
 
-static int cmp_attr_arm_farith(ir_node *a, ir_node *b)
+static int cmp_attr_arm_farith(const ir_node *a, const ir_node *b)
 {
 	const arm_farith_attr_t *attr_a;
 	const arm_farith_attr_t *attr_b;
@@ -583,6 +567,7 @@ static void arm_copy_attr(ir_graph *irg, const ir_node *old_node,
 	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;