From 2ef6611e8caf18c9d869ea0ea6cf8712ef61caeb Mon Sep 17 00:00:00 2001 From: Oleg Endo Date: Sat, 7 Apr 2012 12:01:01 +0000 Subject: [PATCH] sh-protos.h (prepare_move_operands): Return void instead of int. * config/sh/sh-protos.h (prepare_move_operands): Return void instead of int. * config/sh/sh.c (prepare_move_operands): Likewise. * config/sh/sh.md: Remove return value checks of prepare_move_operands. From-SVN: r186211 --- gcc/ChangeLog | 7 +++++++ gcc/config/sh/sh-protos.h | 2 +- gcc/config/sh/sh.c | 4 +--- gcc/config/sh/sh.md | 39 +++++++++++++-------------------------- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bca226d..0e08e69 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2012-04-07 Oleg Endo + * config/sh/sh-protos.h (prepare_move_operands): Return void + instead of int. + * config/sh/sh.c (prepare_move_operands): Likewise. + * config/sh/sh.md: Remove return value checks of prepare_move_operands. + +2012-04-07 Oleg Endo + * config/sh/sh-protos.h (fp_int_operand, symbol_ref_operand, general_movsrc_operand, general_movdst_operand, arith_reg_operand, fp_arith_reg_operand, arith_operand, arith_reg_or_0_operand, diff --git a/gcc/config/sh/sh-protos.h b/gcc/config/sh/sh-protos.h index a3e0b6b..8143749 100644 --- a/gcc/config/sh/sh-protos.h +++ b/gcc/config/sh/sh-protos.h @@ -64,7 +64,7 @@ extern void emit_sf_insn (rtx); extern void emit_df_insn (rtx); extern void output_pic_addr_const (FILE *, rtx); extern bool expand_block_move (rtx *); -extern int prepare_move_operands (rtx[], enum machine_mode mode); +extern void prepare_move_operands (rtx[], enum machine_mode mode); extern enum rtx_code prepare_cbranch_operands (rtx *, enum machine_mode mode, enum rtx_code comparison); extern void expand_cbranchsi4 (rtx *operands, enum rtx_code comparison, int); diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 6088d3d..443f800 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -1601,7 +1601,7 @@ expand_block_move (rtx *operands) /* Prepare operands for a move define_expand; specifically, one of the operands must be in a register. */ -int +void prepare_move_operands (rtx operands[], enum machine_mode mode) { if ((mode == SImode || mode == DImode) @@ -1763,8 +1763,6 @@ prepare_move_operands (rtx operands[], enum machine_mode mode) operands[1] = op1; } } - - return 0; } enum rtx_code diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md index dd7ff66..28f5fd9 100644 --- a/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md @@ -5337,8 +5337,7 @@ label: (match_operand:SI 1 "general_movsrc_operand" ""))] "" { - if (prepare_move_operands (operands, SImode)) - DONE; + prepare_move_operands (operands, SImode); }) (define_expand "ic_invalidate_line" @@ -5447,8 +5446,7 @@ label: (match_operand:QI 1 "general_operand" ""))] "" { - if (prepare_move_operands (operands, QImode)) - DONE; + prepare_move_operands (operands, QImode); }) ;; If movqi_reg_reg is specified as an alternative of movqi, movqi will be @@ -5614,8 +5612,7 @@ label: (match_operand:HI 1 "general_movsrc_operand" ""))] "" { - if (prepare_move_operands (operands, HImode)) - DONE; + prepare_move_operands (operands, HImode); }) (define_expand "reload_inhi" @@ -5982,8 +5979,7 @@ label: (match_operand:DI 1 "general_movsrc_operand" ""))] "" { - if (prepare_move_operands (operands, DImode)) - DONE; + prepare_move_operands (operands, DImode); }) (define_insn "movdf_media" @@ -6571,8 +6567,7 @@ label: (match_operand:DF 1 "general_movsrc_operand" ""))] "" { - if (prepare_move_operands (operands, DFmode)) - DONE; + prepare_move_operands (operands, DFmode); if (TARGET_SHMEDIA) { if (TARGET_SHMEDIA_FPU) @@ -6618,8 +6613,7 @@ label: (match_operand:V2SF 1 "nonimmediate_operand" ""))] "TARGET_SHMEDIA_FPU" { - if (prepare_move_operands (operands, V2SFmode)) - DONE; + prepare_move_operands (operands, V2SFmode); }) (define_expand "addv2sf3" @@ -6700,8 +6694,7 @@ label: (match_operand:V4SF 1 "general_operand" ""))] "TARGET_SHMEDIA_FPU" { - if (prepare_move_operands (operands, V4SFmode)) - DONE; + prepare_move_operands (operands, V4SFmode); }) (define_insn_and_split "*movv16sf_i" @@ -6748,8 +6741,7 @@ label: (match_operand:V16SF 1 "nonimmediate_operand" "f,m,f"))] "TARGET_SHMEDIA_FPU" { - if (prepare_move_operands (operands, V16SFmode)) - DONE; + prepare_move_operands (operands, V16SFmode); }) (define_insn "movsf_media" @@ -6921,8 +6913,7 @@ label: (match_operand:SF 1 "general_movsrc_operand" ""))] "" { - if (prepare_move_operands (operands, SFmode)) - DONE; + prepare_move_operands (operands, SFmode); if (TARGET_SHMEDIA) { if (TARGET_SHMEDIA_FPU) @@ -11774,8 +11765,7 @@ label: (match_operand:V8QI 1 "general_movsrc_operand" ""))] "TARGET_SHMEDIA" { - if (prepare_move_operands (operands, V8QImode)) - DONE; + prepare_move_operands (operands, V8QImode); }) (define_insn "movv8qi_i" @@ -11867,8 +11857,7 @@ label: (match_operand:V2HI 1 "general_movsrc_operand" ""))] "TARGET_SHMEDIA" { - if (prepare_move_operands (operands, V2HImode)) - DONE; + prepare_move_operands (operands, V2HImode); }) (define_insn "movv2hi_i" @@ -11895,8 +11884,7 @@ label: (match_operand:V4HI 1 "general_movsrc_operand" ""))] "TARGET_SHMEDIA" { - if (prepare_move_operands (operands, V4HImode)) - DONE; + prepare_move_operands (operands, V4HImode); }) (define_insn "movv4hi_i" @@ -11920,8 +11908,7 @@ label: (match_operand:V2SI 1 "general_movsrc_operand" ""))] "TARGET_SHMEDIA" { - if (prepare_move_operands (operands, V2SImode)) - DONE; + prepare_move_operands (operands, V2SImode); }) (define_insn "movv2si_i" -- 2.7.4