Merge branch 'master' into merge-job
[deliverable/binutils-gdb.git] / ld / ldexp.c
index 4ca812e9b20c93fba004225864351f94f623bab1..1fda65d714836f12a8b2351d0c5162ca554d631a 100644 (file)
@@ -1,5 +1,5 @@
 /* This module handles expression trees.
-   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
    This file is part of the GNU Binutils.
@@ -30,6 +30,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 #include "bfdlink.h"
+#include "ctf-api.h"
 
 #include "ld.h"
 #include "ldmain.h"
@@ -198,7 +199,7 @@ new_abs (bfd_vma value)
 etree_type *
 exp_intop (bfd_vma value)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
+  etree_type *new_e = stat_alloc (sizeof (new_e->value));
   new_e->type.node_code = INT;
   new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
@@ -211,7 +212,7 @@ exp_intop (bfd_vma value)
 etree_type *
 exp_bigintop (bfd_vma value, char *str)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
+  etree_type *new_e = stat_alloc (sizeof (new_e->value));
   new_e->type.node_code = INT;
   new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
@@ -226,7 +227,7 @@ exp_bigintop (bfd_vma value, char *str)
 etree_type *
 exp_relop (asection *section, bfd_vma value)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->rel));
+  etree_type *new_e = stat_alloc (sizeof (new_e->rel));
   new_e->type.node_code = REL;
   new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
@@ -534,6 +535,7 @@ fold_binary (etree_type *tree)
      operand, binary.rhs is first operand.  */
   if (expld.result.valid_p && tree->type.node_code == SEGMENT_START)
     {
+      bfd_vma value = expld.result.value;
       const char *segment_name;
       segment_type *seg;
 
@@ -545,14 +547,16 @@ fold_binary (etree_type *tree)
          {
            if (!seg->used
                && config.magic_demand_paged
+               && config.maxpagesize != 0
                && (seg->value % config.maxpagesize) != 0)
              einfo (_("%P: warning: address of `%s' "
                       "isn't multiple of maximum page size\n"),
                     segment_name);
            seg->used = TRUE;
-           new_rel_from_abs (seg->value);
+           value = seg->value;
            break;
          }
+      new_rel_from_abs (value);
       return;
     }
 
@@ -689,6 +693,7 @@ fold_name (etree_type *tree)
   switch (tree->type.node_code)
     {
     case SIZEOF_HEADERS:
+      link_info.load_phdrs = 1;
       if (expld.phase != lang_first_phase_enum)
        {
          bfd_vma hdr_size = 0;
@@ -716,23 +721,6 @@ fold_name (etree_type *tree)
       break;
 
     case NAME:
-      if (expld.assign_name != NULL
-         && strcmp (expld.assign_name, tree->name.name) == 0)
-       {
-         /* Self-assignment is only allowed for absolute symbols
-            defined in a linker script.  */
-         h = bfd_wrapped_link_hash_lookup (link_info.output_bfd,
-                                           &link_info,
-                                           tree->name.name,
-                                           FALSE, FALSE, TRUE);
-         if (!(h != NULL
-               && (h->type == bfd_link_hash_defined
-                   || h->type == bfd_link_hash_defweak)
-               && h->u.def.section == bfd_abs_section_ptr
-               && (def = symbol_defined (tree->name.name)) != NULL
-               && def->iteration == (lang_statement_iteration & 255)))
-           expld.assign_name = NULL;
-       }
       if (tree->name.name[0] == '.' && tree->name.name[1] == 0)
        new_rel_from_abs (expld.dot);
       else
@@ -783,6 +771,18 @@ fold_name (etree_type *tree)
            expld.assign_src = h;
          else
            expld.assign_src = (struct bfd_link_hash_entry *) - 1;
+
+         /* Self-assignment is only allowed for absolute symbols
+            defined in a linker script.  */
+         if (expld.assign_name != NULL
+             && strcmp (expld.assign_name, tree->name.name) == 0
+             && !(h != NULL
+                  && (h->type == bfd_link_hash_defined
+                      || h->type == bfd_link_hash_defweak)
+                  && h->u.def.section == bfd_abs_section_ptr
+                  && (def = symbol_defined (tree->name.name)) != NULL
+                  && def->iteration == (lang_statement_iteration & 255)))
+           expld.assign_name = NULL;
        }
       break;
 
@@ -852,7 +852,8 @@ fold_name (etree_type *tree)
 
              if (tree->type.node_code == SIZEOF)
                val = (os->bfd_section->size
-                      / bfd_octets_per_byte (link_info.output_bfd));
+                      / bfd_octets_per_byte (link_info.output_bfd,
+                                             os->bfd_section));
              else
                val = (bfd_vma)1 << os->bfd_section->alignment_power;
 
@@ -865,34 +866,30 @@ fold_name (etree_type *tree)
 
     case LENGTH:
       {
-      if (expld.phase != lang_first_phase_enum)
-       {
-         lang_memory_region_type *mem;
-
-         mem = lang_memory_region_lookup (tree->name.name, FALSE);
-         if (mem != NULL)
-           new_number (mem->length);
-         else
-           einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
-                    " referenced in expression\n"),
-                  tree, tree->name.name);
-       }
+       lang_memory_region_type *mem;
+
+       mem = lang_memory_region_lookup (tree->name.name, FALSE);
+       if (mem != NULL)
+         new_number (mem->length);
+       else
+         einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
+                  " referenced in expression\n"),
+                tree, tree->name.name);
       }
       break;
 
     case ORIGIN:
-      if (expld.phase != lang_first_phase_enum)
-       {
-         lang_memory_region_type *mem;
-
-         mem = lang_memory_region_lookup (tree->name.name, FALSE);
-         if (mem != NULL)
-           new_rel_from_abs (mem->origin);
-         else
-           einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
-                    " referenced in expression\n"),
-                  tree, tree->name.name);
-       }
+      {
+       lang_memory_region_type *mem;
+
+       mem = lang_memory_region_lookup (tree->name.name, FALSE);
+       if (mem != NULL)
+         new_rel_from_abs (mem->origin);
+       else
+         einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
+                  " referenced in expression\n"),
+                tree, tree->name.name);
+      }
       break;
 
     case CONSTANT:
@@ -1154,7 +1151,8 @@ exp_fold_tree_1 (etree_type *tree)
             converted to absolute values, as is required by many
             expressions, until final section sizing is complete.  */
          if (expld.phase == lang_final_phase_enum
-              || expld.assign_name != NULL)
+             || expld.phase == lang_fixed_phase_enum
+             || expld.assign_name != NULL)
            {
              if (tree->type.node_class == etree_provide)
                tree->type.node_class = etree_provided;
@@ -1195,28 +1193,40 @@ exp_fold_tree_1 (etree_type *tree)
                        (&link_info, h, link_info.output_bfd,
                         expld.result.section, expld.result.value);
                    }
-                 h->type = bfd_link_hash_defined;
-                 h->u.def.value = expld.result.value;
-                 h->u.def.section = expld.result.section;
-                 h->linker_def = ! tree->assign.type.lineno;
-                 h->ldscript_def = 1;
-                 h->rel_from_abs = expld.rel_from_abs;
-                 if (tree->assign.hidden)
-                   bfd_link_hide_symbol (link_info.output_bfd,
-                                         &link_info, h);
-
-                 /* Copy the symbol type if this is an expression only
-                    referencing a single symbol.  (If the expression
-                    contains ternary conditions, ignoring symbols on
-                    false branches.)  */
-                 if (expld.assign_src != NULL
-                     && (expld.assign_src
-                         != (struct bfd_link_hash_entry *) -1))
-                   bfd_copy_link_hash_symbol_type (link_info.output_bfd, h,
-                                                   expld.assign_src);
+                 if (expld.phase == lang_fixed_phase_enum)
+                   {
+                     if (h->type == bfd_link_hash_defined)
+                       {
+                         expld.result.value = h->u.def.value;
+                         expld.result.section = h->u.def.section;
+                       }
+                   }
+                 else
+                   {
+                     h->type = bfd_link_hash_defined;
+                     h->u.def.value = expld.result.value;
+                     h->u.def.section = expld.result.section;
+                     h->linker_def = ! tree->assign.type.lineno;
+                     h->ldscript_def = 1;
+                     h->rel_from_abs = expld.rel_from_abs;
+                     if (tree->assign.hidden)
+                       bfd_link_hide_symbol (link_info.output_bfd,
+                                             &link_info, h);
+
+                     /* Copy the symbol type if this is an expression only
+                        referencing a single symbol.  (If the expression
+                        contains ternary conditions, ignoring symbols on
+                        false branches.)  */
+                     if (expld.assign_src != NULL
+                         && (expld.assign_src
+                             != (struct bfd_link_hash_entry *) -1))
+                       bfd_copy_link_hash_symbol_type (link_info.output_bfd,
+                                                       h, expld.assign_src);
+                   }
                }
            }
-         expld.assign_name = NULL;
+         if (expld.phase != lang_fixed_phase_enum)
+           expld.assign_name = NULL;
        }
       break;
 
@@ -1269,8 +1279,8 @@ exp_value_fold (etree_type *tree)
 etree_type *
 exp_binop (int code, etree_type *lhs, etree_type *rhs)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (MAX (sizeof (new_e->binary),
-                                                     sizeof (new_e->value)));
+  etree_type *new_e = stat_alloc (MAX (sizeof (new_e->binary),
+                                      sizeof (new_e->value)));
   new_e->type.node_code = code;
   new_e->type.filename = lhs->type.filename;
   new_e->type.lineno = lhs->type.lineno;
@@ -1289,8 +1299,8 @@ exp_binop (int code, etree_type *lhs, etree_type *rhs)
 etree_type *
 exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (MAX (sizeof (new_e->trinary),
-                                                     sizeof (new_e->value)));
+  etree_type *new_e = stat_alloc (MAX (sizeof (new_e->trinary),
+                                      sizeof (new_e->value)));
   new_e->type.node_code = code;
   new_e->type.filename = cond->type.filename;
   new_e->type.lineno = cond->type.lineno;
@@ -1308,8 +1318,8 @@ exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
 etree_type *
 exp_unop (int code, etree_type *child)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (MAX (sizeof (new_e->unary),
-                                                     sizeof (new_e->value)));
+  etree_type *new_e = stat_alloc (MAX (sizeof (new_e->unary),
+                                      sizeof (new_e->value)));
   new_e->unary.type.node_code = code;
   new_e->unary.type.filename = child->type.filename;
   new_e->unary.type.lineno = child->type.lineno;
@@ -1327,7 +1337,7 @@ exp_unop (int code, etree_type *child)
 etree_type *
 exp_nameop (int code, const char *name)
 {
-  etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->name));
+  etree_type *new_e = stat_alloc (sizeof (new_e->name));
 
   new_e->name.type.node_code = code;
   new_e->name.type.filename = ldlex_filename ();
@@ -1346,7 +1356,7 @@ exp_assop (const char *dst,
 {
   etree_type *n;
 
-  n = (etree_type *) stat_alloc (sizeof (n->assign));
+  n = stat_alloc (sizeof (n->assign));
   n->assign.type.node_code = '=';
   n->assign.type.filename = src->type.filename;
   n->assign.type.lineno = src->type.lineno;
@@ -1388,7 +1398,7 @@ exp_assert (etree_type *exp, const char *message)
 {
   etree_type *n;
 
-  n = (etree_type *) stat_alloc (sizeof (n->assert_s));
+  n = stat_alloc (sizeof (n->assert_s));
   n->assert_s.type.node_code = '!';
   n->assert_s.type.filename = exp->type.filename;
   n->assert_s.type.lineno = exp->type.lineno;
@@ -1523,10 +1533,26 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name)
   return def;
 }
 
+/* Return the smallest non-negative integer such that two raised to
+   that power is at least as large as the vma evaluated at TREE, if
+   TREE is a non-NULL expression that can be resolved.  If TREE is
+   NULL or cannot be resolved, return -1.  */
+
 int
-exp_get_value_int (etree_type *tree, int def, char *name)
+exp_get_power (etree_type *tree, char *name)
 {
-  return exp_get_vma (tree, def, name);
+  bfd_vma x = exp_get_vma (tree, -1, name);
+  bfd_vma p2;
+  int n;
+
+  if (x == (bfd_vma) -1)
+    return -1;
+
+  for (n = 0, p2 = 1; p2 < x; ++n, p2 <<= 1)
+    if (p2 == 0)
+      break;
+
+  return n;
 }
 
 fill_type *
This page took 0.031759 seconds and 4 git commands to generate.