PR ld/2874
[deliverable/binutils-gdb.git] / ld / ldexp.c
index 5b8581f0aef0ae96a7b29834edab90e88f40b3be..0c7a9b0e68bdb1acf51395f3c92a73dca6e2d278 100644 (file)
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-
-This file is part of GLD, the Gnu Linker.
-
-GLD is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-GLD is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GLD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
-   $Id$ 
-
-   $Log$
-   Revision 1.1  1991/03/21 21:28:34  gumby
-   Initial revision
-
- * Revision 1.1  1991/03/13  00:48:16  chrisb
- * Initial revision
- *
- * Revision 1.6  1991/03/10  09:31:22  rich
- *  Modified Files:
- *     Makefile config.h ld-emul.c ld-emul.h ld-gld.c ld-gld960.c
- *     ld-lnk960.c ld.h lddigest.c ldexp.c ldexp.h ldfile.c ldfile.h
- *     ldgram.y ldinfo.h ldlang.c ldlang.h ldlex.h ldlex.l ldmain.c
- *     ldmain.h ldmisc.c ldmisc.h ldsym.c ldsym.h ldversion.c
- *     ldversion.h ldwarn.h ldwrite.c ldwrite.h y.tab.h
- *
- * As of this round of changes, ld now builds on all hosts of (Intel960)
- * interest and copy passes my copy test on big endian hosts again.
- *
- * Revision 1.5  1991/03/09  03:25:04  sac
- * Added support for LONG, SHORT and BYTE keywords in scripts
- *
- * Revision 1.4  1991/03/06  02:27:15  sac
- * Added LONG, SHORT and BYTE keywords
- *
- * Revision 1.3  1991/02/22  17:14:59  sac
- * Added RCS keywords and copyrights
- *
-*/
-
-/*
- * Written by Steve Chamberlain
- * steve@cygnus.com
- *
- * This module handles expression trees.
- */
+/* This module handles expression trees.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
+   This file is part of GLD, the Gnu Linker.
+
+   GLD is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GLD is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GLD; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* This module is in charge of working out the contents of expressions.
+
+   It has to keep track of the relative/absness of a symbol etc. This
+   is done by keeping all values in a struct (an etree_value_type)
+   which contains a value, a section to which it is relative and a
+   valid bit.  */
 
-#include "sysdep.h"
 #include "bfd.h"
+#include "sysdep.h"
+#include "bfdlink.h"
 
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"
 #include "ldexp.h"
-#include "ldgram.tab.h"
-#include "ldsym.h"
+#include <ldgram.h>
 #include "ldlang.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
 
-extern char *output_filename;
-extern unsigned int undefined_global_sym_count;
-extern unsigned int defined_global_sym_count;
-extern bfd *output_bfd;
-extern size_t largest_section;
-extern lang_statement_list_type file_chain;
-extern args_type command_line;
-extern ld_config_type config;
+static void exp_fold_tree_1 (etree_type *);
+static void exp_fold_tree_no_dot (etree_type *);
+static bfd_vma align_n (bfd_vma, bfd_vma);
 
-extern lang_input_statement_type *script_file;
-extern unsigned int defined_global_sym_count;
+segment_type *segments;
 
-extern bfd_vma print_dot;
+struct ldexp_control expld;
 
+/* Print the string representation of the given token.  Surround it
+   with spaces if INFIX_P is TRUE.  */
 
 static void
-exp_print_token(outfile, code)
-FILE *outfile;
-token_code_type code;
+exp_print_token (token_code_type code, int infix_p)
 {
-  static struct  {
+  static const struct
+  {
     token_code_type code;
-    char *name;
-  } table[] =
-    {
-      INT,     "int",
-      CHAR,"char",
-      NAME,"NAME",
-      PLUSEQ,"+=",
-      MINUSEQ,"-=",
-      MULTEQ,"*=",
-      DIVEQ,"/=",
-      LSHIFTEQ,"<<=",
-      RSHIFTEQ,">>=",
-      ANDEQ,"&=",
-      OREQ,"|=",
-      OROR,"||",
-      ANDAND,"&&",
-      EQ,"==",
-      NE,"!=",
-      LE,"<=",
-      GE,">=",
-      LSHIFT,"<<",
-      RSHIFT,">>=",
-      ALIGN_K,"ALIGN",
-      BLOCK,"BLOCK",
-      SECTIONS,"SECTIONS",
-      ALIGNMENT,"ALIGNMENT",
-      SIZEOF_HEADERS,"SIZEOF_HEADERS",
-      NEXT,"NEXT",
-      SIZEOF,"SIZEOF",
-      ADDR,"ADDR",
-      MEMORY,"MEMORY",
-      DSECT,"DSECT",
-      NOLOAD,"NOLOAD",
-      COPY,"COPY",
-      INFO,"INFO",
-      OVERLAY,"OVERLAY",
-      DEFINED,"DEFINED",
-      TARGET_K,"TARGET",
-      SEARCH_DIR,"SEARCH_DIR",
-      MAP,"MAP",
-      LONG,"LONG",
-      SHORT,"SHORT",
-      BYTE,"BYTE",
-      ENTRY,"ENTRY",
-    0,(char *)NULL} ;
+    char * name;
+  }
+  table[] =
+  {
+    { INT, "int" },
+    { NAME, "NAME" },
+    { PLUSEQ, "+=" },
+    { MINUSEQ, "-=" },
+    { MULTEQ, "*=" },
+    { DIVEQ, "/=" },
+    { LSHIFTEQ, "<<=" },
+    { RSHIFTEQ, ">>=" },
+    { ANDEQ, "&=" },
+    { OREQ, "|=" },
+    { OROR, "||" },
+    { ANDAND, "&&" },
+    { EQ, "==" },
+    { NE, "!=" },
+    { LE, "<=" },
+    { GE, ">=" },
+    { LSHIFT, "<<" },
+    { RSHIFT, ">>" },
+    { ALIGN_K, "ALIGN" },
+    { BLOCK, "BLOCK" },
+    { QUAD, "QUAD" },
+    { SQUAD, "SQUAD" },
+    { LONG, "LONG" },
+    { SHORT, "SHORT" },
+    { BYTE, "BYTE" },
+    { SECTIONS, "SECTIONS" },
+    { SIZEOF_HEADERS, "SIZEOF_HEADERS" },
+    { MEMORY, "MEMORY" },
+    { DEFINED, "DEFINED" },
+    { TARGET_K, "TARGET" },
+    { SEARCH_DIR, "SEARCH_DIR" },
+    { MAP, "MAP" },
+    { ENTRY, "ENTRY" },
+    { NEXT, "NEXT" },
+    { SIZEOF, "SIZEOF" },
+    { ADDR, "ADDR" },
+    { LOADADDR, "LOADADDR" },
+    { CONSTANT, "CONSTANT" },
+    { MAX_K, "MAX_K" },
+    { REL, "relocatable" },
+    { DATA_SEGMENT_ALIGN, "DATA_SEGMENT_ALIGN" },
+    { DATA_SEGMENT_RELRO_END, "DATA_SEGMENT_RELRO_END" },
+    { DATA_SEGMENT_END, "DATA_SEGMENT_END" },
+    { ORIGIN, "ORIGIN" },
+    { LENGTH, "LENGTH" },
+    { SEGMENT_START, "SEGMENT_START" }
+  };
+  unsigned int idx;
 
+  for (idx = 0; idx < ARRAY_SIZE (table); idx++)
+    if (table[idx].code == code)
+      break;
 
+  if (infix_p)
+    fputc (' ', config.map_file);
 
-  unsigned int idx;
-  for (idx = 0; table[idx].name != (char*)NULL; idx++) {
-    if (table[idx].code == code) {
-      fprintf(outfile, "%s", table[idx].name);
-      return;
-    }
-  }
-  /* Not in table, just print it alone */
-  fprintf(outfile, "%c",code);
+  if (idx < ARRAY_SIZE (table))
+    fputs (table[idx].name, config.map_file);
+  else if (code < 127)
+    fputc (code, config.map_file);
+  else
+    fprintf (config.map_file, "<code %d>", code);
+
+  if (infix_p)
+    fputc (' ', config.map_file);
 }
 
-static void 
-make_abs(ptr)
-etree_value_type *ptr;
+static void
+make_abs (void)
 {
-  if (ptr->section != (lang_output_section_statement_type *)NULL) {
-    asection *s = ptr->section->bfd_section;
-    ptr->value += s->vma;
-    ptr->section = (lang_output_section_statement_type *)NULL;
-  }
-
+  expld.result.value += expld.result.section->vma;
+  expld.result.section = bfd_abs_section_ptr;
 }
-static
-etree_value_type new_abs(value)
-bfd_vma value;
+
+static void
+new_abs (bfd_vma value)
 {
-  etree_value_type new;
-  new.valid = true;
-  new.section = (lang_output_section_statement_type *)NULL;
-  new.value = value;
-  return new;
+  expld.result.valid_p = TRUE;
+  expld.result.section = bfd_abs_section_ptr;
+  expld.result.value = value;
+  expld.result.str = NULL;
 }
 
-static void check(os)
-lang_output_section_statement_type *os;
+etree_type *
+exp_intop (bfd_vma value)
 {
-  if (os == (lang_output_section_statement_type *)NULL) {
-    info("%F%P undefined section");
-  }
-  if (os->processed == false) {
-    info("%F%P forward reference of section");
-  }
+  etree_type *new = stat_alloc (sizeof (new->value));
+  new->type.node_code = INT;
+  new->value.value = value;
+  new->value.str = NULL;
+  new->type.node_class = etree_value;
+  return new;
 }
 
-etree_type *exp_intop(value)
-bfd_vma value;
+etree_type *
+exp_bigintop (bfd_vma value, char *str)
 {
-  etree_type *new = (etree_type *)ldmalloc(sizeof(new->value));
+  etree_type *new = stat_alloc (sizeof (new->value));
   new->type.node_code = INT;
   new->value.value = value;
+  new->value.str = str;
   new->type.node_class = etree_value;
   return new;
-
 }
 
+/* Build an expression representing an unnamed relocatable value.  */
 
-static
-etree_value_type new_rel(value, section)
-bfd_vma value;
-lang_output_section_statement_type *section;
+etree_type *
+exp_relop (asection *section, bfd_vma value)
 {
-  etree_value_type new;
-  new.valid = true;
-  new.value = value;
-  new.section = section;
+  etree_type *new = stat_alloc (sizeof (new->rel));
+  new->type.node_code = REL;
+  new->type.node_class = etree_rel;
+  new->rel.section = section;
+  new->rel.value = value;
   return new;
 }
 
-static
-etree_value_type new_rel_from_section(value, section)
-bfd_vma value;
-lang_output_section_statement_type *section;
+static void
+new_rel (bfd_vma value, char *str, asection *section)
+{
+  expld.result.valid_p = TRUE;
+  expld.result.value = value;
+  expld.result.str = str;
+  expld.result.section = section;
+}
+
+static void
+new_rel_from_abs (bfd_vma value)
 {
-  etree_value_type new;
-  new.valid = true;
-  new.value = value;
-  new.section = section;
-  if (new.section != (lang_output_section_statement_type *)NULL) {
-    new.value -= section->bfd_section->vma;
-  }
-  return new;
+  expld.result.valid_p = TRUE;
+  expld.result.value = value - expld.section->vma;
+  expld.result.str = NULL;
+  expld.result.section = expld.section;
 }
 
-static etree_value_type 
-fold_binary(tree, current_section, allocation_done, dot, dotp)
-etree_type *tree;
-lang_output_section_statement_type *current_section;
-lang_phase_type  allocation_done;
-bfd_vma dot;
-bfd_vma *dotp;
+static void
+fold_unary (etree_type *tree)
 {
-  etree_value_type result;
-
-  result =  exp_fold_tree(tree->binary.lhs,  current_section,
-                         allocation_done, dot, dotp);
-  if (result.valid) {
-    etree_value_type other;
-    other = exp_fold_tree(tree->binary.rhs,
-                         current_section,
-                         allocation_done, dot,dotp) ;
-    if (other.valid) {
-       /* If values are from different sections, or this is an */
-       /* absolute expression, make both source args absolute */
-      if (result.section !=  other.section ||
-         current_section == (lang_output_section_statement_type *)NULL) {
-
-       make_abs(&result);
-       make_abs(&other);
-      }
-         
-      switch (tree->type.node_code) 
+  exp_fold_tree_1 (tree->unary.child);
+  if (expld.result.valid_p)
+    {
+      switch (tree->type.node_code)
        {
-       case '%':
-         /* Mod,  both absolule*/
+       case ALIGN_K:
+         if (expld.phase != lang_first_phase_enum)
+           new_rel_from_abs (align_n (expld.dot, expld.result.value));
+         else
+           expld.result.valid_p = FALSE;
+         break;
 
-         if (other.value == 0) {
-           info("%F%S % by zero\n");
-         }
-         result.value %= other.value;
+       case ABSOLUTE:
+         make_abs ();
          break;
-       case '/':
-         if (other.value == 0) {
-           info("%F%S / by zero\n");
-         }
-         result.value /= other.value;
+
+       case '~':
+         make_abs ();
+         expld.result.value = ~expld.result.value;
+         break;
+
+       case '!':
+         make_abs ();
+         expld.result.value = !expld.result.value;
+         break;
+
+       case '-':
+         make_abs ();
+         expld.result.value = -expld.result.value;
          break;
-#define BOP(x,y) case x : result.value = result.value y other.value;break;
-         BOP('+',+);
-         BOP('*',*);
-         BOP('-',-);
-         BOP(LSHIFT,<<);
-         BOP(RSHIFT,>>);
-         BOP(EQ,==);
-         BOP(NE,!=);
-         BOP('<',<);
-         BOP('>',>);
-         BOP(LE,<=);
-         BOP(GE,>=);
-         BOP('&',&);
-         BOP('^',^);
-         BOP('|',|);
-         BOP(ANDAND,&&);
-         BOP(OROR,||);
+
+       case NEXT:
+         /* Return next place aligned to value.  */
+         if (expld.phase != lang_first_phase_enum)
+           {
+             make_abs ();
+             expld.result.value = align_n (expld.dot, expld.result.value);
+           }
+         else
+           expld.result.valid_p = FALSE;
+         break;
+
+       case DATA_SEGMENT_END:
+         if (expld.phase != lang_first_phase_enum
+             && expld.section == bfd_abs_section_ptr
+             && (expld.dataseg.phase == exp_dataseg_align_seen
+                 || expld.dataseg.phase == exp_dataseg_relro_seen
+                 || expld.dataseg.phase == exp_dataseg_adjust
+                 || expld.dataseg.phase == exp_dataseg_relro_adjust
+                 || expld.phase == lang_final_phase_enum))
+           {
+             if (expld.dataseg.phase == exp_dataseg_align_seen
+                 || expld.dataseg.phase == exp_dataseg_relro_seen)
+               {
+                 expld.dataseg.phase = exp_dataseg_end_seen;
+                 expld.dataseg.end = expld.result.value;
+               }
+           }
+         else
+           expld.result.valid_p = FALSE;
+         break;
+
        default:
-         FAIL();
+         FAIL ();
+         break;
        }
     }
-  }
-  return result;
 }
-etree_value_type invalid()
+
+static void
+fold_binary (etree_type *tree)
 {
-  etree_value_type new;
-  new.valid = false;
-  return new;
+  exp_fold_tree_1 (tree->binary.lhs);
+
+  /* The SEGMENT_START operator is special because its first
+     operand is a string, not the name of a symbol.  */
+  if (expld.result.valid_p && tree->type.node_code == SEGMENT_START)
+    {
+      const char *segment_name;
+      segment_type *seg;
+      /* Check to see if the user has overridden the default
+        value.  */
+      segment_name = tree->binary.rhs->name.name;
+      for (seg = segments; seg; seg = seg->next) 
+       if (strcmp (seg->name, segment_name) == 0)
+         {
+           seg->used = TRUE;
+           expld.result.value = seg->value;
+           expld.result.str = NULL;
+           expld.result.section = NULL;
+           break;
+         }
+    }
+  else if (expld.result.valid_p)
+    {
+      etree_value_type lhs = expld.result;
+
+      exp_fold_tree_1 (tree->binary.rhs);
+      if (expld.result.valid_p)
+       {
+         /* If the values are from different sections, or this is an
+            absolute expression, make both the source arguments
+            absolute.  However, adding or subtracting an absolute
+            value from a relative value is meaningful, and is an
+            exception.  */
+         if (expld.section != bfd_abs_section_ptr
+             && lhs.section == bfd_abs_section_ptr
+             && tree->type.node_code == '+')
+           {
+             /* Keep the section of the rhs term.  */
+             expld.result.value = lhs.value + expld.result.value;
+             return;
+           }
+         else if (expld.section != bfd_abs_section_ptr
+             && expld.result.section == bfd_abs_section_ptr
+             && (tree->type.node_code == '+'
+                 || tree->type.node_code == '-'))
+           {
+             /* Keep the section of the lhs term.  */
+             expld.result.section = lhs.section;
+           }
+         else if (expld.result.section != lhs.section
+                  || expld.section == bfd_abs_section_ptr)
+           {
+             make_abs ();
+             lhs.value += lhs.section->vma;
+           }
+
+         switch (tree->type.node_code)
+           {
+           case '%':
+             if (expld.result.value != 0)
+               expld.result.value = ((bfd_signed_vma) lhs.value
+                                     % (bfd_signed_vma) expld.result.value);
+             else if (expld.phase != lang_mark_phase_enum)
+               einfo (_("%F%S %% by zero\n"));
+             break;
+
+           case '/':
+             if (expld.result.value != 0)
+               expld.result.value = ((bfd_signed_vma) lhs.value
+                                     / (bfd_signed_vma) expld.result.value);
+             else if (expld.phase != lang_mark_phase_enum)
+               einfo (_("%F%S / by zero\n"));
+             break;
+
+#define BOP(x, y) \
+           case x:                                                     \
+             expld.result.value = lhs.value y expld.result.value;      \
+             break;
+
+             BOP ('+', +);
+             BOP ('*', *);
+             BOP ('-', -);
+             BOP (LSHIFT, <<);
+             BOP (RSHIFT, >>);
+             BOP (EQ, ==);
+             BOP (NE, !=);
+             BOP ('<', <);
+             BOP ('>', >);
+             BOP (LE, <=);
+             BOP (GE, >=);
+             BOP ('&', &);
+             BOP ('^', ^);
+             BOP ('|', |);
+             BOP (ANDAND, &&);
+             BOP (OROR, ||);
+
+           case MAX_K:
+             if (lhs.value > expld.result.value)
+               expld.result.value = lhs.value;
+             break;
+
+           case MIN_K:
+             if (lhs.value < expld.result.value)
+               expld.result.value = lhs.value;
+             break;
+
+           case ALIGN_K:
+             expld.result.value = align_n (lhs.value, expld.result.value);
+             break;
+
+           case DATA_SEGMENT_ALIGN:
+             if (expld.phase != lang_first_phase_enum
+                 && expld.section == bfd_abs_section_ptr
+                 && (expld.dataseg.phase == exp_dataseg_none
+                     || expld.dataseg.phase == exp_dataseg_adjust
+                     || expld.dataseg.phase == exp_dataseg_relro_adjust
+                     || expld.phase == lang_final_phase_enum))
+               {
+                 bfd_vma maxpage = lhs.value;
+                 bfd_vma commonpage = expld.result.value;
+
+                 expld.result.value = align_n (expld.dot, maxpage);
+                 if (expld.dataseg.phase == exp_dataseg_relro_adjust)
+                   expld.result.value = expld.dataseg.base;
+                 else if (expld.dataseg.phase != exp_dataseg_adjust)
+                   {
+                     expld.result.value += expld.dot & (maxpage - 1);
+                     if (expld.phase == lang_allocating_phase_enum)
+                       {
+                         expld.dataseg.phase = exp_dataseg_align_seen;
+                         expld.dataseg.min_base = align_n (expld.dot, maxpage);
+                         expld.dataseg.base = expld.result.value;
+                         expld.dataseg.pagesize = commonpage;
+                         expld.dataseg.maxpagesize = maxpage;
+                         expld.dataseg.relro_end = 0;
+                       }
+                   }
+                 else if (commonpage < maxpage)
+                   expld.result.value += ((expld.dot + commonpage - 1)
+                                          & (maxpage - commonpage));
+               }
+             else
+               expld.result.valid_p = FALSE;
+             break;
+
+           case DATA_SEGMENT_RELRO_END:
+             if (expld.phase != lang_first_phase_enum
+                 && (expld.dataseg.phase == exp_dataseg_align_seen
+                     || expld.dataseg.phase == exp_dataseg_adjust
+                     || expld.dataseg.phase == exp_dataseg_relro_adjust
+                     || expld.phase == lang_final_phase_enum))
+               {
+                 if (expld.dataseg.phase == exp_dataseg_align_seen
+                     || expld.dataseg.phase == exp_dataseg_relro_adjust)
+                   expld.dataseg.relro_end = lhs.value + expld.result.value;
+
+                 if (expld.dataseg.phase == exp_dataseg_relro_adjust
+                     && (expld.dataseg.relro_end
+                         & (expld.dataseg.pagesize - 1)))
+                   {
+                     expld.dataseg.relro_end += expld.dataseg.pagesize - 1;
+                     expld.dataseg.relro_end &= ~(expld.dataseg.pagesize - 1);
+                     expld.result.value = (expld.dataseg.relro_end
+                                           - expld.result.value);
+                   }
+                 else
+                   expld.result.value = lhs.value;
+
+                 if (expld.dataseg.phase == exp_dataseg_align_seen)
+                   expld.dataseg.phase = exp_dataseg_relro_seen;
+               }
+             else
+               expld.result.valid_p = FALSE;
+             break;
+
+           default:
+             FAIL ();
+           }
+       }
+      else
+       expld.result.valid_p = FALSE;
+    }
 }
 
-etree_value_type fold_name(tree, current_section, allocation_done, dot)
-etree_type *tree;
-lang_output_section_statement_type *current_section;
-lang_phase_type  allocation_done;
-bfd_vma dot;
+static void
+fold_trinary (etree_type *tree)
+{
+  exp_fold_tree_1 (tree->trinary.cond);
+  if (expld.result.valid_p)
+    exp_fold_tree_1 (expld.result.value
+                    ? tree->trinary.lhs
+                    : tree->trinary.rhs);
+}
 
+static void
+fold_name (etree_type *tree)
 {
-  etree_value_type result;
-  switch (tree->type.node_code) 
+  memset (&expld.result, 0, sizeof (expld.result));
+
+  switch (tree->type.node_code)
     {
+    case SIZEOF_HEADERS:
+      if (expld.phase != lang_first_phase_enum)
+       {
+         bfd_vma hdr_size = 0;
+         /* Don't find the real header size if only marking sections;
+            The bfd function may cache incorrect data.  */
+         if (expld.phase != lang_mark_phase_enum)
+           hdr_size = bfd_sizeof_headers (output_bfd, &link_info);
+         new_abs (hdr_size);
+       }
+      break;
     case DEFINED:
-      result.value =
-       ldsym_get_soft(tree->name.name) != (ldsym_type *)NULL;
-      result.section = 0;
-      result.valid = true;
+      if (expld.phase == lang_first_phase_enum)
+       lang_track_definedness (tree->name.name);
+      else
+       {
+         struct bfd_link_hash_entry *h;
+         int def_iteration
+           = lang_symbol_definition_iteration (tree->name.name);
+
+         h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+                                           tree->name.name,
+                                           FALSE, FALSE, TRUE);
+         expld.result.value = (h != NULL
+                               && (h->type == bfd_link_hash_defined
+                                   || h->type == bfd_link_hash_defweak
+                                   || h->type == bfd_link_hash_common)
+                               && (def_iteration == lang_statement_iteration
+                                   || def_iteration == -1));
+         expld.result.section = bfd_abs_section_ptr;
+         expld.result.valid_p = TRUE;
+       }
       break;
     case NAME:
-      result.valid = false;
-      if (tree->name.name[0] == '.' && tree->name.name[1] == 0) {
-
-       if (allocation_done != lang_first_phase_enum) {
-         result = new_rel_from_section(dot, current_section);
-       }
-       else {
-         result = invalid();
-       }
-      }
-      else {
-       if (allocation_done == lang_final_phase_enum) {
-         ldsym_type *sy = ldsym_get_soft(tree->name.name);
-         
-         if (sy) {
-           asymbol **sdefp = sy->sdefs_chain;
-
-           if (sdefp) {
-             asymbol *sdef = *sdefp;
-             if (sdef->section == (asection *)NULL) {
-               /* This is an absolute symbol */
-               result = new_abs(sdef->value);
-             }
-             else {
-               lang_output_section_statement_type *os =
-                 lang_output_section_statement_lookup( sdef->section->output_section->name);
-               result = new_rel(sdef->value, os);
-             }
+      if (expld.phase == lang_first_phase_enum)
+       ;
+      else if (tree->name.name[0] == '.' && tree->name.name[1] == 0)
+       new_rel_from_abs (expld.dot);
+      else
+       {
+         struct bfd_link_hash_entry *h;
+
+         h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
+                                           tree->name.name,
+                                           TRUE, FALSE, TRUE);
+         if (!h)
+           einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
+         else if (h->type == bfd_link_hash_defined
+                  || h->type == bfd_link_hash_defweak)
+           {
+             if (bfd_is_abs_section (h->u.def.section))
+               new_abs (h->u.def.value);
+             else
+               {
+                 asection *output_section;
+
+                 output_section = h->u.def.section->output_section;
+                 if (output_section == NULL)
+                   {
+                     if (expld.phase != lang_mark_phase_enum)
+                       einfo (_("%X%S: unresolvable symbol `%s'"
+                                " referenced in expression\n"),
+                              tree->name.name);
+                   }
+                 else
+                   new_rel (h->u.def.value + h->u.def.section->output_offset,
+                            NULL, output_section);
+               }
            }
-         }
-         if (result.valid == false) {
-           info("%F%S: undefined symbol `%s' referenced in expression.\n",
+         else if (expld.phase == lang_final_phase_enum
+                  || expld.assigning_to_dot)
+           einfo (_("%F%S: undefined symbol `%s' referenced in expression\n"),
                   tree->name.name);
-         }
-
+         else if (h->type == bfd_link_hash_new)
+           {
+             h->type = bfd_link_hash_undefined;
+             h->u.undef.abfd = NULL;
+             if (h->u.undef.next == NULL && h != link_info.hash->undefs_tail)
+               bfd_link_add_undef (link_info.hash, h);
+           }
        }
-      }
-
       break;
 
     case ADDR:
+      if (expld.phase != lang_first_phase_enum)
+       {
+         lang_output_section_statement_type *os;
 
-      if (allocation_done != lang_first_phase_enum) {
-       lang_output_section_statement_type *os =
-         lang_output_section_find(tree->name.name);
-       check(os);
-       result =    new_rel((bfd_vma)0,  os);
-      }
-      else {
-       result = invalid();
-      }
+         os = lang_output_section_find (tree->name.name);
+         if (os != NULL && os->processed)
+           new_rel (0, NULL, os->bfd_section);
+       }
       break;
+
+    case LOADADDR:
+      if (expld.phase != lang_first_phase_enum)
+       {
+         lang_output_section_statement_type *os;
+
+         os = lang_output_section_find (tree->name.name);
+         if (os != NULL && os->processed)
+           {
+             if (os->load_base == NULL)
+               new_rel (0, NULL, os->bfd_section);
+             else
+               exp_fold_tree_1 (os->load_base);
+           }
+       }
+      break;
+
     case SIZEOF:
-      if(allocation_done != lang_first_phase_enum) {
-       lang_output_section_statement_type *os = 
-         lang_output_section_find(tree->name.name);
-       check(os);
-       result = new_abs((bfd_vma)(os->bfd_section->size));
+      if (expld.phase != lang_first_phase_enum)
+       {
+         int opb = bfd_octets_per_byte (output_bfd);
+         lang_output_section_statement_type *os;
+
+         os = lang_output_section_find (tree->name.name);
+         if (os == NULL)
+           new_abs (0);
+         else if (os->processed)
+           new_abs (os->bfd_section->size / opb);
+       }
+      break;
+
+    case LENGTH:
+      {
+        lang_memory_region_type *mem;
+        
+        mem = lang_memory_region_lookup (tree->name.name, FALSE);  
+        if (mem != NULL) 
+          new_abs (mem->length);
+        else          
+          einfo (_("%F%S: undefined MEMORY region `%s'"
+                  " referenced in expression\n"), tree->name.name);
       }
-      else {
-       result = invalid();
+      break;
+
+    case ORIGIN:
+      {
+        lang_memory_region_type *mem;
+        
+        mem = lang_memory_region_lookup (tree->name.name, FALSE);  
+        if (mem != NULL) 
+          new_abs (mem->origin);
+        else          
+          einfo (_("%F%S: undefined MEMORY region `%s'"
+                  " referenced in expression\n"), tree->name.name);
       }
       break;
 
+    case CONSTANT:
+      if (strcmp (tree->name.name, "MAXPAGESIZE") == 0)
+       new_abs (bfd_emul_get_maxpagesize (default_target));
+      else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
+       new_abs (bfd_emul_get_commonpagesize (default_target));
+      else
+       einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
+              tree->name.name);
+      break;
+
     default:
-      FAIL();
+      FAIL ();
       break;
     }
-
-  return result;
 }
-etree_value_type exp_fold_tree(tree, current_section, allocation_done,
-                              dot, dotp)
-etree_type *tree;
-lang_output_section_statement_type *current_section;
-lang_phase_type  allocation_done;
-bfd_vma dot;
-bfd_vma *dotp;
-{
-  etree_value_type result;
 
-  if (tree == (etree_type *)NULL) {
-    result.valid = false;
-  }
-  else {
-    switch (tree->type.node_class) 
-      {
-      case etree_value:
-       result = new_rel(tree->value.value, current_section);
-       break;
-      case etree_unary:
-       result = exp_fold_tree(tree->unary.child,
-                              current_section,
-                              allocation_done, dot, dotp);
-       if (result.valid == true)
-         {
-           switch(tree->type.node_code) 
-             {
-             case ALIGN_K:
-               if (allocation_done != lang_first_phase_enum) {
-                 result = new_rel_from_section(ALIGN(dot,
-                                                     result.value) ,
-                                               current_section);
+static void
+exp_fold_tree_1 (etree_type *tree)
+{
+  if (tree == NULL)
+    {
+      memset (&expld.result, 0, sizeof (expld.result));
+      return;
+    }
 
-               }
-               else {
-                 result.valid = false;
-               }
-               break;
-             case '-':
-               result.value = -result.value;
-               break;
-             case NEXT:
-               result.valid = false;
-               break;
-             default:
-               FAIL();
-             }
-         }
+  switch (tree->type.node_class)
+    {
+    case etree_value:
+      new_rel (tree->value.value, tree->value.str, expld.section);
+      break;
 
-       break;
-      case etree_trinary:
-
-       result = exp_fold_tree(tree->trinary.cond,
-                              current_section,
-                              allocation_done, dot, dotp);
-       if (result.valid) {
-         result = exp_fold_tree(result.value ?
-                                tree->trinary.lhs:tree->trinary.rhs,
-                                current_section,
-                                allocation_done, dot, dotp);
+    case etree_rel:
+      if (expld.phase != lang_first_phase_enum)
+       {
+         asection *output_section = tree->rel.section->output_section;
+         new_rel (tree->rel.value + tree->rel.section->output_offset,
+                  NULL, output_section);
        }
+      else
+       memset (&expld.result, 0, sizeof (expld.result));
+      break;
 
-       break;
-      case etree_binary:
-       result = fold_binary(tree, current_section, allocation_done,
-                            dot, dotp);
-       break;
-      case etree_assign:
-       if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0) {
-         /* Assignment to dot can only be done during allocation */
-         if (allocation_done == lang_allocating_phase_enum) {
-           result = exp_fold_tree(tree->assign.src,
-                                  current_section,
-                                  lang_allocating_phase_enum, dot, dotp);
-           if (result.valid == false) {
-             info("%F%S invalid assignment to location counter\n");
-           }
-           else {
-             if (current_section ==
-                 (lang_output_section_statement_type  *)NULL) {
-               info("%F%S assignment to location counter invalid outside of SECTION\n");
-             }
-             else {
-               unsigned long nextdot =result.value +
-                 current_section->bfd_section->vma;
-               if (nextdot < dot) {
-                 info("%F%S cannot move location counter backwards");
+    case etree_assert:
+      exp_fold_tree_1 (tree->assert_s.child);
+      if (expld.phase == lang_final_phase_enum && !expld.result.value)
+       einfo ("%X%P: %s\n", tree->assert_s.message);
+      break;
+
+    case etree_unary:
+      fold_unary (tree);
+      break;
+
+    case etree_binary:
+      fold_binary (tree);
+      break;
+
+    case etree_trinary:
+      fold_trinary (tree);
+      break;
+
+    case etree_assign:
+    case etree_provide:
+    case etree_provided:
+      if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
+       {
+         /* Assignment to dot can only be done during allocation.  */
+         if (tree->type.node_class != etree_assign)
+           einfo (_("%F%S can not PROVIDE assignment to location counter\n"));
+         if (expld.phase == lang_mark_phase_enum
+             || expld.phase == lang_allocating_phase_enum
+             || (expld.phase == lang_final_phase_enum
+                 && expld.section == bfd_abs_section_ptr))
+           {
+             /* Notify the folder that this is an assignment to dot.  */
+             expld.assigning_to_dot = TRUE;
+             exp_fold_tree_1 (tree->assign.src);
+             expld.assigning_to_dot = FALSE;
+
+             if (!expld.result.valid_p)
+               {
+                 if (expld.phase != lang_mark_phase_enum)
+                   einfo (_("%F%S invalid assignment to location counter\n"));
                }
-               else {
-                *dotp = nextdot; 
+             else if (expld.dotp == NULL)
+               einfo (_("%F%S assignment to location counter"
+                        " invalid outside of SECTION\n"));
+             else
+               {
+                 bfd_vma nextdot;
+
+                 nextdot = expld.result.value + expld.section->vma;
+                 if (nextdot < expld.dot
+                     && expld.section != bfd_abs_section_ptr)
+                   einfo (_("%F%S cannot move location counter backwards"
+                            " (from %V to %V)\n"), expld.dot, nextdot);
+                 else
+                   {
+                     expld.dot = nextdot;
+                     *expld.dotp = nextdot;
+                   }
                }
-             }
            }
-         }
+         else
+           memset (&expld.result, 0, sizeof (expld.result));
        }
-       else {
-         ldsym_type *sy = ldsym_get(tree->assign.dst);
-
-         /* If this symbol has just been created then we'll place it into 
-          * a section of our choice
-          */
-         result = exp_fold_tree(tree->assign.src,
-                                current_section, allocation_done,
-                                dot, dotp);
-         if (result.valid)
+      else
+       {
+         struct bfd_link_hash_entry *h = NULL;
+
+         if (tree->type.node_class == etree_provide)
            {
-             asymbol *def;
-             asymbol **def_ptr = (asymbol **)ldmalloc(sizeof(asymbol **));
-             /* Add this definition to script file */
-             def = (asymbol *)bfd_make_empty_symbol(script_file->the_bfd);
-             *def_ptr = def;
-
-
-             def->value = result.value;
-             if (result.section !=
-                 (lang_output_section_statement_type  *)NULL) {
-               if (current_section !=
-                   (lang_output_section_statement_type *)NULL) {
-                 
-                 def->section = result.section->bfd_section;
-                 def->flags = BSF_GLOBAL | BSF_EXPORT;
+             h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+                                       FALSE, FALSE, TRUE);
+             if (h == NULL
+                 || (h->type != bfd_link_hash_new
+                     && h->type != bfd_link_hash_undefined
+                     && h->type != bfd_link_hash_common))
+               {
+                 /* Do nothing.  The symbol was never referenced, or was
+                    defined by some object.  */
+                 break;
                }
-               else {
-                 /* Force to absolute */
-                 def->value += result.section->bfd_section->vma;
-                 def->section = (asection *)NULL;
-                 def->flags = BSF_GLOBAL | BSF_EXPORT | BSF_ABSOLUTE;
-               }
-
-
-             }
-             else {
-               def->section = (asection *)NULL;
-               def->flags = BSF_GLOBAL | BSF_EXPORT | BSF_ABSOLUTE;
-             }
+           }
 
+         exp_fold_tree_1 (tree->assign.src);
+         if (expld.result.valid_p)
+           {
+             if (h == NULL)
+               {
+                 h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+                                           TRUE, FALSE, TRUE);
+                 if (h == NULL)
+                   einfo (_("%P%F:%s: hash creation failed\n"),
+                          tree->assign.dst);
+               }
 
-             def->udata = (void *)NULL;
-             def->name = sy->name;
-             Q_enter_global_ref(def_ptr);
+             /* FIXME: Should we worry if the symbol is already
+                defined?  */
+             lang_update_definedness (tree->assign.dst, h);
+             h->type = bfd_link_hash_defined;
+             h->u.def.value = expld.result.value;
+             h->u.def.section = expld.result.section;
+             if (tree->type.node_class == etree_provide)
+               tree->type.node_class = etree_provided;
            }
-
        }
+      break;
 
-  
-       break;
-      case etree_name:
-       result = fold_name(tree, current_section, allocation_done, dot);
-       break;
-      default:
-       info("%F%S Need more of these %d",tree->type.node_class );
-
-      }
-  }
+    case etree_name:
+      fold_name (tree);
+      break;
 
-  return result;
+    default:
+      FAIL ();
+      memset (&expld.result, 0, sizeof (expld.result));
+      break;
+    }
 }
 
+void
+exp_fold_tree (etree_type *tree, asection *current_section, bfd_vma *dotp)
+{
+  expld.dot = *dotp;
+  expld.dotp = dotp;
+  expld.section = current_section;
+  exp_fold_tree_1 (tree);
+}
 
-etree_value_type exp_fold_tree_no_dot(tree, current_section, allocation_done)
-etree_type *tree;
-lang_output_section_statement_type *current_section;
-lang_phase_type  allocation_done;
+static void
+exp_fold_tree_no_dot (etree_type *tree)
 {
-return exp_fold_tree(tree, current_section, allocation_done, (bfd_vma)
-                    0, (bfd_vma *)NULL);
+  expld.dot = 0;
+  expld.dotp = NULL;
+  expld.section = bfd_abs_section_ptr;
+  exp_fold_tree_1 (tree);
 }
 
 etree_type *
-exp_binop(code, lhs, rhs)
-int code;
-etree_type *lhs;
-etree_type *rhs;
+exp_binop (int code, etree_type *lhs, etree_type *rhs)
 {
   etree_type value, *new;
-  etree_value_type r;
 
   value.type.node_code = code;
   value.binary.lhs = lhs;
   value.binary.rhs = rhs;
   value.type.node_class = etree_binary;
-  r = exp_fold_tree_no_dot(&value,  (lang_output_section_statement_type *)NULL,
-                          lang_first_phase_enum );
-  if (r.valid)
-    {
-      return exp_intop(r.value);
-    }
-  new = (etree_type *)ldmalloc(sizeof(new->binary));
-  memcpy((char *)new, (char *)&value, sizeof(new->binary));
+  exp_fold_tree_no_dot (&value);
+  if (expld.result.valid_p)
+    return exp_intop (expld.result.value);
+
+  new = stat_alloc (sizeof (new->binary));
+  memcpy (new, &value, sizeof (new->binary));
   return new;
 }
 
 etree_type *
-exp_trinop(code, cond, lhs, rhs)
-int code;
-etree_type *cond;
-etree_type *lhs;
-etree_type *rhs;
+exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
 {
   etree_type value, *new;
-  etree_value_type r;
+
   value.type.node_code = code;
   value.trinary.lhs = lhs;
   value.trinary.cond = cond;
   value.trinary.rhs = rhs;
   value.type.node_class = etree_trinary;
-  r= exp_fold_tree_no_dot(&value,  (lang_output_section_statement_type
-                                   *)NULL,lang_first_phase_enum);
-  if (r.valid) {
-    return exp_intop(r.value);
-  }
-  new = (etree_type *)ldmalloc(sizeof(new->trinary));
-  memcpy((char *)new,(char *) &value, sizeof(new->trinary));
+  exp_fold_tree_no_dot (&value);
+  if (expld.result.valid_p)
+    return exp_intop (expld.result.value);
+
+  new = stat_alloc (sizeof (new->trinary));
+  memcpy (new, &value, sizeof (new->trinary));
   return new;
 }
 
-
 etree_type *
-exp_unop(code, child)
-int code;
-etree_type *child;
+exp_unop (int code, etree_type *child)
 {
   etree_type value, *new;
 
-  etree_value_type r;
   value.unary.type.node_code = code;
   value.unary.child = child;
   value.unary.type.node_class = etree_unary;
-r = exp_fold_tree_no_dot(&value,(lang_output_section_statement_type *)NULL,
-             lang_first_phase_enum);
-if (r.valid) {
-    return exp_intop(r.value);
-  }
-  new = (etree_type *)ldmalloc(sizeof(new->unary));
-  memcpy((char *)new, (char *)&value, sizeof(new->unary));
+  exp_fold_tree_no_dot (&value);
+  if (expld.result.valid_p)
+    return exp_intop (expld.result.value);
+
+  new = stat_alloc (sizeof (new->unary));
+  memcpy (new, &value, sizeof (new->unary));
   return new;
 }
 
-
 etree_type *
-exp_nameop(code, name)
-int code;
-char *name;
+exp_nameop (int code, const char *name)
 {
-
   etree_type value, *new;
 
-  etree_value_type r;
   value.name.type.node_code = code;
   value.name.name = name;
   value.name.type.node_class = etree_name;
 
+  exp_fold_tree_no_dot (&value);
+  if (expld.result.valid_p)
+    return exp_intop (expld.result.value);
 
-  r = exp_fold_tree_no_dot(&value,(lang_output_section_statement_type *)NULL,
-               lang_first_phase_enum);
-  if (r.valid) {
-    return exp_intop(r.value);
-  }
-  new = (etree_type *)ldmalloc(sizeof(new->name));
-  memcpy((char *)new, (char *)&value, sizeof(new->name));
+  new = stat_alloc (sizeof (new->name));
+  memcpy (new, &value, sizeof (new->name));
   return new;
 
 }
 
+etree_type *
+exp_assop (int code, const char *dst, etree_type *src)
+{
+  etree_type *new;
 
+  new = stat_alloc (sizeof (new->assign));
+  new->type.node_code = code;
+  new->type.node_class = etree_assign;
+  new->assign.src = src;
+  new->assign.dst = dst;
+  return new;
+}
 
+/* Handle PROVIDE.  */
 
 etree_type *
-exp_assop(code, dst, src)
-int code;
-char *dst;
-etree_type *src;
+exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
 {
-  etree_type value, *new;
-
-  value.assign.type.node_code = code;
-
+  etree_type *n;
+
+  n = stat_alloc (sizeof (n->assign));
+  n->assign.type.node_code = '=';
+  n->assign.type.node_class = etree_provide;
+  n->assign.src = src;
+  n->assign.dst = dst;
+  n->assign.hidden = hidden;
+  return n;
+}
 
-  value.assign.src = src;
-  value.assign.dst = dst;
-  value.assign.type.node_class = etree_assign;
+/* Handle ASSERT.  */
 
-#if 0
-  if (exp_fold_tree_no_dot(&value, &result)) {
-    return exp_intop(result);
-  }
-#endif
-  new = (etree_type*)ldmalloc(sizeof(new->assign));
-  memcpy((char *)new, (char *)&value, sizeof(new->assign));
-  return new;
+etree_type *
+exp_assert (etree_type *exp, const char *message)
+{
+  etree_type *n;
+
+  n = stat_alloc (sizeof (n->assert_s));
+  n->assert_s.type.node_code = '!';
+  n->assert_s.type.node_class = etree_assert;
+  n->assert_s.child = exp;
+  n->assert_s.message = message;
+  return n;
 }
 
-void 
-exp_print_tree(outfile, tree)
-FILE *outfile;
-etree_type *tree;
+void
+exp_print_tree (etree_type *tree)
 {
-  switch (tree->type.node_class) {
-  case etree_value:
-    fprintf(outfile,"0x%08lx",(bfd_vma)(tree->value.value));
-    return;
-  case etree_assign:
-#if 0
-    if (tree->assign.dst->sdefs != (asymbol *)NULL){
-      fprintf(outfile,"%s (%x) ",tree->assign.dst->name,
-             tree->assign.dst->sdefs->value);
-    }
-    else {
-      fprintf(outfile,"%s (UNDEFINED)",tree->assign.dst->name);
+  if (config.map_file == NULL)
+    config.map_file = stderr;
+
+  if (tree == NULL)
+    {
+      minfo ("NULL TREE\n");
+      return;
     }
-#endif
-    fprintf(outfile,"%s ",tree->assign.dst);
-    exp_print_token(outfile,tree->type.node_code);
-    exp_print_tree(outfile,tree->assign.src);
-    break;
-  case etree_binary:
-    exp_print_tree(outfile,tree->binary.lhs);
-    exp_print_token(outfile,tree->type.node_code);
-    exp_print_tree(outfile,tree->binary.rhs);
-    break;
-  case etree_trinary:
-    exp_print_tree(outfile,tree->trinary.cond);
-    fprintf(outfile,"?");
-    exp_print_tree(outfile,tree->trinary.lhs);
-    fprintf(outfile,":");
-    exp_print_tree(outfile,tree->trinary.rhs);
-    break;
-  case etree_unary:
-    exp_print_token(outfile,tree->unary.type.node_code);
-    fprintf(outfile,"(");
-    exp_print_tree(outfile,tree->unary.child);
-    fprintf(outfile,")");
-    break;
-  case etree_undef:
-    fprintf(outfile,"????????");
-    break;
-  case etree_name:
-    if (tree->type.node_code == NAME) {
-      fprintf(outfile,"%s", tree->name.name);
+
+  switch (tree->type.node_class)
+    {
+    case etree_value:
+      minfo ("0x%v", tree->value.value);
+      return;
+    case etree_rel:
+      if (tree->rel.section->owner != NULL)
+       minfo ("%B:", tree->rel.section->owner);
+      minfo ("%s+0x%v", tree->rel.section->name, tree->rel.value);
+      return;
+    case etree_assign:
+      fprintf (config.map_file, "%s", tree->assign.dst);
+      exp_print_token (tree->type.node_code, TRUE);
+      exp_print_tree (tree->assign.src);
+      break;
+    case etree_provide:
+    case etree_provided:
+      fprintf (config.map_file, "PROVIDE (%s, ", tree->assign.dst);
+      exp_print_tree (tree->assign.src);
+      fprintf (config.map_file, ")");
+      break;
+    case etree_binary:
+      fprintf (config.map_file, "(");
+      exp_print_tree (tree->binary.lhs);
+      exp_print_token (tree->type.node_code, TRUE);
+      exp_print_tree (tree->binary.rhs);
+      fprintf (config.map_file, ")");
+      break;
+    case etree_trinary:
+      exp_print_tree (tree->trinary.cond);
+      fprintf (config.map_file, "?");
+      exp_print_tree (tree->trinary.lhs);
+      fprintf (config.map_file, ":");
+      exp_print_tree (tree->trinary.rhs);
+      break;
+    case etree_unary:
+      exp_print_token (tree->unary.type.node_code, FALSE);
+      if (tree->unary.child)
+       {
+         fprintf (config.map_file, " (");
+         exp_print_tree (tree->unary.child);
+         fprintf (config.map_file, ")");
+       }
+      break;
+
+    case etree_assert:
+      fprintf (config.map_file, "ASSERT (");
+      exp_print_tree (tree->assert_s.child);
+      fprintf (config.map_file, ", %s)", tree->assert_s.message);
+      break;
+
+    case etree_name:
+      if (tree->type.node_code == NAME)
+       {
+         fprintf (config.map_file, "%s", tree->name.name);
+       }
+      else
+       {
+         exp_print_token (tree->type.node_code, FALSE);
+         if (tree->name.name)
+           fprintf (config.map_file, " (%s)", tree->name.name);
+       }
+      break;
+    default:
+      FAIL ();
+      break;
     }
-    else {
-      exp_print_token(outfile,tree->type.node_code);
-      fprintf(outfile,"(%s)", tree->name.name);
+}
+
+bfd_vma
+exp_get_vma (etree_type *tree, bfd_vma def, char *name)
+{
+  if (tree != NULL)
+    {
+      exp_fold_tree_no_dot (tree);
+      if (expld.result.valid_p)
+       return expld.result.value;
+      else if (name != NULL && expld.phase != lang_mark_phase_enum)
+       einfo (_("%F%S nonconstant expression for %s\n"), name);
     }
-    break;
-  default:
-    FAIL();
-    break;
-  }
+  return def;
+}
+
+int
+exp_get_value_int (etree_type *tree, int def, char *name)
+{
+  return exp_get_vma (tree, def, name);
 }
 
+fill_type *
+exp_get_fill (etree_type *tree, fill_type *def, char *name)
+{
+  fill_type *fill;
+  size_t len;
+  unsigned int val;
+
+  if (tree == NULL)
+    return def;
 
+  exp_fold_tree_no_dot (tree);
+  if (!expld.result.valid_p)
+    {
+      if (name != NULL && expld.phase != lang_mark_phase_enum)
+       einfo (_("%F%S nonconstant expression for %s\n"), name);
+      return def;
+    }
 
+  if (expld.result.str != NULL && (len = strlen (expld.result.str)) != 0)
+    {
+      unsigned char *dst;
+      unsigned char *s;
+      fill = xmalloc ((len + 1) / 2 + sizeof (*fill) - 1);
+      fill->size = (len + 1) / 2;
+      dst = fill->data;
+      s = (unsigned char *) expld.result.str;
+      val = 0;
+      do
+       {
+         unsigned int digit;
+
+         digit = *s++ - '0';
+         if (digit > 9)
+           digit = (digit - 'A' + '0' + 10) & 0xf;
+         val <<= 4;
+         val += digit;
+         --len;
+         if ((len & 1) == 0)
+           {
+             *dst++ = val;
+             val = 0;
+           }
+       }
+      while (len != 0);
+    }
+  else
+    {
+      fill = xmalloc (4 + sizeof (*fill) - 1);
+      val = expld.result.value;
+      fill->data[0] = (val >> 24) & 0xff;
+      fill->data[1] = (val >> 16) & 0xff;
+      fill->data[2] = (val >>  8) & 0xff;
+      fill->data[3] = (val >>  0) & 0xff;
+      fill->size = 4;
+    }
+  return fill;
+}
 
 bfd_vma
-exp_get_vma(tree, def, name, allocation_done)
-etree_type *tree;
-bfd_vma def;
-char *name;
-lang_phase_type allocation_done;
+exp_get_abs_int (etree_type *tree, int def, char *name)
 {
-  etree_value_type r;
-
-  if (tree != (etree_type *)NULL) {
-    r = exp_fold_tree_no_dot(tree,
-                     (lang_output_section_statement_type *)NULL,
-                     allocation_done);
-    if (r.valid == false && name) {
-      info("%F%S Nonconstant expression for %s\n",name);
+  if (tree != NULL)
+    {
+      exp_fold_tree_no_dot (tree);
+
+      if (expld.result.valid_p)
+       {
+         expld.result.value += expld.result.section->vma;
+         return expld.result.value;
+       }
+      else if (name != NULL && expld.phase != lang_mark_phase_enum)
+       einfo (_("%F%S nonconstant expression for %s\n"), name);
     }
-    return r.value;
-  }
-  else {
-    return def;
-  }
+  return def;
 }
 
-int 
-exp_get_value_int(tree,def,name, allocation_done)
-etree_type *tree;
-int def;
-char *name;
-lang_phase_type allocation_done;
+static bfd_vma
+align_n (bfd_vma value, bfd_vma align)
 {
-  return (int)exp_get_vma(tree,(bfd_vma)def,name, allocation_done);
+  if (align <= 1)
+    return value;
+
+  value = (value + align - 1) / align;
+  return value * align;
 }
This page took 0.04314 seconds and 4 git commands to generate.