From c331eabed629d872f9e5d8e1295905ec0aabde63 Mon Sep 17 00:00:00 2001 From: Georg-Johann Lay Date: Thu, 25 Aug 2011 13:51:38 +0000 Subject: [PATCH] avr-protos.h (byte_immediate_operand): Remove Prototype. * config/avr-protos.h (byte_immediate_operand): Remove Prototype. (secondary_input_reload_class): Remove Prototype. * config/avr/avr.c (byte_immediate_operand): Remove Function. * config/avr/avr.md (setmemhi): Use u8_operand. (strlenhi): Use const0_rtx for comparison. * config/avr/avr.h (avr_reg_order): Remove Declaration. From-SVN: r178064 --- gcc/ChangeLog | 9 +++++++++ gcc/config/avr/avr-protos.h | 4 ---- gcc/config/avr/avr.h | 2 -- gcc/config/avr/avr.md | 8 +++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73ac31982ea..e24202f913a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-08-25 Georg-Johann Lay + + * config/avr-protos.h (byte_immediate_operand): Remove Prototype. + (secondary_input_reload_class): Remove Prototype. + * config/avr/avr.c (byte_immediate_operand): Remove Function. + * config/avr/avr.md (setmemhi): Use u8_operand. + (strlenhi): Use const0_rtx for comparison. + * config/avr/avr.h (avr_reg_order): Remove Declaration. + 2011-08-25 Georg-Johann Lay * config/avr/avr.c (reg_class_tab): Make local to diff --git a/gcc/config/avr/avr-protos.h b/gcc/config/avr/avr-protos.h index 9b95caa0111..ba7da70d1e8 100644 --- a/gcc/config/avr/avr-protos.h +++ b/gcc/config/avr/avr-protos.h @@ -86,16 +86,12 @@ extern int extra_constraint_Q (rtx x); extern int adjust_insn_length (rtx insn, int len); extern const char *output_reload_inhi (rtx insn, rtx *operands, int *len); extern const char *output_reload_insisf (rtx insn, rtx *operands, rtx clobber, int *len); -extern enum reg_class secondary_input_reload_class (enum reg_class, - enum machine_mode, - rtx); extern void notice_update_cc (rtx body, rtx insn); extern void print_operand (FILE *file, rtx x, int code); extern void print_operand_address (FILE *file, rtx addr); extern int reg_unused_after (rtx insn, rtx reg); extern int _reg_unused_after (rtx insn, rtx reg); extern int avr_jump_mode (rtx x, rtx insn); -extern int byte_immediate_operand (rtx op, enum machine_mode mode); extern int test_hard_reg_class (enum reg_class rclass, rtx x); extern int jump_over_one_insn_p (rtx insn, rtx dest); diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index ebf8290866a..2af94030f59 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -376,8 +376,6 @@ typedef struct avr_args { #define FUNCTION_ARG_REGNO_P(r) function_arg_regno_p(r) -extern int avr_reg_order[]; - #define DEFAULT_PCC_STRUCT_RETURN 0 #define EPILOGUE_USES(REGNO) avr_epilogue_uses(REGNO) diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md index 7163099b2c5..c120afdb026 100644 --- a/gcc/config/avr/avr.md +++ b/gcc/config/avr/avr.md @@ -591,18 +591,16 @@ "" "{ rtx addr0; - int cnt8; enum machine_mode mode; /* If value to set is not zero, use the library routine. */ if (operands[2] != const0_rtx) FAIL; - if (GET_CODE (operands[1]) != CONST_INT) + if (!CONST_INT_P (operands[1])) FAIL; - cnt8 = byte_immediate_operand (operands[1], GET_MODE (operands[1])); - mode = cnt8 ? QImode : HImode; + mode = u8_operand (operands[1], VOIDmode) ? QImode : HImode; operands[5] = gen_rtx_SCRATCH (mode); operands[1] = copy_to_mode_reg (mode, gen_int_mode (INTVAL (operands[1]), mode)); @@ -660,7 +658,7 @@ "" "{ rtx addr; - if (! (GET_CODE (operands[2]) == CONST_INT && INTVAL (operands[2]) == 0)) + if (operands[2] != const0_rtx) FAIL; addr = copy_to_mode_reg (Pmode, XEXP (operands[1],0)); operands[1] = gen_rtx_MEM (BLKmode, addr);