From 78f119aff4c7d4fa717e9886e8e9b9303692c50f Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Wed, 11 Jun 2008 21:26:48 +0000 Subject: [PATCH] - do not use C++ keyword class as variable name [r20063] --- ir/be/ia32/ia32_finish.c | 10 +++++----- ir/be/ia32/ia32_transform.c | 16 ++++++++-------- ir/be/ia32/ia32_x87.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ir/be/ia32/ia32_finish.c b/ir/be/ia32/ia32_finish.c index 06f540488..c3abc71ca 100644 --- a/ir/be/ia32/ia32_finish.c +++ b/ir/be/ia32/ia32_finish.c @@ -260,7 +260,7 @@ static void assure_should_be_same_requirements(ia32_code_gen_t *cg, ir_node *perm_proj1; ir_node *uses_out_reg; const arch_register_req_t *req = reqs[i]; - const arch_register_class_t *class; + const arch_register_class_t *cls; int uses_out_reg_pos; if (!arch_register_req_is(req, should_be_same)) @@ -279,8 +279,8 @@ static void assure_should_be_same_requirements(ia32_code_gen_t *cg, /* unknowns can be changed to any register we want on emitting */ if (is_unknown_reg(in_reg)) continue; - class = arch_register_get_class(in_reg); - assert(class == arch_register_get_class(out_reg)); + cls = arch_register_get_class(in_reg); + assert(cls == arch_register_get_class(out_reg)); /* check if any other input operands uses the out register */ arity = get_irn_arity(node); @@ -312,7 +312,7 @@ static void assure_should_be_same_requirements(ia32_code_gen_t *cg, * (the register can't be live since the operation will override it * anyway) */ if(uses_out_reg == NULL) { - ir_node *copy = be_new_Copy(class, irg, block, in_node); + ir_node *copy = be_new_Copy(cls, irg, block, in_node); DBG_OPT_2ADDRCPY(copy); /* destination is the out register */ @@ -345,7 +345,7 @@ static void assure_should_be_same_requirements(ia32_code_gen_t *cg, * after! the operation as we will override the register. */ in[0] = in_node; in[1] = uses_out_reg; - perm = be_new_Perm(class, irg, block, 2, in); + perm = be_new_Perm(cls, irg, block, 2, in); perm_proj0 = new_r_Proj(irg, block, perm, get_irn_mode(in[0]), 0); perm_proj1 = new_r_Proj(irg, block, perm, get_irn_mode(in[1]), 1); diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c index 977511aaa..b0f186e41 100644 --- a/ir/be/ia32/ia32_transform.c +++ b/ir/be/ia32/ia32_transform.c @@ -5337,7 +5337,7 @@ static void ia32_pretransform_node(void *arch_cg) { /** * Walker, checks if all ia32 nodes producing more than one result have - * its Projs, other wise creates new projs and keep them using a be_Keep node. + * its Projs, otherwise creates new Projs and keep them using a be_Keep node. */ static void add_missing_keep_walker(ir_node *node, void *data) { @@ -5374,28 +5374,28 @@ static void add_missing_keep_walker(ir_node *node, void *data) ir_node *block; ir_node *in[1]; const arch_register_req_t *req; - const arch_register_class_t *class; + const arch_register_class_t *cls; if(found_projs & (1 << i)) { continue; } req = get_ia32_out_req(node, i); - class = req->cls; - if(class == NULL) { + cls = req->cls; + if(cls == NULL) { continue; } - if(class == &ia32_reg_classes[CLASS_ia32_flags]) { + if(cls == &ia32_reg_classes[CLASS_ia32_flags]) { continue; } block = get_nodes_block(node); in[0] = new_r_Proj(current_ir_graph, block, node, - arch_register_class_mode(class), i); + arch_register_class_mode(cls), i); if(last_keep != NULL) { - be_Keep_add_node(last_keep, class, in[0]); + be_Keep_add_node(last_keep, cls, in[0]); } else { - last_keep = be_new_Keep(class, current_ir_graph, block, 1, in); + last_keep = be_new_Keep(cls, current_ir_graph, block, 1, in); if(sched_is_scheduled(node)) { sched_add_after(node, last_keep); } diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c index 1ffbcea9c..c724764d4 100644 --- a/ir/be/ia32/ia32_x87.c +++ b/ir/be/ia32/ia32_x87.c @@ -1795,14 +1795,14 @@ static int sim_Copy(x87_state *state, ir_node *n) { ir_node *pred; const arch_register_t *out; const arch_register_t *op1; - const arch_register_class_t *class; + const arch_register_class_t *cls; ir_node *node, *next; ia32_x87_attr_t *attr; int op1_idx, out_idx; unsigned live; - class = arch_get_irn_reg_class(sim->arch_env, n, -1); - if (class->regs != ia32_vfp_regs) + cls = arch_get_irn_reg_class(sim->arch_env, n, -1); + if (cls->regs != ia32_vfp_regs) return 0; pred = get_irn_n(n, 0); -- 2.20.1