This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch committed SH] Fix sh64-elf build failure [1/3]
- From: Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sun, 04 Mar 2012 08:23:22 +0900 (JST)
- Subject: [patch committed SH] Fix sh64-elf build failure [1/3]
Hi,
This is the first one of the 3 tiny patches to fix the build failures
for sh64-elf.
stmt.c:lshift_cheap_p is testing the cost for (ashift (const1_rtx) (reg)).
SH doesn't such insns but returns COSTS_N_INSNS (1) as its cost for
SHmedia target. This results an unrecognized insn error for that target.
Also sh.c:sh_rtx_costs returns COSTS_N_INSNS (MAX_COST) instead of MAX_COST
for non existant shift patterns. The patch below is to fix these problems.
Regtested on sh4-unkonwn-linux-gnu.
Regards,
kaz
--
2012-03-03 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.c (shiftcosts): Return MAX_COST when the first
operand is CONST_INT. Take COSTS_N_INSNS into account.
(sh_rtx_costs): Don't apply COSTS_N_INSNS to the return value
of shiftcosts.
diff -up ORIG/trunk/gcc/config/sh/sh.c trunk/gcc/config/sh/sh.c
--- ORIG/trunk/gcc/config/sh/sh.c 2012-03-03 11:53:10.000000000 +0900
+++ trunk/gcc/config/sh/sh.c 2012-03-03 17:40:19.000000000 +0900
@@ -2828,22 +2828,26 @@ shiftcosts (rtx x)
{
int value;
+ /* There is no pattern for constant first operand. */
+ if (CONST_INT_P (XEXP (x, 0)))
+ return MAX_COST;
+
if (TARGET_SHMEDIA)
- return 1;
+ return COSTS_N_INSNS (1);
if (GET_MODE_SIZE (GET_MODE (x)) > UNITS_PER_WORD)
{
if (GET_MODE (x) == DImode
&& CONST_INT_P (XEXP (x, 1))
&& INTVAL (XEXP (x, 1)) == 1)
- return 2;
+ return COSTS_N_INSNS (2);
/* Everything else is invalid, because there is no pattern for it. */
return MAX_COST;
}
/* If shift by a non constant, then this will be expensive. */
if (!CONST_INT_P (XEXP (x, 1)))
- return SH_DYNAMIC_SHIFT_COST;
+ return COSTS_N_INSNS (SH_DYNAMIC_SHIFT_COST);
/* Otherwise, return the true cost in instructions. Cope with out of range
shift counts more or less arbitrarily. */
@@ -2855,10 +2859,10 @@ shiftcosts (rtx x)
/* If SH3, then we put the constant in a reg and use shad. */
if (cost > 1 + SH_DYNAMIC_SHIFT_COST)
cost = 1 + SH_DYNAMIC_SHIFT_COST;
- return cost;
+ return COSTS_N_INSNS (cost);
}
else
- return shift_insns[value];
+ return COSTS_N_INSNS (shift_insns[value]);
}
/* Return the cost of an AND/XOR/IOR operation. */
@@ -3091,7 +3095,7 @@ sh_rtx_costs (rtx x, int code, int outer
case ASHIFT:
case ASHIFTRT:
case LSHIFTRT:
- *total = COSTS_N_INSNS (shiftcosts (x));
+ *total = shiftcosts (x);
return true;
case DIV: