- further refactoring and finally eliminated the callback for get_out_reg_reqs
[libfirm] / ir / be / arm / arm_new_nodes.c
index cc8c9ac..4a0dd01 100644 (file)
 #include "ircons_t.h"
 #include "iropt_t.h"
 #include "irop.h"
-#include "firm_common_t.h"
 #include "irvrfy_t.h"
 #include "irprintf.h"
 #include "xmalloc.h"
 
-#include "../bearch_t.h"
+#include "../bearch.h"
 
 #include "arm_nodes_attr.h"
 #include "arm_new_nodes.h"
@@ -86,68 +85,6 @@ const char *arm_get_fpa_imm_name(long imm_value) {
  *                       |_|
  ***********************************************************************************/
 
-/**
- * Dumps the register requirements for either in or out.
- */
-static void dump_reg_req(FILE *F, const ir_node *node,
-                         const arch_register_req_t **reqs, int inout) {
-       char *dir = inout ? "out" : "in";
-       int   max = inout ? (int) arch_irn_get_n_outs(node) : get_irn_arity(node);
-       char  buf[1024];
-       int   i;
-
-       memset(buf, 0, sizeof(buf));
-
-       if (reqs) {
-               for (i = 0; i < max; i++) {
-                       fprintf(F, "%sreq #%d =", dir, i);
-
-                       if (reqs[i]->type == arch_register_req_type_none) {
-                               fprintf(F, " n/a");
-                       }
-
-                       if (reqs[i]->type & arch_register_req_type_normal) {
-                               fprintf(F, " %s", reqs[i]->cls->name);
-                       }
-
-                       if (reqs[i]->type & arch_register_req_type_limited) {
-                               fprintf(F, " %s",
-                                       arch_register_req_format(buf, sizeof(buf), reqs[i], node));
-                       }
-
-                       if (reqs[i]->type & arch_register_req_type_should_be_same) {
-                               const 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(node, i));
-                                       }
-                               }
-                       }
-
-                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
-                               const 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(node, i));
-                                       }
-                               }
-                       }
-
-                       fprintf(F, "\n");
-               }
-
-               fprintf(F, "\n");
-       } else {
-               fprintf(F, "%sreq = N/A\n", dir);
-       }
-}
-
 /**
  * Dumper interface for dumping arm nodes in vcg.
  * @param n        the node to dump
@@ -155,12 +92,10 @@ static void dump_reg_req(FILE *F, const ir_node *node,
  * @param reason   indicates which kind of information should be dumped
  * @return 0 on success or != 0 on failure
  */
-static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
+static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason)
+{
        ir_mode     *mode = NULL;
-       int         bad  = 0;
-       int         i, n_res, flags;
        arm_attr_t  *attr = get_arm_attr(n);
-       const arch_register_req_t **reqs;
        arm_shift_modifier        mod;
 
        switch (reason) {
@@ -191,51 +126,7 @@ static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                        break;
 
                case dump_node_info_txt:
-                       fprintf(F, "=== arm attr begin ===\n");
-
-                       /* dump IN requirements */
-                       if (get_irn_arity(n) > 0) {
-                               reqs = get_arm_in_req_all(n);
-                               dump_reg_req(F, n, reqs, 0);
-                       }
-
-                       n_res = arch_irn_get_n_outs(n);
-                       if (n_res > 0) {
-                               /* dump OUT requirements */
-                               reqs = get_arm_out_req_all(n);
-                               dump_reg_req(F, n, reqs, 1);
-
-                               /* dump assigned registers */
-                               for (i = 0; i < n_res; i++) {
-                                       const arch_register_t *reg = arch_irn_get_register(n, i);
-
-                                       fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
-                               }
-                               fprintf(F, "\n");
-                       }
-                       fprintf(F, "\n");
-
-                       /* dump n_res */
-                       fprintf(F, "n_res = %d\n", n_res);
-
-                       /* dump flags */
-                       fprintf(F, "flags =");
-                       flags = arch_irn_get_flags(n);
-                       if (flags == arch_irn_flags_none) {
-                               fprintf(F, " none");
-                       }
-                       else {
-                               if (flags & arch_irn_flags_dont_spill) {
-                                       fprintf(F, " unspillable");
-                               }
-                               if (flags & arch_irn_flags_rematerializable) {
-                                       fprintf(F, " remat");
-                               }
-                               if (flags & arch_irn_flags_modify_flags) {
-                                       fprintf(F, " modify_flags");
-                               }
-                       }
-                       fprintf(F, " (%d)\n", flags);
+                       arch_dump_reqs_and_registers(F, n);
 
                        if (is_arm_CopyB(n)) {
                                fprintf(F, "size = %lu\n", get_arm_imm_value(n));
@@ -251,13 +142,10 @@ static int arm_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                        if (is_arm_CmpBra(n) && get_arm_CondJmp_proj_num(n) >= 0) {
                                fprintf(F, "proj_num = (%d)\n", get_arm_CondJmp_proj_num(n));
                        }
-                       /* TODO: dump all additional attributes */
-
-                       fprintf(F, "=== arm attr end ===\n");
-                       /* end of: case dump_node_info_txt */
                        break;
        }
-       return bad;
+
+       return 0;
 }
 
 
@@ -351,14 +239,6 @@ const arch_register_req_t **get_arm_in_req_all(const ir_node *node) {
        return attr->in_req;
 }
 
-/**
- * Returns the result register requirements of an arm node.
- */
-const arch_register_req_t **get_arm_out_req_all(const ir_node *node) {
-       const arm_attr_t *attr = get_arm_attr_const(node);
-       return attr->out_req;
-}
-
 /**
  * Returns the argument register requirement at position pos of an arm node.
  */
@@ -367,30 +247,6 @@ const arch_register_req_t *get_arm_in_req(const ir_node *node, int pos) {
        return attr->in_req[pos];
 }
 
-/**
- * Returns the result register requirement at position pos of an arm node.
- */
-const arch_register_req_t *get_arm_out_req(const ir_node *node, int pos) {
-       const arm_attr_t *attr = get_arm_attr_const(node);
-       return attr->out_req[pos];
-}
-
-/**
- * Sets the OUT register requirements at position pos.
- */
-void set_arm_req_out(ir_node *node, const arch_register_req_t *req, int pos) {
-       arm_attr_t *attr   = get_arm_attr(node);
-       attr->out_req[pos] = req;
-}
-
-/**
- * Sets the complete OUT requirements of node.
- */
-void set_arm_req_out_all(ir_node *node, const arch_register_req_t **reqs) {
-       arm_attr_t *attr = get_arm_attr(node);
-       attr->out_req    = reqs;
-}
-
 /**
  * Sets the IN register requirements at position pos.
  */
@@ -506,7 +362,6 @@ arm_shift_modifier get_arm_shift_modifier(const ir_node *node) {
 /* Set the ARM machine node attributes to default values. */
 static void init_arm_attributes(ir_node *node, int 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) {
        ir_graph       *irg  = get_irn_irg(node);
@@ -517,7 +372,6 @@ static void init_arm_attributes(ir_node *node, int flags,
 
        arch_irn_set_flags(node, flags);
        attr->in_req           = in_reqs;
-       attr->out_req          = out_reqs;
        attr->instr_fl         = (ARM_COND_AL << 3) | ARM_SHF_NONE;
        attr->imm_value        = 0;