diff options
Diffstat (limited to 'gcc/combine.c')
| -rw-r--r-- | gcc/combine.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/gcc/combine.c b/gcc/combine.c index d6dfdf6..8ce9d10 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -3519,15 +3519,13 @@ subst (x, from, to, in_dest, unique_copy) ) return gen_rtx_CLOBBER (VOIDmode, const0_rtx); -#ifdef CLASS_CANNOT_CHANGE_MODE +#ifdef CANNOT_CHANGE_MODE_CLASS if (code == SUBREG && GET_CODE (to) == REG && REGNO (to) < FIRST_PSEUDO_REGISTER - && (TEST_HARD_REG_BIT - (reg_class_contents[(int) CLASS_CANNOT_CHANGE_MODE], - REGNO (to))) - && CLASS_CANNOT_CHANGE_MODE_P (GET_MODE (to), - GET_MODE (x))) + && REG_CANNOT_CHANGE_MODE_P (REGNO (to), + GET_MODE (to), + GET_MODE (x))) return gen_rtx_CLOBBER (VOIDmode, const0_rtx); #endif @@ -5198,13 +5196,11 @@ simplify_set (x) && (GET_MODE_SIZE (GET_MODE (src)) < GET_MODE_SIZE (GET_MODE (SUBREG_REG (src)))) #endif -#ifdef CLASS_CANNOT_CHANGE_MODE +#ifdef CANNOT_CHANGE_MODE_CLASS && ! (GET_CODE (dest) == REG && REGNO (dest) < FIRST_PSEUDO_REGISTER - && (TEST_HARD_REG_BIT - (reg_class_contents[(int) CLASS_CANNOT_CHANGE_MODE], - REGNO (dest))) - && CLASS_CANNOT_CHANGE_MODE_P (GET_MODE (src), - GET_MODE (SUBREG_REG (src)))) + && REG_CANNOT_CHANGE_MODE_P (REGNO (dest), + GET_MODE (src), + GET_MODE (SUBREG_REG (src)))) #endif && (GET_CODE (dest) == REG || (GET_CODE (dest) == SUBREG @@ -9937,14 +9933,13 @@ gen_lowpart_for_combine (mode, x) } result = gen_lowpart_common (mode, x); -#ifdef CLASS_CANNOT_CHANGE_MODE +#ifdef CANNOT_CHANGE_MODE_CLASS if (result != 0 && GET_CODE (result) == SUBREG && GET_CODE (SUBREG_REG (result)) == REG - && REGNO (SUBREG_REG (result)) >= FIRST_PSEUDO_REGISTER - && CLASS_CANNOT_CHANGE_MODE_P (GET_MODE (result), - GET_MODE (SUBREG_REG (result)))) - REG_CHANGES_MODE (REGNO (SUBREG_REG (result))) = 1; + && REGNO (SUBREG_REG (result)) >= FIRST_PSEUDO_REGISTER) + SET_REGNO_REG_SET (&subregs_of_mode[GET_MODE (result)], + REGNO (SUBREG_REG (result))); #endif if (result) |