diff options
Diffstat (limited to 'gcc/simplify-rtx.c')
| -rw-r--r-- | gcc/simplify-rtx.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 8fbe750..15e461a 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; |