Rename arch_register_req_type_should_be_different to the more appropriate arch_regist...

[r21302]

diff --git a/ir/be/TEMPLATE/TEMPLATE_new_nodes.c b/ir/be/TEMPLATE/TEMPLATE_new_nodes.c
index de84c77..12778e9 100644 (file)
--- a/ir/be/TEMPLATE/TEMPLATE_new_nodes.c
+++ b/ir/be/TEMPLATE/TEMPLATE_new_nodes.c
@@ -102,7 +102,7 @@ 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_different) {
+                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
                                const unsigned other = reqs[i]->other_different;
                                int i;
 

diff --git a/ir/be/arm/arm_new_nodes.c b/ir/be/arm/arm_new_nodes.c
index 3fbe4fd..81f48dc 100644 (file)
--- a/ir/be/arm/arm_new_nodes.c
+++ b/ir/be/arm/arm_new_nodes.c
@@ -129,7 +129,7 @@ static void dump_reg_req(FILE *F, const ir_node *node,
                                }
                        }
 
-                       if (reqs[i]->type & arch_register_req_type_should_be_different) {
+                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
                                const unsigned other = reqs[i]->other_different;
                                int i;
 

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index ce75db6..45c15fd 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -332,7 +332,7 @@ extern char *arch_register_req_format(char *buf, size_t len,
                }
        }
 
-       if(arch_register_req_is(req, should_be_different)) {
+       if (arch_register_req_is(req, must_be_different)) {
                const unsigned other = req->other_different;
                int i;
 

diff --git a/ir/be/bearch.h b/ir/be/bearch.h
index e7a31b9..4b0d187 100644 (file)
--- a/ir/be/bearch.h
+++ b/ir/be/bearch.h
@@ -85,11 +85,11 @@ typedef enum arch_operand_type_t {
  * Different types of register allocation requirements.
  */
 typedef enum arch_register_req_type_t {
-       arch_register_req_type_none                = 0,  /**< No register requirement. */
-       arch_register_req_type_normal              = 1,  /**< All registers in the class are allowed. */
-       arch_register_req_type_limited             = 2,  /**< Only a real subset of the class is allowed. */
-       arch_register_req_type_should_be_same      = 4,  /**< The register should be equal to another one at the node. */
-       arch_register_req_type_should_be_different = 8,  /**< The register must be unequal from some other at the node. */
+       arch_register_req_type_none              = 0,  /**< No register requirement. */
+       arch_register_req_type_normal            = 1,  /**< All registers in the class are allowed. */
+       arch_register_req_type_limited           = 2,  /**< Only a real subset of the class is allowed. */
+       arch_register_req_type_should_be_same    = 4,  /**< The register should be equal to another one at the node. */
+       arch_register_req_type_must_be_different = 8,  /**< The register must be unequal from some other at the node. */
 } arch_register_req_type_t;
 
 extern const arch_register_req_t *arch_no_register_req;

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 3eb1d7a..872bd37 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -615,8 +615,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 }
 
 /**
- * Checks if node has a should_be_different constraint in output
- * and adds a Keep then to assure the constraint.
+ * Checks if node has a must_be_different constraint in output and adds a Keep
+ * then to assure the constraint.
  */
 static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
        const arch_register_req_t *req;
@@ -624,7 +624,7 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
 
        req = arch_get_register_req(arch_env, irn, -1);
 
-       if (arch_register_req_is(req, should_be_different)) {
+       if (arch_register_req_is(req, must_be_different)) {
                const unsigned other = req->other_different;
                int i;
 
@@ -636,7 +636,7 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
                                int idx_same  = ntz(same);
 
                                /*
-                                * We can safely ignore a should_be_same x should_be_different y
+                                * We can safely ignore a should_be_same x must_be_different y
                                 * IFF both inputs are equal!
                                 */
                                if (get_irn_n(irn, idx_other) == get_irn_n(irn, idx_same)) {

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 148a46e..f26ec00 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -984,7 +984,7 @@ void be_set_constr_limited(ir_node *node, int pos, const arch_register_req_t *re
        arch_register_req_t *r = get_req(node, pos);
 
        assert(arch_register_req_is(req, limited));
-       assert(! (req->type & (arch_register_req_type_should_be_same | arch_register_req_type_should_be_different)));
+       assert(!(req->type & (arch_register_req_type_should_be_same | arch_register_req_type_must_be_different)));
        memcpy(r, req, sizeof(r[0]));
        r->limited = rbitset_duplicate_obstack_alloc(obst, req->limited, req->cls->n_regs);
 }

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 31ea832..2efc7b7 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -107,7 +107,7 @@ 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_different) {
+                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
                                unsigned other = reqs[i]->other_different;
                                int i;
 

diff --git a/ir/be/mips/mips_new_nodes.c b/ir/be/mips/mips_new_nodes.c
index ad8ce10..81c63cf 100644 (file)
--- a/ir/be/mips/mips_new_nodes.c
+++ b/ir/be/mips/mips_new_nodes.c
@@ -105,7 +105,7 @@ 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_different) {
+                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
                                const unsigned other = reqs[i]->other_different;
                                int i;
 

diff --git a/ir/be/ppc32/ppc32_new_nodes.c b/ir/be/ppc32/ppc32_new_nodes.c
index f2b437d..ce38230 100644 (file)
--- a/ir/be/ppc32/ppc32_new_nodes.c
+++ b/ir/be/ppc32/ppc32_new_nodes.c
@@ -102,7 +102,7 @@ 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_different) {
+                       if (reqs[i]->type & arch_register_req_type_must_be_different) {
                                const unsigned other = reqs[i]->other_different;
                                int i;
 

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 59d784b..578d5b0 100755 (executable)
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -1229,7 +1229,7 @@ EOF
                        push(@req_type_mask, "arch_register_req_type_should_be_same");
                }
                if ($different_pos != 0) {
-                       push(@req_type_mask, "arch_register_req_type_should_be_different");
+                       push(@req_type_mask, "arch_register_req_type_must_be_different");
                }
                my $reqtype      = join(" | ", @req_type_mask);