From 317d21e95bf05eddff4abd1e6c29d36e376e5079 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Mon, 23 Dec 2002 14:58:53 +0000 Subject: [PATCH] h8300-protos.h: Update the prototype of expand_a_shift. * config/h8300/h8300-protos.h: Update the prototype of expand_a_shift. * config/h8300/h8300.c (expand_a_shift): Change the return type to void. * config/h8300/h8300.md: Update all the uses of expand_a_shift. From-SVN: r60436 --- gcc/ChangeLog | 9 +++++++++ gcc/config/h8300/h8300-protos.h | 2 +- gcc/config/h8300/h8300.c | 8 ++------ gcc/config/h8300/h8300.md | 18 +++++++++--------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae22fbc4e59..1328e0b5c9f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2002-12-23 Kazu Hirata + + * config/h8300/h8300-protos.h: Update the prototype of + expand_a_shift. + * config/h8300/h8300.c (expand_a_shift): Change the return + type to void. + * config/h8300/h8300.md: Update all the uses of + expand_a_shift. + 2002-12-22 Nathan Sidwell * tree.c (save_expr): Allow either side of a dyadic operand to be diff --git a/gcc/config/h8300/h8300-protos.h b/gcc/config/h8300/h8300-protos.h index ebb0cd17d4c..70ec579547c 100644 --- a/gcc/config/h8300/h8300-protos.h +++ b/gcc/config/h8300/h8300-protos.h @@ -42,7 +42,7 @@ extern const char *output_logical_op PARAMS ((enum machine_mode, rtx *)); extern unsigned int compute_logical_op_length PARAMS ((enum machine_mode, rtx *)); extern int compute_logical_op_cc PARAMS ((enum machine_mode, rtx *)); -extern int expand_a_shift PARAMS ((enum machine_mode, int, rtx[])); +extern void expand_a_shift PARAMS ((enum machine_mode, int, rtx[])); extern int h8300_shift_needs_scratch_p PARAMS ((int, enum machine_mode)); extern int expand_a_rotate PARAMS ((enum rtx_code, rtx[])); extern int fix_bit_operand PARAMS ((rtx *, int, enum rtx_code)); diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c index 6d8cbb637a1..f45ac165694 100644 --- a/gcc/config/h8300/h8300.c +++ b/gcc/config/h8300/h8300.c @@ -2250,11 +2250,9 @@ nshift_operator (x, mode) } } -/* Called from the .md file to emit code to do shifts. - Return a boolean indicating success. - (Currently this is always TRUE). */ +/* Emit code to do shifts. */ -int +void expand_a_shift (mode, code, operands) enum machine_mode mode; int code; @@ -2273,8 +2271,6 @@ expand_a_shift (mode, code, operands) operands[2])), gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (QImode))))); - - return 1; } /* Symbols of the various modes which can be used as indices. */ diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md index f5254f1fce8..9752f0f82a7 100644 --- a/gcc/config/h8300/h8300.md +++ b/gcc/config/h8300/h8300.md @@ -1983,21 +1983,21 @@ (ashift:QI (match_operand:QI 1 "register_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (QImode, ASHIFT, operands)) DONE; else FAIL;") + "expand_a_shift (QImode, ASHIFT, operands); DONE;") (define_expand "ashrqi3" [(set (match_operand:QI 0 "register_operand" "") (ashiftrt:QI (match_operand:QI 1 "register_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (QImode, ASHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (QImode, ASHIFTRT, operands); DONE;") (define_expand "lshrqi3" [(set (match_operand:QI 0 "register_operand" "") (lshiftrt:QI (match_operand:QI 1 "register_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (QImode, LSHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (QImode, LSHIFTRT, operands); DONE;") (define_insn "" [(set (match_operand:QI 0 "register_operand" "=r,r") @@ -2018,21 +2018,21 @@ (ashift:HI (match_operand:HI 1 "nonmemory_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (HImode, ASHIFT, operands)) DONE; else FAIL;") + "expand_a_shift (HImode, ASHIFT, operands); DONE;") (define_expand "lshrhi3" [(set (match_operand:HI 0 "register_operand" "") (lshiftrt:HI (match_operand:HI 1 "general_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (HImode, LSHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (HImode, LSHIFTRT, operands); DONE;") (define_expand "ashrhi3" [(set (match_operand:HI 0 "register_operand" "") (ashiftrt:HI (match_operand:HI 1 "register_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (HImode, ASHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (HImode, ASHIFTRT, operands); DONE;") (define_insn "" [(set (match_operand:HI 0 "register_operand" "=r,r") @@ -2053,21 +2053,21 @@ (ashift:SI (match_operand:SI 1 "general_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (SImode, ASHIFT, operands)) DONE; else FAIL;") + "expand_a_shift (SImode, ASHIFT, operands); DONE;") (define_expand "lshrsi3" [(set (match_operand:SI 0 "register_operand" "") (lshiftrt:SI (match_operand:SI 1 "general_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (SImode, LSHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (SImode, LSHIFTRT, operands); DONE;") (define_expand "ashrsi3" [(set (match_operand:SI 0 "register_operand" "") (ashiftrt:SI (match_operand:SI 1 "general_operand" "") (match_operand:QI 2 "nonmemory_operand" "")))] "" - "if (expand_a_shift (SImode, ASHIFTRT, operands)) DONE; else FAIL;") + "expand_a_shift (SImode, ASHIFTRT, operands); DONE;") (define_insn "" [(set (match_operand:SI 0 "register_operand" "=r,r") -- 2.30.2