fix sse/x87 fixup code added at wrong places

[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 fe15be5..6f31323 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -149,7 +149,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                                        }
                                        fputs(get_entity_name(attr->symconst), F);
                                }
-                               if(attr->offset != 0) {
+                               if(attr->offset != 0 || attr->symconst == NULL) {
                                        if(attr->offset > 0 && attr->symconst != NULL) {
                                                fputc('+', F);
                                        }
@@ -157,6 +157,28 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                                }
                        }
 
+                       {
+                               const ia32_attr_t *attr = get_ia32_attr_const(n);
+
+                               if(attr->am_sc != NULL || attr->am_offs != 0)
+                                       fputs(" [", F);
+
+                               if(attr->am_sc != NULL) {
+                                       if(attr->data.am_sc_sign) {
+                                               fputc('-', F);
+                                       }
+                                       fputs(get_entity_name(attr->am_sc), F);
+                               }
+                               if(attr->am_offs != 0) {
+                                       if(attr->am_offs > 0 && attr->am_sc != NULL) {
+                                               fputc('+', F);
+                                       }
+                                       fprintf(F, "%d", attr->am_offs);
+                               }
+
+                               if(attr->am_sc != NULL || attr->am_offs != 0)
+                                       fputc(']', F);
+                       }
                        break;
 
                case dump_node_nodeattr_txt:
@@ -488,12 +510,23 @@ ia32_am_type_t get_ia32_am_support(const ir_node *node) {
        return attr->data.am_support;
 }
 
+ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+       return attr->data.am_arity;
+}
+
 /**
  * Sets the supported address mode of an ia32 node
  */
-void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) {
+void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp,
+                         ia32_am_arity_t arity) {
        ia32_attr_t *attr     = get_ia32_attr(node);
        attr->data.am_support = am_tp;
+       attr->data.am_arity   = arity;
+
+       assert((am_tp == ia32_am_None && arity == ia32_am_arity_none) ||
+              (am_tp != ia32_am_None &&
+              ((arity == ia32_am_unary) || (arity == ia32_am_binary))));
 }
 
 /**
@@ -1163,6 +1196,16 @@ int get_ia32_out_regnr(const ir_node *node, int pos) {
        return arch_register_get_index(attr->slots[pos]);
 }
 
+void ia32_swap_left_right(ir_node *node)
+{
+       ir_node *left  = get_irn_n(node, 2);
+       ir_node *right = get_irn_n(node, 3);
+       assert(is_ia32_commutative(node));
+       set_irn_n(node, 2, right);
+       set_irn_n(node, 3, left);
+       set_ia32_pncode(node, get_inversed_pnc(get_ia32_pncode(node)));
+}
+
 /**
  * Returns the OUT register at position pos.
  */
@@ -1212,6 +1255,7 @@ init_ia32_x87_attributes(ir_node *res)
        ia32_attr_t *attr  = get_ia32_attr(res);
        attr->attr_type   |= IA32_ATTR_ia32_x87_attr_t;
 #endif
+       ia32_current_cg->do_x87_sim = 1;
 }
 
 void
@@ -1229,7 +1273,7 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 {
        ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
 
-#ifndef DEBUG
+#ifndef NDEBUG
        attr->attr.attr_type   |= IA32_ATTR_ia32_immediate_attr_t;
 #endif
        attr->symconst             = symconst;
@@ -1282,8 +1326,14 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
            || a->ls_mode != b->ls_mode)
                return 1;
 
+       /* nodes with not yet assigned entities shouldn't be CSEd (important for
+        * unsigned int -> double conversions */
+       if(a->data.use_frame && a->frame_ent == NULL)
+               return 1;
+       if(b->data.use_frame && b->frame_ent == NULL)
+               return 1;
+
        if (a->data.use_frame != b->data.use_frame
-           || a->data.use_frame != b->data.use_frame
            || a->frame_ent != b->frame_ent)
                return 1;
 
@@ -1368,16 +1418,3 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"
-
-/**
- * Registers the ia32_copy_attr function for all ia32 opcodes.
- */
-void ia32_register_copy_attr_func(void) {
-       int i;
-
-       for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
-               ir_op *op = get_irp_opcode(i);
-               if (is_ia32_op(op))
-                       op->ops.copy_attr = ia32_copy_attr;
-       }
-}