Commit 78680bc7 authored by Christoph Mallon's avatar Christoph Mallon
Browse files

Rename arch_register_req_type_should_be_different to the more appropriate...

Rename arch_register_req_type_should_be_different to the more appropriate arch_register_req_type_must_be_different.

[r21302]
parent 474b310a
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)) {
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment