From fc3d5f8865c2ae34913045460fc0c8a077209059 Mon Sep 17 00:00:00 2001 From: uros Date: Thu, 9 Sep 2010 10:36:10 +0000 Subject: [PATCH] * config/i386/predicates.md (ext_register_operand): Check that SUBREG_REG is really a register before looking for REGNO. (reg_not_xmm0_operand): Handle SUBREGs correctly. (nonimm_not_xmm0_operand): Call reg_not_xmm0_operand. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164071 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/predicates.md | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b815a39..c50575b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-09-09 Uros Bizjak + + * config/i386/predicates.md (ext_register_operand): Check that + SUBREG_REG is really a register before looking for REGNO. + (reg_not_xmm0_operand): Handle SUBREGs correctly. + (nonimm_not_xmm0_operand): Call reg_not_xmm0_operand. + 2010-09-09 Jakub Jelinek * rtl.def (DEBUG_IMPLICIT_PTR): New rtl code. diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md index 8fe0f34..56a92bd 100644 --- a/gcc/config/i386/predicates.md +++ b/gcc/config/i386/predicates.md @@ -68,7 +68,8 @@ op = SUBREG_REG (op); /* Be careful to accept only registers having upper parts. */ - return REGNO (op) > LAST_VIRTUAL_REGISTER || REGNO (op) <= BX_REG; + return (REG_P (op) + && (REGNO (op) > LAST_VIRTUAL_REGISTER || REGNO (op) <= BX_REG)); }) ;; Return true if op is the AX register. @@ -97,13 +98,18 @@ ;; Return true if op is not xmm0 register. (define_predicate "reg_not_xmm0_operand" - (and (match_operand 0 "register_operand") - (match_test "REGNO (op) != FIRST_SSE_REG"))) + (match_operand 0 "register_operand") +{ + if (GET_CODE (op) == SUBREG) + op = SUBREG_REG (op); + + return !REG_P (op) || REGNO (op) != FIRST_SSE_REG; +}) ;; As above, but allow nonimmediate operands. (define_predicate "nonimm_not_xmm0_operand" - (ior (match_operand 0 "memory_operand") - (match_operand 0 "reg_not_xmm0_operand"))) + (ior (match_operand 0 "memory_operand") + (match_operand 0 "reg_not_xmm0_operand"))) ;; Return true if VALUE can be stored in a sign extended immediate field. (define_predicate "x86_64_immediate_operand" -- 2.7.4