From 60a4dfd65e3918679ea74e1b27265e68daef2d8d Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 27 Apr 2015 13:25:56 +0000 Subject: [PATCH] predicates.md (xs_hi_general_operand): Delete. gcc/ * config/stormy16/predicates.md (xs_hi_general_operand): Delete. (xs_hi_nonmemory_operand): Remove error. * config/stormy16/stormy16.md (movhi, movhi_internal): Use general_operand rather than xs_hi_general_operand. From-SVN: r222464 --- gcc/ChangeLog | 7 +++++++ gcc/config/stormy16/predicates.md | 20 -------------------- gcc/config/stormy16/stormy16.md | 4 ++-- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f76eb645fd..07bbbce0097 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-04-27 Richard Sandiford + + * config/stormy16/predicates.md (xs_hi_general_operand): Delete. + (xs_hi_nonmemory_operand): Remove error. + * config/stormy16/stormy16.md (movhi, movhi_internal): Use + general_operand rather than xs_hi_general_operand. + 2015-04-27 Richard Biener * tree-ssa-dom.c (record_equivalences_from_phis): Valueize PHI arg. diff --git a/gcc/config/stormy16/predicates.md b/gcc/config/stormy16/predicates.md index bbfb3a45481..dea620f5c63 100644 --- a/gcc/config/stormy16/predicates.md +++ b/gcc/config/stormy16/predicates.md @@ -151,28 +151,8 @@ && (INTVAL (XEXP (op, 1)) < -4 || INTVAL (XEXP (op, 1)) > 4)); }) -(define_predicate "xs_hi_general_operand" - (match_code "const_int,reg,subreg,mem,symbol_ref,label_ref,const") -{ - if ((GET_CODE (op) == CONST_INT) - && ((INTVAL (op) >= 32768) || (INTVAL (op) < -32768))) - { - error ("constant halfword load operand out of range"); - return false; - } - - return general_operand (op, mode); -}) - (define_predicate "xs_hi_nonmemory_operand" (match_code "const_int,reg,subreg,const") { - if ((GET_CODE (op) == CONST_INT) - && ((INTVAL (op) >= 32768) || (INTVAL (op) < -32768))) - { - error ("constant arithmetic operand out of range"); - return false; - } - return nonmemory_operand (op, mode); }) diff --git a/gcc/config/stormy16/stormy16.md b/gcc/config/stormy16/stormy16.md index 905c6a72f97..4e13fbb4dcc 100644 --- a/gcc/config/stormy16/stormy16.md +++ b/gcc/config/stormy16/stormy16.md @@ -185,7 +185,7 @@ (define_expand "movhi" [(set (match_operand:HI 0 "nonimmediate_nonstack_operand" "") - (match_operand:HI 1 "xs_hi_general_operand" ""))] + (match_operand:HI 1 "general_operand" ""))] "" { xstormy16_expand_move (HImode, operands[0], operands[1]); DONE; @@ -193,7 +193,7 @@ (define_insn "movhi_internal" [(set (match_operand:HI 0 "nonimmediate_nonstack_operand" "=r,m,e,e,T,r,S,W,e") - (match_operand:HI 1 "xs_hi_general_operand" "r,e,m,L,L,i,i,ie,W"))] + (match_operand:HI 1 "general_operand" "r,e,m,L,L,i,i,ie,W"))] "" "@ mov %0,%1