It's functionality now folded into alpha_emit_set_const.
---
* config/alpha/alpha.c (alpha_emit_set_long_const): Remove.
(alpha_split_const_mov): Don't call it.
(alpha_expand_epilogue): Likewise.
(alpha_output_mi_thunk_osf): Likewise.
---
gcc/config/alpha/alpha.c | 76 ++++++++----------------------------------------
1 file changed, 12 insertions(+), 64 deletions(-)
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index cc25250..c0d8900 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -2045,49 +2045,6 @@ alpha_emit_set_const (rtx target, machine_mode origmode,
return target;
}
-/* Having failed to find a 3 insn sequence in alpha_emit_set_const,
- fall back to a straight forward decomposition. We do this to avoid
- exponential run times encountered when looking for longer sequences
- with alpha_emit_set_const. */
-
-static rtx
-alpha_emit_set_long_const (rtx target, HOST_WIDE_INT c1)
-{
- HOST_WIDE_INT d1, d2, d3, d4;
-
- /* Decompose the entire word */
-
- d1 = ((c1 & 0xffff) ^ 0x8000) - 0x8000;
- c1 -= d1;
- d2 = ((c1 & 0xffffffff) ^ 0x80000000) - 0x80000000;
- c1 = (c1 - d2) >> 32;
- d3 = ((c1 & 0xffff) ^ 0x8000) - 0x8000;
- c1 -= d3;
- d4 = ((c1 & 0xffffffff) ^ 0x80000000) - 0x80000000;
- gcc_assert (c1 == d4);
-
- /* Construct the high word */
- if (d4)
- {
- emit_move_insn (target, GEN_INT (d4));
- if (d3)
- emit_move_insn (target, gen_rtx_PLUS (DImode, target, GEN_INT (d3)));
- }
- else
- emit_move_insn (target, GEN_INT (d3));
-
- /* Shift it into place */
- emit_move_insn (target, gen_rtx_ASHIFT (DImode, target, GEN_INT (32)));
-
- /* Add in the low bits. */
- if (d2)
- emit_move_insn (target, gen_rtx_PLUS (DImode, target, GEN_INT (d2)));
- if (d1)
- emit_move_insn (target, gen_rtx_PLUS (DImode, target, GEN_INT (d1)));
-
- return target;
-}
-
/* Given an integral CONST_INT or CONST_VECTOR, return the low 64 bits. */
static HOST_WIDE_INT
@@ -2177,16 +2134,10 @@ alpha_legitimate_constant_p (machine_mode mode, rtx x)
bool
alpha_split_const_mov (machine_mode mode, rtx *operands)
{
- HOST_WIDE_INT i0;
- rtx temp = NULL_RTX;
-
- i0 = alpha_extract_integer (operands[1]);
-
- temp = alpha_emit_set_const (operands[0], mode, i0, 3);
-
- if (!temp && TARGET_BUILD_CONSTANTS)
- temp = alpha_emit_set_long_const (operands[0], i0);
-
+ HOST_WIDE_INT i0 = alpha_extract_integer (operands[1]);
+ rtx temp = alpha_emit_set_const (operands[0], mode, i0,
+ TARGET_BUILD_CONSTANTS
+ ? genimm_alpha::max_cost : 3);
if (temp)
{
if (!rtx_equal_p (operands[0], temp))
@@ -8220,14 +8171,10 @@ alpha_expand_epilogue (void)
else
{
rtx tmp = gen_rtx_REG (DImode, 23);
- sp_adj2 = alpha_emit_set_const (tmp, DImode, frame_size, 3);
- if (!sp_adj2)
- {
- /* We can't drop new things to memory this late, afaik,
- so build it up by pieces. */
- sp_adj2 = alpha_emit_set_long_const (tmp, frame_size);
- gcc_assert (sp_adj2);
- }
+ /* We can't drop new things to memory this late, afaik,
+ so force the constant to be built by pieces. */
+ sp_adj2 = alpha_emit_set_const (tmp, DImode, frame_size,
+ genimm_alpha::max_cost);
}
/* From now on, things must be in order. So emit blockages. */
@@ -8352,7 +8299,8 @@ alpha_output_mi_thunk_osf (FILE *file, tree thunk_fndecl
ATTRIBUTE_UNUSED,
}
else
{
- rtx tmp = alpha_emit_set_long_const (gen_rtx_REG (Pmode, 0), delta);
+ rtx tmp = alpha_emit_set_const (gen_rtx_REG (Pmode, 0), Pmode, delta,
+ genimm_alpha::max_cost);
emit_insn (gen_adddi3 (this_rtx, this_rtx, tmp));
}
@@ -8373,8 +8321,8 @@ alpha_output_mi_thunk_osf (FILE *file, tree thunk_fndecl
ATTRIBUTE_UNUSED,
}
else
{
- tmp2 = alpha_emit_set_long_const (gen_rtx_REG (Pmode, 1),
- vcall_offset);
+ tmp2 = alpha_emit_set_const (gen_rtx_REG (Pmode, 1), Pmode,
+ vcall_offset, genimm_alpha::max_cost);
emit_insn (gen_adddi3 (tmp, tmp, tmp2));
lo = 0;
}
--
2.4.3
