shouldn't be here anymore

[libfirm] / ir / be / ia32 / ia32_new_nodes.c

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index b584178..8702288 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -96,13 +96,27 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
                        }
 
                        if (reqs[i]->type & arch_register_req_type_should_be_same) {
-                               ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->other_same[0]));
-                               if (reqs[i]->other_same[1] != -1)
-                                       ir_fprintf(F, " or %+F", get_irn_n(n, reqs[i]->other_same[1]));
+                               unsigned other = reqs[i]->other_same;
+                               int i;
+
+                               ir_fprintf(F, " same as");
+                               for (i = 0; 1U << i <= other; ++i) {
+                                       if (other & (1U << i)) {
+                                               ir_fprintf(F, " %+F", get_irn_n(n, i));
+                                       }
+                               }
                        }
 
                        if (reqs[i]->type & arch_register_req_type_should_be_different) {
-                               ir_fprintf(F, " different from %+F", get_irn_n(n, reqs[i]->other_different));
+                               unsigned other = reqs[i]->other_different;
+                               int i;
+
+                               ir_fprintf(F, " different from");
+                               for (i = 0; 1U << i <= other; ++i) {
+                                       if (other & (1U << i)) {
+                                               ir_fprintf(F, " %+F", get_irn_n(n, i));
+                                       }
+                               }
                        }
 
                        fprintf(F, "\n");
@@ -411,7 +425,6 @@ const ia32_immediate_attr_t *get_ia32_immediate_attr_const(const ir_node *node)
        const ia32_attr_t           *attr     = get_ia32_attr_const(node);
        const ia32_immediate_attr_t *imm_attr = CONST_CAST_IA32_ATTR(ia32_immediate_attr_t, attr);
 
-       assert(is_ia32_Immediate(node) || is_ia32_Const(node));
        return imm_attr;
 }
 
@@ -419,7 +432,6 @@ ia32_condcode_attr_t *get_ia32_condcode_attr(ir_node *node) {
        ia32_attr_t          *attr    = get_ia32_attr(node);
        ia32_condcode_attr_t *cc_attr = CAST_IA32_ATTR(ia32_condcode_attr_t, attr);
 
-       assert(is_ia32_SwitchJmp(node) || is_ia32_CMov(node) || is_ia32_Set(node) || is_ia32_Jcc(node));
        return cc_attr;
 }
 
@@ -427,7 +439,6 @@ const ia32_condcode_attr_t *get_ia32_condcode_attr_const(const ir_node *node) {
        const ia32_attr_t          *attr    = get_ia32_attr_const(node);
        const ia32_condcode_attr_t *cc_attr = CONST_CAST_IA32_ATTR(ia32_condcode_attr_t, attr);
 
-       assert(is_ia32_SwitchJmp(node) || is_ia32_CMov(node) || is_ia32_Set(node) || is_ia32_Jcc(node));
        return cc_attr;
 }
 
@@ -435,7 +446,6 @@ ia32_copyb_attr_t *get_ia32_copyb_attr(ir_node *node) {
        ia32_attr_t       *attr       = get_ia32_attr(node);
        ia32_copyb_attr_t *copyb_attr = CAST_IA32_ATTR(ia32_copyb_attr_t, attr);
 
-       assert(is_ia32_CopyB(node) || is_ia32_CopyB_i(node));
        return copyb_attr;
 }
 
@@ -443,7 +453,6 @@ const ia32_copyb_attr_t *get_ia32_copyb_attr_const(const ir_node *node) {
        const ia32_attr_t       *attr       = get_ia32_attr_const(node);
        const ia32_copyb_attr_t *copyb_attr = CONST_CAST_IA32_ATTR(ia32_copyb_attr_t, attr);
 
-       assert(is_ia32_CopyB(node) || is_ia32_CopyB_i(node));
        return copyb_attr;
 }
 
@@ -684,16 +693,9 @@ void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
  * Gets the instruction latency.
  */
 unsigned get_ia32_latency(const ir_node *node) {
-       const ia32_attr_t *attr = get_ia32_attr_const(node);
-       return attr->latency;
-}
-
-/**
-* Sets the instruction latency.
-*/
-void set_ia32_latency(ir_node *node, unsigned latency) {
-       ia32_attr_t *attr = get_ia32_attr(node);
-       attr->latency     = latency;
+       const ir_op *op               = get_irn_op(node);
+       const ia32_op_attr_t *op_attr = (ia32_op_attr_t*) get_op_attr(op);
+       return op_attr->latency;
 }
 
 /**
@@ -782,6 +784,11 @@ void set_ia32_flags(ir_node *node, arch_irn_flags_t flags) {
        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.
  */
@@ -993,7 +1000,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
                           const arch_register_req_t **in_reqs,
                           const arch_register_req_t **out_reqs,
                           const be_execution_unit_t ***execution_units,
-                          int n_res, unsigned latency)
+                          int n_res)
 {
        ir_graph        *irg  = get_irn_irg(node);
        struct obstack  *obst = get_irg_obstack(irg);
@@ -1002,7 +1009,6 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
        set_ia32_flags(node, flags);
        set_ia32_in_req_all(node, in_reqs);
        set_ia32_out_req_all(node, out_reqs);
-       set_ia32_latency(node, latency);
 
        attr->exec_units  = execution_units;
 #ifndef NDEBUG