[AArch64][obvious] In aarch64_class_max_nregs use UNITS_PER_VREG and UNITS_PER_WORD

	* config/aarch64/aarch64.c (aarch64_class_max_nregs):
	Use UNITS_PER_VREG and UNITS_PER_WORD instead of their direct
	values.

From-SVN: r223439

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ef04cb266577089c91ebcb578c12997c696a71b..af353faa875405f95e48656482c08754afdca833 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-20  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * config/aarch64/aarch64.c (aarch64_class_max_nregs):
+       Use UNITS_PER_VREG and UNITS_PER_WORD instead of their direct
+       values.
+
 2015-05-20  Robert Suchanek  <robert.suchanek@imgtec.com>
 
        * config/mips/mips.h (micromips_globals): Declare.

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 6f71e6649d6f80a1c504990021cd7c434bf0d7be..8c25d759f7afbcc0f47ce0eecb01aa138bbf4b08 100644 (file)
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -4922,8 +4922,9 @@ aarch64_class_max_nregs (reg_class_t regclass, machine_mode mode)
     case FP_REGS:
     case FP_LO_REGS:
       return
-       aarch64_vector_mode_p (mode) ? (GET_MODE_SIZE (mode) + 15) / 16 :
-                                      (GET_MODE_SIZE (mode) + 7) / 8;
+       aarch64_vector_mode_p (mode)
+         ? (GET_MODE_SIZE (mode) + UNITS_PER_VREG - 1) / UNITS_PER_VREG
+         : (GET_MODE_SIZE (mode) + UNITS_PER_WORD - 1) / UNITS_PER_WORD;
     case STACK_REG:
       return 1;