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 cb23eac..6f31323 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -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:
@@ -1304,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;