From 2c28ca26bcc37f6d2085cb26ad8da663c9a4adcd Mon Sep 17 00:00:00 2001 From: clyon Date: Tue, 4 Sep 2012 08:35:19 +0000 Subject: [PATCH] 2012-09-04 Christophe Lyon * config/arm/arm.c (arm_expand_builtin): Replace gen_rtx_CONST_INT by GEN_INT. (arm_emit_coreregs_64bit_shift): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190912 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/config/arm/arm.c | 17 ++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cda27fd74dfb..d034c10e4b3f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-09-04 Christophe Lyon + + * config/arm/arm.c (arm_expand_builtin): Replace gen_rtx_CONST_INT + by GEN_INT. + (arm_emit_coreregs_64bit_shift): Likewise. + 2012-09-04 Christophe Lyon * config/arm/arm.c (arm_evpc_neon_vext): New diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 36937d2b90d5..b49fa466e45c 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -20959,7 +20959,7 @@ arm_expand_builtin (tree exp, else if (icode == CODE_FOR_iwmmxt_tinsrw && (selector < 0 ||selector > 1)) error ("the range of selector should be in 0 to 1"); mask <<= selector; - op2 = gen_rtx_CONST_INT (SImode, mask); + op2 = GEN_INT (mask); } if (target == 0 || GET_MODE (target) != tmode @@ -26290,12 +26290,12 @@ arm_emit_coreregs_64bit_shift (enum rtx_code code, rtx out, rtx in, /* Macros to make following code more readable. */ #define SUB_32(DEST,SRC) \ - gen_addsi3 ((DEST), (SRC), gen_rtx_CONST_INT (VOIDmode, -32)) + gen_addsi3 ((DEST), (SRC), GEN_INT (-32)) #define RSB_32(DEST,SRC) \ - gen_subsi3 ((DEST), gen_rtx_CONST_INT (VOIDmode, 32), (SRC)) + gen_subsi3 ((DEST), GEN_INT (32), (SRC)) #define SUB_S_32(DEST,SRC) \ gen_addsi3_compare0 ((DEST), (SRC), \ - gen_rtx_CONST_INT (VOIDmode, -32)) + GEN_INT (-32)) #define SET(DEST,SRC) \ gen_rtx_SET (SImode, (DEST), (SRC)) #define SHIFT(CODE,SRC,AMOUNT) \ @@ -26331,7 +26331,7 @@ arm_emit_coreregs_64bit_shift (enum rtx_code code, rtx out, rtx in, { if (code == ASHIFTRT) { - rtx const31_rtx = gen_rtx_CONST_INT (VOIDmode, 31); + rtx const31_rtx = GEN_INT (31); emit_insn (SET (out_down, SHIFT (code, in_up, const31_rtx))); emit_insn (SET (out_up, SHIFT (code, in_up, const31_rtx))); } @@ -26343,8 +26343,7 @@ arm_emit_coreregs_64bit_shift (enum rtx_code code, rtx out, rtx in, else if (INTVAL (amount) < 32) { /* Shifts by a constant less than 32. */ - rtx reverse_amount = gen_rtx_CONST_INT (VOIDmode, - 32 - INTVAL (amount)); + rtx reverse_amount = GEN_INT (32 - INTVAL (amount)); emit_insn (SET (out_down, LSHIFT (code, in_down, amount))); emit_insn (SET (out_down, @@ -26355,12 +26354,12 @@ arm_emit_coreregs_64bit_shift (enum rtx_code code, rtx out, rtx in, else { /* Shifts by a constant greater than 31. */ - rtx adj_amount = gen_rtx_CONST_INT (VOIDmode, INTVAL (amount) - 32); + rtx adj_amount = GEN_INT (INTVAL (amount) - 32); emit_insn (SET (out_down, SHIFT (code, in_up, adj_amount))); if (code == ASHIFTRT) emit_insn (gen_ashrsi3 (out_up, in_up, - gen_rtx_CONST_INT (VOIDmode, 31))); + GEN_INT (31))); else emit_insn (SET (out_up, const0_rtx)); } -- 2.47.2