From: Bernardo Innocenti Date: Mon, 26 Jul 2004 00:38:05 +0000 (+0200) Subject: c-common.c (disable_builtin_function): Rename variable n to new_disabled_builtin. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ad463f4932ebb6224f1155bced2dda6aedd686f;p=gcc.git c-common.c (disable_builtin_function): Rename variable n to new_disabled_builtin. * c-common.c (disable_builtin_function): Rename variable n to new_disabled_builtin. * c-decl.c (duplicate_decls): Rename parameter decl to new_decl. Rename local variable old to old_decl. * gensupport.c (shift_output_template): Rename parameter old to src. * simplify-rtx.c (simplify_replace_rtx): Rename parameter oldx to old_rtx and newx to new_rtx. From-SVN: r85175 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 244915a8317..92168139e24 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2004-07-26 Bernardo Innocenti + + * c-common.c (disable_builtin_function): Rename variable n to + new_disabled_builtin. + * c-decl.c (duplicate_decls): Rename parameter decl to new_decl. + Rename local variable old to old_decl. + * gensupport.c (shift_output_template): Rename parameter old to src. + * simplify-rtx.c (simplify_replace_rtx): Rename parameter oldx to + old_rtx and newx to new_rtx. + 2004-07-26 Bernardo Innocenti * Makefile.in (C_PRAGMA_H): New variable to track dependencies diff --git a/gcc/c-common.c b/gcc/c-common.c index 2fe696d676c..ef8f72fca45 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -3242,10 +3242,10 @@ disable_builtin_function (const char *name) error ("cannot disable built-in function `%s'", name); else { - disabled_builtin *n = XNEW (disabled_builtin); - n->name = name; - n->next = disabled_builtins; - disabled_builtins = n; + disabled_builtin *new_disabled_builtin = XNEW (disabled_builtin); + new_disabled_builtin->name = name; + new_disabled_builtin->next = disabled_builtins; + disabled_builtins = new_disabled_builtin; } } diff --git a/gcc/c-decl.c b/gcc/c-decl.c index e4c022ff25e..3239817da2b 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1733,45 +1733,49 @@ duplicate_decls (tree newdecl, tree olddecl) } -/* Check whether decl-node DECL shadows an existing declaration. */ +/* Check whether decl-node NEW_DECL shadows an existing declaration. */ static void -warn_if_shadowing (tree decl) +warn_if_shadowing (tree new_decl) { struct c_binding *b; /* Shadow warnings wanted? */ if (!warn_shadow /* No shadow warnings for internally generated vars. */ - || DECL_IS_BUILTIN (decl) + || DECL_IS_BUILTIN (new_decl) /* No shadow warnings for vars made for inlining. */ - || DECL_FROM_INLINE (decl) + || DECL_FROM_INLINE (new_decl) /* Don't warn about the parm names in function declarator within a function declarator. It would be nice to avoid warning in any function declarator in a declaration, as opposed to a definition, but there is no way to tell it's not a definition at this point. */ - || (TREE_CODE (decl) == PARM_DECL && current_scope->outer->parm_flag)) + || (TREE_CODE (new_decl) == PARM_DECL && current_scope->outer->parm_flag)) return; /* Is anything being shadowed? Invisible decls do not count. */ - for (b = I_SYMBOL_BINDING (DECL_NAME (decl)); b; b = b->shadowed) - if (b->decl && b->decl != decl && !b->invisible) + for (b = I_SYMBOL_BINDING (DECL_NAME (new_decl)); b; b = b->shadowed) + if (b->decl && b->decl != new_decl && !b->invisible) { - tree old = b->decl; + tree old_decl = b->decl; - if (TREE_CODE (old) == PARM_DECL) - warning ("%Jdeclaration of '%D' shadows a parameter", decl, decl); - else if (DECL_FILE_SCOPE_P (old)) + if (TREE_CODE (old_decl) == PARM_DECL) + warning ("%Jdeclaration of '%D' shadows a parameter", + new_decl, new_decl); + else if (DECL_FILE_SCOPE_P (old_decl)) warning ("%Jdeclaration of '%D' shadows a global declaration", - decl, decl); - else if (TREE_CODE (old) == FUNCTION_DECL && DECL_BUILT_IN (old)) + new_decl, new_decl); + else if (TREE_CODE (old_decl) == FUNCTION_DECL + && DECL_BUILT_IN (old_decl)) warning ("%Jdeclaration of '%D' shadows a built-in function", - decl, decl); + new_decl, new_decl); else - warning ("%Jdeclaration of '%D' shadows a previous local", decl, decl); + warning ("%Jdeclaration of '%D' shadows a previous local", + new_decl, new_decl); - if (TREE_CODE (old) != FUNCTION_DECL || !DECL_BUILT_IN (old)) - warning ("%Jshadowed declaration is here", old); + if (TREE_CODE (old_decl) != FUNCTION_DECL + || ! DECL_BUILT_IN (old_decl)) + warning ("%Jshadowed declaration is here", old_decl); break; } diff --git a/gcc/gensupport.c b/gcc/gensupport.c index d253378f522..37535d18a5d 100644 --- a/gcc/gensupport.c +++ b/gcc/gensupport.c @@ -670,26 +670,26 @@ alter_test_for_insn (struct queue_elem *ce_elem, return concat ("(", ce_test, ") && (", insn_test, ")", NULL); } -/* Adjust all of the operand numbers in OLD to match the shift they'll +/* Adjust all of the operand numbers in SRC to match the shift they'll get from an operand displacement of DISP. Return a pointer after the adjusted string. */ static char * -shift_output_template (char *dest, const char *old, int disp) +shift_output_template (char *dest, const char *src, int disp) { - while (*old) + while (*src) { - char c = *old++; + char c = *src++; *dest++ = c; if (c == '%') { - c = *old++; + c = *src++; if (ISDIGIT ((unsigned char) c)) c += disp; else if (ISALPHA (c)) { *dest++ = c; - c = *old++ + disp; + c = *src++ + disp; } *dest++ = c; } diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 8fbe750acef..15e461af90f 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -240,38 +240,38 @@ simplify_gen_relational (enum rtx_code code, enum machine_mode mode, return gen_rtx_fmt_ee (code, mode, op0, op1); } -/* Replace all occurrences of OLDX in X with NEWX and try to simplify the +/* Replace all occurrences of OLD_RTX in X with NEW_RTX and try to simplify the resulting RTX. Return a new RTX which is as simplified as possible. */ rtx -simplify_replace_rtx (rtx x, rtx oldx, rtx newx) +simplify_replace_rtx (rtx x, rtx old_rtx, rtx new_rtx) { enum rtx_code code = GET_CODE (x); enum machine_mode mode = GET_MODE (x); enum machine_mode op_mode; rtx op0, op1, op2; - /* If X is OLDX, return NEWX. Otherwise, if this is an expression, try + /* If X is OLD_RTX, return NEW_RTX. Otherwise, if this is an expression, try to build a new expression substituting recursively. If we can't do anything, return our input. */ - if (x == oldx) - return newx; + if (x == old_rtx) + return new_rtx; switch (GET_RTX_CLASS (code)) { case RTX_UNARY: op0 = XEXP (x, 0); op_mode = GET_MODE (op0); - op0 = simplify_replace_rtx (op0, oldx, newx); + op0 = simplify_replace_rtx (op0, old_rtx, new_rtx); if (op0 == XEXP (x, 0)) return x; return simplify_gen_unary (code, mode, op0, op_mode); case RTX_BIN_ARITH: case RTX_COMM_ARITH: - op0 = simplify_replace_rtx (XEXP (x, 0), oldx, newx); - op1 = simplify_replace_rtx (XEXP (x, 1), oldx, newx); + op0 = simplify_replace_rtx (XEXP (x, 0), old_rtx, new_rtx); + op1 = simplify_replace_rtx (XEXP (x, 1), old_rtx, new_rtx); if (op0 == XEXP (x, 0) && op1 == XEXP (x, 1)) return x; return simplify_gen_binary (code, mode, op0, op1); @@ -281,8 +281,8 @@ simplify_replace_rtx (rtx x, rtx oldx, rtx newx) op0 = XEXP (x, 0); op1 = XEXP (x, 1); op_mode = GET_MODE (op0) != VOIDmode ? GET_MODE (op0) : GET_MODE (op1); - op0 = simplify_replace_rtx (op0, oldx, newx); - op1 = simplify_replace_rtx (op1, oldx, newx); + op0 = simplify_replace_rtx (op0, old_rtx, new_rtx); + op1 = simplify_replace_rtx (op1, old_rtx, new_rtx); if (op0 == XEXP (x, 0) && op1 == XEXP (x, 1)) return x; return simplify_gen_relational (code, mode, op_mode, op0, op1); @@ -291,9 +291,9 @@ simplify_replace_rtx (rtx x, rtx oldx, rtx newx) case RTX_BITFIELD_OPS: op0 = XEXP (x, 0); op_mode = GET_MODE (op0); - op0 = simplify_replace_rtx (op0, oldx, newx); - op1 = simplify_replace_rtx (XEXP (x, 1), oldx, newx); - op2 = simplify_replace_rtx (XEXP (x, 2), oldx, newx); + op0 = simplify_replace_rtx (op0, old_rtx, new_rtx); + op1 = simplify_replace_rtx (XEXP (x, 1), old_rtx, new_rtx); + op2 = simplify_replace_rtx (XEXP (x, 2), old_rtx, new_rtx); if (op0 == XEXP (x, 0) && op1 == XEXP (x, 1) && op2 == XEXP (x, 2)) return x; if (op_mode == VOIDmode) @@ -304,7 +304,7 @@ simplify_replace_rtx (rtx x, rtx oldx, rtx newx) /* The only case we try to handle is a SUBREG. */ if (code == SUBREG) { - op0 = simplify_replace_rtx (SUBREG_REG (x), oldx, newx); + op0 = simplify_replace_rtx (SUBREG_REG (x), old_rtx, new_rtx); if (op0 == SUBREG_REG (x)) return x; op0 = simplify_gen_subreg (GET_MODE (x), op0, @@ -317,15 +317,15 @@ simplify_replace_rtx (rtx x, rtx oldx, rtx newx) case RTX_OBJ: if (code == MEM) { - op0 = simplify_replace_rtx (XEXP (x, 0), oldx, newx); + op0 = simplify_replace_rtx (XEXP (x, 0), old_rtx, new_rtx); if (op0 == XEXP (x, 0)) return x; return replace_equiv_address_nv (x, op0); } else if (code == LO_SUM) { - op0 = simplify_replace_rtx (XEXP (x, 0), oldx, newx); - op1 = simplify_replace_rtx (XEXP (x, 1), oldx, newx); + op0 = simplify_replace_rtx (XEXP (x, 0), old_rtx, new_rtx); + op1 = simplify_replace_rtx (XEXP (x, 1), old_rtx, new_rtx); /* (lo_sum (high x) x) -> x */ if (GET_CODE (op0) == HIGH && rtx_equal_p (XEXP (op0, 0), op1)) @@ -337,8 +337,8 @@ simplify_replace_rtx (rtx x, rtx oldx, rtx newx) } else if (code == REG) { - if (REG_P (oldx) && REGNO (x) == REGNO (oldx)) - return newx; + if (REG_P (old_rtx) && REGNO (x) == REGNO (old_rtx)) + return new_rtx; } break;