git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 Upstream-Status: Inappropriate [Backport]
   2 From 6f57329da3c7308ccf6b1740ead898d668ec24f9 Mon Sep 17 00:00:00 2001
   3 From: krebbel <krebbel@138bc75d-0d04-0410-961f-82ee72b054a4>
   4 Date: Tue, 29 Mar 2011 11:57:40 +0000
   5 Subject: [PATCH 019/200] 2011-03-29  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
   6
   7         * config/s390/s390.c (s390_preferred_reload_class): Return NO_REGS
   8         for invalid symbolic addresses.
   9         (s390_secondary_reload): Don't use s390_check_symref_alignment for
  10         larl operands.
  11
  12
  13
  14 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171658 138bc75d-0d04-0410-961f-82ee72b054a4
  15
  16 index 5165e87..c1bb234 100644
  17 --- a/gcc/config/s390/s390.c
  18 +++ b/gcc/config/s390/s390.c
  19 @@ -3011,14 +3011,20 @@ s390_preferred_reload_class (rtx op, reg_class_t rclass)
  20          it is most likely being used as an address, so
  21          prefer ADDR_REGS.  If 'class' is not a superset
  22          of ADDR_REGS, e.g. FP_REGS, reject this reload.  */
  23 -      case PLUS:
  24        case LABEL_REF:
  25        case SYMBOL_REF:
  26        case CONST:
  27 -       if (reg_class_subset_p (ADDR_REGS, rclass))
  28 +       if (reg_class_subset_p (ADDR_REGS, rclass)
  29 +           && legitimate_reload_constant_p (op))
  30            return ADDR_REGS;
  31         else
  32           return NO_REGS;
  33 +      case PLUS:
  34 +       /* load address will be used for this reload.  */
  35 +       if (reg_class_subset_p (ADDR_REGS, rclass))
  36 +         return ADDR_REGS;
  37 +       else
  38 +         return NO_REGS;
  39
  40        default:
  41         break;
  42 @@ -3134,12 +3140,16 @@ s390_secondary_reload (bool in_p, rtx x, reg_class_t rclass_i,
  43
  44    if (TARGET_Z10)
  45      {
  46 +      HOST_WIDE_INT offset;
  47 +      rtx symref;
  48 +
  49        /* On z10 several optimizer steps may generate larl operands with
  50          an odd addend.  */
  51        if (in_p
  52 -         && s390_symref_operand_p (x, NULL, NULL)
  53 +         && s390_symref_operand_p (x, &symref, &offset)
  54           && mode == Pmode
  55 -         && !s390_check_symref_alignment (x, 2))
  56 +         && !SYMBOL_REF_ALIGN1_P (symref)
  57 +         && (offset & 1) == 1)
  58         sri->icode = ((mode == DImode) ? CODE_FOR_reloaddi_larl_odd_addend_z10
  59                       : CODE_FOR_reloadsi_larl_odd_addend_z10);
  60
  61 --
  62 1.7.0.4
  63