From 575ce8934206f6884fe009916551ee221931565c Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Sun, 21 Jul 2019 21:02:54 +0000 Subject: [PATCH] or1k: only force reg for immediates The force_reg in or1k_expand_compare is hard coded for SImode, which is fine as this used to only be used on SI expands. However, with FP support this will cause issues. In general we should only force the right hand operand to a register if its an immediate. This patch adds an condition to check for that. gcc/ChangeLog: * config/or1k/or1k.c (or1k_expand_compare): Check for int before force_reg. From-SVN: r273651 --- gcc/ChangeLog | 5 +++++ gcc/config/or1k/or1k.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 224b785b8f1..711a31ea597 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-07-22 Stafford Horne + + * config/or1k/or1k.c (or1k_expand_compare): Check for int before + force_reg. + 2019-07-22 Stafford Horne * config.gcc (or1k*-*-*): Add mhard-float, mdouble-float, msoft-float diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c index 1eea84f47e0..f8eed4a7797 100644 --- a/gcc/config/or1k/or1k.c +++ b/gcc/config/or1k/or1k.c @@ -1448,13 +1448,15 @@ void or1k_expand_compare (rtx *operands) { rtx sr_f = gen_rtx_REG (BImode, SR_F_REGNUM); + rtx righthand_op = XEXP (operands[0], 1); rtx_code cmp_code = GET_CODE (operands[0]); bool flag_check_ne = true; - /* The RTL may receive an immediate in argument 1 of the compare, this is not - supported unless we have l.sf*i instructions, force them into registers. */ - if (!TARGET_SFIMM) - XEXP (operands[0], 1) = force_reg (SImode, XEXP (operands[0], 1)); + /* Integer RTL may receive an immediate in argument 1 of the compare, this is + not supported unless we have l.sf*i instructions, force them into + registers. */ + if (!TARGET_SFIMM && CONST_INT_P (righthand_op)) + XEXP (operands[0], 1) = force_reg (SImode, righthand_op); /* Normalize comparison operators to ones OpenRISC support. */ switch (cmp_code) -- 2.30.2