another fix for the delayed phi problem, mark memperms as spill+reload

[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 54799e2..41bf6f9 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -257,17 +257,14 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                        /* dump supported am */
                        fprintf(F, "AM support = ");
                        switch (get_ia32_am_support(n)) {
-                               case ia32_am_None:
-                                       fprintf(F, "none");
-                                       break;
-                               case ia32_am_Source:
-                                       fprintf(F, "source only (Load)");
-                                       break;
+                               case ia32_am_none:   fputs("none\n",            F); break;
+                               case ia32_am_unary:  fputs("source (unary)\n",  F); break;
+                               case ia32_am_binary: fputs("source (binary)\n", F); break;
+
                                default:
-                                       fprintf(F, "unknown (%d)", get_ia32_am_support(n));
+                                       fprintf(F, "unknown (%d)\n", get_ia32_am_support(n));
                                        break;
                        }
-                       fprintf(F, "\n");
 
                        /* dump AM offset */
                        if(get_ia32_am_offs_int(n) != 0) {
@@ -288,9 +285,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                        if (is_ia32_SwitchJmp(n)) {
                                fprintf(F, "pn_code = %ld\n", get_ia32_condcode(n));
                        } else if (is_ia32_CMov(n) || is_ia32_Set(n) || is_ia32_Jcc(n)) {
+                               ia32_attr_t *attr = get_ia32_attr(n);
                                long pnc = get_ia32_condcode(n);
                                fprintf(F, "pn_code = 0x%lX (%s)\n", pnc, get_pnc_string(pnc & pn_Cmp_True));
-                               ia32_attr_t *attr = get_ia32_attr(n);
                                fprintf(F, "ins_permuted = %u \n", attr->data.ins_permuted);
                                fprintf(F, "cmp_unsigned = %u \n", attr->data.cmp_unsigned);
                        }
@@ -298,19 +295,11 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                                fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
                        }
 
-                       /* dump n_res */
                        fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
-
-                       /* dump use_frame */
                        fprintf(F, "use_frame = %d\n", is_ia32_use_frame(n));
-
-                       /* commutative */
                        fprintf(F, "commutative = %d\n", is_ia32_commutative(n));
-
-                       /* need stackent */
                        fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
-
-                       /* dump latency */
+                       fprintf(F, "is reload = %d\n", is_ia32_is_reload(n));
                        fprintf(F, "latency = %d\n", get_ia32_latency(n));
 
                        /* dump flags */
@@ -479,15 +468,8 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
        attr->data.tp     = tp;
 }
 
-/**
- * Gets the supported address mode of an ia32 node
- */
-ia32_am_type_t get_ia32_am_support(const ir_node *node) {
-       const ia32_attr_t *attr = get_ia32_attr_const(node);
-       return attr->data.am_support;
-}
-
-ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
+ia32_am_type_t get_ia32_am_support(const ir_node *node)
+{
        const ia32_attr_t *attr = get_ia32_attr_const(node);
        return attr->data.am_arity;
 }
@@ -495,15 +477,10 @@ ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
 /**
  * Sets the supported address mode of an ia32 node
  */
-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) || (arity == ia32_am_ternary))));
+void set_ia32_am_support(ir_node *node, ia32_am_type_t arity)
+{
+       ia32_attr_t *attr   = get_ia32_attr(node);
+       attr->data.am_arity = arity;
 }
 
 /**
@@ -660,6 +637,36 @@ int is_ia32_need_stackent(const ir_node *node) {
        return attr->data.need_stackent;
 }
 
+void set_ia32_is_reload(ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       attr->data.is_reload = 1;
+}
+
+int is_ia32_is_reload(const ir_node *node) {
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+       return attr->data.is_reload;
+}
+
+void set_ia32_is_spill(ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       attr->data.is_spill = 1;
+}
+
+int is_ia32_is_spill(const ir_node *node) {
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+       return attr->data.is_spill;
+}
+
+void set_ia32_is_remat(ir_node *node) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       attr->data.is_remat = 1;
+}
+
+int is_ia32_is_remat(const ir_node *node) {
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+       return attr->data.is_remat;
+}
+
 /**
  * Gets the mode of the stored/loaded value (only set for Store/Load)
  */