.
[deliverable/binutils-gdb.git] / ld / ldexp.c
index 903374ed019a717348a9ea2ec20b150e791e4a67..2b973c3402ce14a27409c188e251265de19147d2 100644 (file)
@@ -1,6 +1,6 @@
 /* This module handles expression trees.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002
+   2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
@@ -36,42 +36,25 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ldmain.h"
 #include "ldmisc.h"
 #include "ldexp.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "ldlang.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
 
-static void exp_print_token PARAMS ((token_code_type code));
-static void make_abs PARAMS ((etree_value_type *ptr));
-static etree_value_type new_abs PARAMS ((bfd_vma value));
-static void check PARAMS ((lang_output_section_statement_type *os,
-                          const char *name, const char *op));
-static etree_value_type new_rel
-  PARAMS ((bfd_vma, char *, lang_output_section_statement_type *section));
-static etree_value_type new_rel_from_section
-  PARAMS ((bfd_vma value, lang_output_section_statement_type *section));
-static etree_value_type fold_binary
-  PARAMS ((etree_type *tree,
-          lang_output_section_statement_type *current_section,
-          lang_phase_type allocation_done,
-          bfd_vma dot, bfd_vma *dotp));
-static etree_value_type fold_name
-  PARAMS ((etree_type *tree,
-          lang_output_section_statement_type *current_section,
-          lang_phase_type allocation_done,
-          bfd_vma dot));
 static etree_value_type exp_fold_tree_no_dot
-  PARAMS ((etree_type *tree,
-          lang_output_section_statement_type *current_section,
-          lang_phase_type allocation_done));
+  (etree_type *, lang_output_section_statement_type *, lang_phase_type);
+static bfd_vma align_n
+  (bfd_vma, bfd_vma);
 
 struct exp_data_seg exp_data_seg;
 
+/* Print the string representation of the given token.  Surround it
+   with spaces if INFIX_P is TRUE.  */
+
 static void
-exp_print_token (code)
-     token_code_type code;
+exp_print_token (token_code_type code, int infix_p)
 {
-  static CONST struct
+  static const struct
   {
     token_code_type code;
     char * name;
@@ -116,31 +99,32 @@ exp_print_token (code)
     { ADDR, "ADDR" },
     { LOADADDR, "LOADADDR" },
     { MAX_K, "MAX_K" },
-    { REL, "relocateable" },
+    { REL, "relocatable" },
     { DATA_SEGMENT_ALIGN, "DATA_SEGMENT_ALIGN" },
     { DATA_SEGMENT_END, "DATA_SEGMENT_END" }
   };
   unsigned int idx;
 
-  for (idx = ARRAY_SIZE (table); idx--;)
-    {
-      if (table[idx].code == code)
-       {
-         fprintf (config.map_file, " %s ", table[idx].name);
-         return;
-       }
-    }
+  for (idx = 0; idx < ARRAY_SIZE (table); idx++)
+    if (table[idx].code == code)
+      break;
+
+  if (infix_p)
+    fputc (' ', config.map_file);
 
-  /* Not in table, just print it alone.  */
-  if (code < 127)
-    fprintf (config.map_file, " %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);
+    fprintf (config.map_file, "<code %d>", code);
+
+  if (infix_p)
+    fputc (' ', config.map_file);
 }
 
 static void
-make_abs (ptr)
-     etree_value_type *ptr;
+make_abs (etree_value_type *ptr)
 {
   asection *s = ptr->section->bfd_section;
   ptr->value += s->vma;
@@ -148,21 +132,19 @@ make_abs (ptr)
 }
 
 static etree_value_type
-new_abs (value)
-     bfd_vma value;
+new_abs (bfd_vma value)
 {
   etree_value_type new;
-  new.valid_p = true;
+  new.valid_p = TRUE;
   new.section = abs_output_section;
   new.value = value;
   return new;
 }
 
 static void
-check (os, name, op)
-     lang_output_section_statement_type *os;
-     const char *name;
-     const char *op;
+check (lang_output_section_statement_type *os,
+       const char *name,
+       const char *op)
 {
   if (os == NULL)
     einfo (_("%F%P: %s uses undefined section %s\n"), op, name);
@@ -171,10 +153,9 @@ check (os, name, op)
 }
 
 etree_type *
-exp_intop (value)
-     bfd_vma value;
+exp_intop (bfd_vma value)
 {
-  etree_type *new = (etree_type *) stat_alloc (sizeof (new->value));
+  etree_type *new = stat_alloc (sizeof (new->value));
   new->type.node_code = INT;
   new->value.value = value;
   new->value.str = NULL;
@@ -183,11 +164,9 @@ exp_intop (value)
 }
 
 etree_type *
-exp_bigintop (value, str)
-     bfd_vma value;
-     char *str;
+exp_bigintop (bfd_vma value, char *str)
 {
-  etree_type *new = (etree_type *) stat_alloc (sizeof (new->value));
+  etree_type *new = stat_alloc (sizeof (new->value));
   new->type.node_code = INT;
   new->value.value = value;
   new->value.str = str;
@@ -195,14 +174,12 @@ exp_bigintop (value, str)
   return new;
 }
 
-/* Build an expression representing an unnamed relocateable value.  */
+/* Build an expression representing an unnamed relocatable value.  */
 
 etree_type *
-exp_relop (section, value)
-     asection *section;
-     bfd_vma value;
+exp_relop (asection *section, bfd_vma value)
 {
-  etree_type *new = (etree_type *) stat_alloc (sizeof (new->rel));
+  etree_type *new = stat_alloc (sizeof (new->rel));
   new->type.node_code = REL;
   new->type.node_class = etree_rel;
   new->rel.section = section;
@@ -211,13 +188,12 @@ exp_relop (section, value)
 }
 
 static etree_value_type
-new_rel (value, str, section)
-     bfd_vma value;
-     char *str;
-     lang_output_section_statement_type *section;
+new_rel (bfd_vma value,
+        char *str,
+        lang_output_section_statement_type *section)
 {
   etree_value_type new;
-  new.valid_p = true;
+  new.valid_p = TRUE;
   new.value = value;
   new.str = str;
   new.section = section;
@@ -225,12 +201,11 @@ new_rel (value, str, section)
 }
 
 static etree_value_type
-new_rel_from_section (value, section)
-     bfd_vma value;
-     lang_output_section_statement_type *section;
+new_rel_from_section (bfd_vma value,
+                     lang_output_section_statement_type *section)
 {
   etree_value_type new;
-  new.valid_p = true;
+  new.valid_p = TRUE;
   new.value = value;
   new.str = NULL;
   new.section = section;
@@ -241,12 +216,97 @@ new_rel_from_section (value, 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;
+fold_unary (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;
+
+  result = exp_fold_tree (tree->unary.child,
+                         current_section,
+                         allocation_done, dot, dotp);
+  if (result.valid_p)
+    {
+      switch (tree->type.node_code)
+       {
+       case ALIGN_K:
+         if (allocation_done != lang_first_phase_enum)
+           result = new_rel_from_section (align_n (dot, result.value),
+                                          current_section);
+         else
+           result.valid_p = FALSE;
+         break;
+
+       case ABSOLUTE:
+         if (allocation_done != lang_first_phase_enum)
+           {
+             result.value += result.section->bfd_section->vma;
+             result.section = abs_output_section;
+           }
+         else
+           result.valid_p = FALSE;
+         break;
+
+       case '~':
+         make_abs (&result);
+         result.value = ~result.value;
+         break;
+
+       case '!':
+         make_abs (&result);
+         result.value = !result.value;
+         break;
+
+       case '-':
+         make_abs (&result);
+         result.value = -result.value;
+         break;
+
+       case NEXT:
+         /* Return next place aligned to value.  */
+         if (allocation_done == lang_allocating_phase_enum)
+           {
+             make_abs (&result);
+             result.value = align_n (dot, result.value);
+           }
+         else
+           result.valid_p = FALSE;
+         break;
+
+       case DATA_SEGMENT_END:
+         if (allocation_done != lang_first_phase_enum
+             && current_section == abs_output_section
+             && (exp_data_seg.phase == exp_dataseg_align_seen
+                 || exp_data_seg.phase == exp_dataseg_adjust
+                 || allocation_done != lang_allocating_phase_enum))
+           {
+             if (exp_data_seg.phase == exp_dataseg_align_seen)
+               {
+                 exp_data_seg.phase = exp_dataseg_end_seen;
+                 exp_data_seg.end = result.value;
+               }
+           }
+         else
+           result.valid_p = FALSE;
+         break;
+
+       default:
+         FAIL ();
+         break;
+       }
+    }
+
+  return result;
+}
+
+static etree_value_type
+fold_binary (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;
 
@@ -273,15 +333,14 @@ fold_binary (tree, current_section, allocation_done, dot, dotp)
              && (tree->type.node_code == '+'
                  || tree->type.node_code == '-'))
            {
-             etree_value_type hold;
-
-             /* If there is only one absolute term, make sure it is the
-                second one.  */
              if (other.section != abs_output_section)
                {
-                 hold = result;
-                 result = other;
-                 other = hold;
+                 /* Keep the section of the other term.  */
+                 if (tree->type.node_code == '+')
+                   other.value = result.value + other.value;
+                 else
+                   other.value = result.value - other.value;
+                 return other;
                }
            }
          else if (result.section != other.section
@@ -344,7 +403,7 @@ fold_binary (tree, current_section, allocation_done, dot, dotp)
                {
                  bfd_vma maxpage = result.value;
 
-                 result.value = ALIGN_N (dot, maxpage);
+                 result.value = align_n (dot, maxpage);
                  if (exp_data_seg.phase != exp_dataseg_adjust)
                    {
                      result.value += dot & (maxpage - 1);
@@ -356,10 +415,11 @@ fold_binary (tree, current_section, allocation_done, dot, dotp)
                        }
                    }
                  else if (other.value < maxpage)
-                   result.value += dot & (maxpage - other.value);
+                   result.value += (dot + other.value - 1)
+                                   & (maxpage - other.value);
                }
              else
-               result.valid_p = false;
+               result.valid_p = FALSE;
              break;
 
            default:
@@ -368,27 +428,47 @@ fold_binary (tree, current_section, allocation_done, dot, dotp)
        }
       else
        {
-         result.valid_p = false;
+         result.valid_p = FALSE;
        }
     }
 
   return result;
 }
 
+static etree_value_type
+fold_trinary (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;
+
+  result = exp_fold_tree (tree->trinary.cond, current_section,
+                         allocation_done, dot, dotp);
+  if (result.valid_p)
+    result = exp_fold_tree ((result.value
+                            ? tree->trinary.lhs
+                            : tree->trinary.rhs),
+                           current_section,
+                           allocation_done, dot, dotp);
+
+  return result;
+}
+
 etree_value_type
-invalid ()
+invalid (void)
 {
   etree_value_type new;
-  new.valid_p = false;
+  new.valid_p = FALSE;
   return new;
 }
 
 static 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;
+fold_name (etree_type *tree,
+          lang_output_section_statement_type *current_section,
+          lang_phase_type allocation_done,
+          bfd_vma dot)
 {
   etree_value_type result;
 
@@ -397,35 +477,41 @@ fold_name (tree, current_section, allocation_done, dot)
     case SIZEOF_HEADERS:
       if (allocation_done != lang_first_phase_enum)
        {
-         result = new_abs ((bfd_vma)
-                           bfd_sizeof_headers (output_bfd,
-                                               link_info.relocateable));
+         result = new_abs (bfd_sizeof_headers (output_bfd,
+                                               link_info.relocatable));
        }
       else
        {
-         result.valid_p = false;
+         result.valid_p = FALSE;
        }
       break;
     case DEFINED:
       if (allocation_done == lang_first_phase_enum)
-       result.valid_p = false;
+       {
+         lang_track_definedness (tree->name.name);
+         result.valid_p = FALSE;
+       }
       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);
-         result.value = (h != (struct bfd_link_hash_entry *) NULL
+                                           FALSE, FALSE, TRUE);
+         result.value = (h != NULL
                          && (h->type == bfd_link_hash_defined
                              || h->type == bfd_link_hash_defweak
-                             || h->type == bfd_link_hash_common));
-         result.section = 0;
-         result.valid_p = true;
+                             || h->type == bfd_link_hash_common)
+                         && (def_iteration == lang_statement_iteration
+                             || def_iteration == -1));
+         result.section = abs_output_section;
+         result.valid_p = TRUE;
        }
       break;
     case NAME:
-      result.valid_p = false;
+      result.valid_p = FALSE;
       if (tree->name.name[0] == '.' && tree->name.name[1] == 0)
        {
          if (allocation_done != lang_first_phase_enum)
@@ -439,7 +525,7 @@ fold_name (tree, current_section, allocation_done, dot)
 
          h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info,
                                            tree->name.name,
-                                           false, false, true);
+                                           FALSE, FALSE, TRUE);
          if (h != NULL
              && (h->type == bfd_link_hash_defined
                  || h->type == bfd_link_hash_defweak))
@@ -532,18 +618,17 @@ fold_name (tree, current_section, allocation_done, dot)
 }
 
 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;
+exp_fold_tree (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 == NULL)
     {
-      result.valid_p = false;
+      result.valid_p = FALSE;
       return result;
     }
 
@@ -555,7 +640,7 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
 
     case etree_rel:
       if (allocation_done != lang_final_phase_enum)
-       result.valid_p = false;
+       result.valid_p = FALSE;
       else
        result = new_rel ((tree->rel.value
                           + tree->rel.section->output_section->vma
@@ -577,90 +662,8 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
       break;
 
     case etree_unary:
-      result = exp_fold_tree (tree->unary.child,
-                             current_section,
-                             allocation_done, dot, dotp);
-      if (result.valid_p)
-       {
-         switch (tree->type.node_code)
-           {
-           case ALIGN_K:
-             if (allocation_done != lang_first_phase_enum)
-               result = new_rel_from_section (ALIGN_N (dot, result.value),
-                                              current_section);
-             else
-               result.valid_p = false;
-             break;
-
-           case ABSOLUTE:
-             if (allocation_done != lang_first_phase_enum && result.valid_p)
-               {
-                 result.value += result.section->bfd_section->vma;
-                 result.section = abs_output_section;
-               }
-             else
-               result.valid_p = false;
-             break;
-
-           case '~':
-             make_abs (&result);
-             result.value = ~result.value;
-             break;
-
-           case '!':
-             make_abs (&result);
-             result.value = !result.value;
-             break;
-
-           case '-':
-             make_abs (&result);
-             result.value = -result.value;
-             break;
-
-           case NEXT:
-             /* Return next place aligned to value.  */
-             if (allocation_done == lang_allocating_phase_enum)
-               {
-                 make_abs (&result);
-                 result.value = ALIGN_N (dot, result.value);
-               }
-             else
-               result.valid_p = false;
-             break;
-
-           case DATA_SEGMENT_END:
-             if (allocation_done != lang_first_phase_enum
-                 && current_section == abs_output_section
-                 && (exp_data_seg.phase == exp_dataseg_align_seen
-                     || exp_data_seg.phase == exp_dataseg_adjust
-                     || allocation_done != lang_allocating_phase_enum))
-               {
-                 if (exp_data_seg.phase == exp_dataseg_align_seen)
-                   {
-                     exp_data_seg.phase = exp_dataseg_end_seen;
-                     exp_data_seg.end = result.value;
-                   }
-               }
-             else
-               result.valid_p = false;
-             break;
-
-           default:
-             FAIL ();
-             break;
-           }
-       }
-      break;
-
-    case etree_trinary:
-      result = exp_fold_tree (tree->trinary.cond, current_section,
-                             allocation_done, dot, dotp);
-      if (result.valid_p)
-       result = exp_fold_tree ((result.value
-                                ? tree->trinary.lhs
-                                : tree->trinary.rhs),
-                               current_section,
-                               allocation_done, dot, dotp);
+      result = fold_unary (tree, current_section, allocation_done,
+                          dot, dotp);
       break;
 
     case etree_binary:
@@ -668,6 +671,11 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
                            dot, dotp);
       break;
 
+    case etree_trinary:
+      result = fold_trinary (tree, current_section, allocation_done,
+                            dot, dotp);
+      break;
+
     case etree_assign:
     case etree_provide:
     case etree_provided:
@@ -713,16 +721,16 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
                                  dot, dotp);
          if (result.valid_p)
            {
-             boolean create;
+             bfd_boolean create;
              struct bfd_link_hash_entry *h;
 
              if (tree->type.node_class == etree_assign)
-               create = true;
+               create = TRUE;
              else
-               create = false;
+               create = FALSE;
              h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
-                                       create, false, false);
-             if (h == (struct bfd_link_hash_entry *) NULL)
+                                       create, FALSE, FALSE);
+             if (h == NULL)
                {
                  if (tree->type.node_class == etree_assign)
                    einfo (_("%P%F:%s: hash creation failed\n"),
@@ -739,6 +747,7 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
                {
                  /* 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 = result.value;
                  h->u.def.section = result.section->bfd_section;
@@ -762,20 +771,15 @@ exp_fold_tree (tree, current_section, allocation_done, dot, dotp)
 }
 
 static 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;
+exp_fold_tree_no_dot (etree_type *tree,
+                     lang_output_section_statement_type *current_section,
+                     lang_phase_type allocation_done)
 {
-  return exp_fold_tree (tree, current_section, allocation_done,
-                       (bfd_vma) 0, (bfd_vma *) NULL);
+  return exp_fold_tree (tree, current_section, allocation_done, 0, NULL);
 }
 
 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;
@@ -791,17 +795,13 @@ exp_binop (code, lhs, rhs)
     {
       return exp_intop (r.value);
     }
-  new = (etree_type *) stat_alloc (sizeof (new->binary));
-  memcpy ((char *) new, (char *) &value, sizeof (new->binary));
+  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;
@@ -810,21 +810,17 @@ exp_trinop (code, cond, lhs, rhs)
   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);
+  r = exp_fold_tree_no_dot (&value, NULL, lang_first_phase_enum);
   if (r.valid_p)
     return exp_intop (r.value);
 
-  new = (etree_type *) stat_alloc (sizeof (new->trinary));
-  memcpy ((char *) new, (char *) &value, sizeof (new->trinary));
+  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;
 
@@ -837,15 +833,13 @@ exp_unop (code, child)
   if (r.valid_p)
     return exp_intop (r.value);
 
-  new = (etree_type *) stat_alloc (sizeof (new->unary));
-  memcpy ((char *) new, (char *) &value, sizeof (new->unary));
+  new = stat_alloc (sizeof (new->unary));
+  memcpy (new, &value, sizeof (new->unary));
   return new;
 }
 
 etree_type *
-exp_nameop (code, name)
-     int code;
-     CONST char *name;
+exp_nameop (int code, const char *name)
 {
   etree_type value, *new;
   etree_value_type r;
@@ -853,23 +847,18 @@ exp_nameop (code, name)
   value.name.name = name;
   value.name.type.node_class = etree_name;
 
-  r = exp_fold_tree_no_dot (&value,
-                           (lang_output_section_statement_type *) NULL,
-                           lang_first_phase_enum);
+  r = exp_fold_tree_no_dot (&value, NULL, lang_first_phase_enum);
   if (r.valid_p)
     return exp_intop (r.value);
 
-  new = (etree_type *) stat_alloc (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 (code, dst, src)
-     int code;
-     CONST char *dst;
-     etree_type *src;
+exp_assop (int code, const char *dst, etree_type *src)
 {
   etree_type value, *new;
 
@@ -883,21 +872,19 @@ exp_assop (code, dst, src)
   if (exp_fold_tree_no_dot (&value, &result))
     return exp_intop (result);
 #endif
-  new = (etree_type *) stat_alloc (sizeof (new->assign));
-  memcpy ((char *) new, (char *) &value, sizeof (new->assign));
+  new = stat_alloc (sizeof (new->assign));
+  memcpy (new, &value, sizeof (new->assign));
   return new;
 }
 
 /* Handle PROVIDE.  */
 
 etree_type *
-exp_provide (dst, src)
-     const char *dst;
-     etree_type *src;
+exp_provide (const char *dst, etree_type *src)
 {
   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.node_class = etree_provide;
   n->assign.src = src;
@@ -908,13 +895,11 @@ exp_provide (dst, src)
 /* Handle ASSERT.  */
 
 etree_type *
-exp_assert (exp, message)
-     etree_type *exp;
-     const char *message;
+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.node_class = etree_assert;
   n->assert_s.child = exp;
@@ -923,18 +908,17 @@ exp_assert (exp, message)
 }
 
 void
-exp_print_tree (tree)
-     etree_type *tree;
+exp_print_tree (etree_type *tree)
 {
   if (config.map_file == NULL)
     config.map_file = stderr;
-  
+
   if (tree == NULL)
     {
       minfo ("NULL TREE\n");
       return;
     }
-  
+
   switch (tree->type.node_class)
     {
     case etree_value:
@@ -947,14 +931,14 @@ exp_print_tree (tree)
       return;
     case etree_assign:
 #if 0
-      if (tree->assign.dst->sdefs != (asymbol *) NULL)
+      if (tree->assign.dst->sdefs != NULL)
        fprintf (config.map_file, "%s (%x) ", tree->assign.dst->name,
                 tree->assign.dst->sdefs->value);
       else
        fprintf (config.map_file, "%s (UNDEFINED)", tree->assign.dst->name);
 #endif
       fprintf (config.map_file, "%s", tree->assign.dst);
-      exp_print_token (tree->type.node_code);
+      exp_print_token (tree->type.node_code, TRUE);
       exp_print_tree (tree->assign.src);
       break;
     case etree_provide:
@@ -966,7 +950,7 @@ exp_print_tree (tree)
     case etree_binary:
       fprintf (config.map_file, "(");
       exp_print_tree (tree->binary.lhs);
-      exp_print_token (tree->type.node_code);
+      exp_print_token (tree->type.node_code, TRUE);
       exp_print_tree (tree->binary.rhs);
       fprintf (config.map_file, ")");
       break;
@@ -978,10 +962,10 @@ exp_print_tree (tree)
       exp_print_tree (tree->trinary.rhs);
       break;
     case etree_unary:
-      exp_print_token (tree->unary.type.node_code);
+      exp_print_token (tree->unary.type.node_code, FALSE);
       if (tree->unary.child)
        {
-         fprintf (config.map_file, "(");
+         fprintf (config.map_file, " (");
          exp_print_tree (tree->unary.child);
          fprintf (config.map_file, ")");
        }
@@ -1003,9 +987,9 @@ exp_print_tree (tree)
        }
       else
        {
-         exp_print_token (tree->type.node_code);
+         exp_print_token (tree->type.node_code, FALSE);
          if (tree->name.name)
-           fprintf (config.map_file, "(%s)", tree->name.name);
+           fprintf (config.map_file, " (%s)", tree->name.name);
        }
       break;
     default:
@@ -1015,11 +999,10 @@ exp_print_tree (tree)
 }
 
 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_vma (etree_type *tree,
+            bfd_vma def,
+            char *name,
+            lang_phase_type allocation_done)
 {
   etree_value_type r;
 
@@ -1035,21 +1018,19 @@ exp_get_vma (tree, def, name, allocation_done)
 }
 
 int
-exp_get_value_int (tree, def, name, allocation_done)
-     etree_type *tree;
-     int def;
-     char *name;
-     lang_phase_type allocation_done;
+exp_get_value_int (etree_type *tree,
+                  int def,
+                  char *name,
+                  lang_phase_type allocation_done)
 {
-  return (int) exp_get_vma (tree, (bfd_vma) def, name, allocation_done);
+  return exp_get_vma (tree, def, name, allocation_done);
 }
 
 fill_type *
-exp_get_fill (tree, def, name, allocation_done)
-     etree_type *tree;
-     fill_type *def;
-     char *name;
-     lang_phase_type allocation_done;
+exp_get_fill (etree_type *tree,
+             fill_type *def,
+             char *name,
+             lang_phase_type allocation_done)
 {
   fill_type *fill;
   etree_value_type r;
@@ -1067,7 +1048,7 @@ exp_get_fill (tree, def, name, allocation_done)
     {
       unsigned char *dst;
       unsigned char *s;
-      fill = (fill_type *) xmalloc ((len + 1) / 2 + sizeof (*fill) - 1);
+      fill = xmalloc ((len + 1) / 2 + sizeof (*fill) - 1);
       fill->size = (len + 1) / 2;
       dst = fill->data;
       s = r.str;
@@ -1092,7 +1073,7 @@ exp_get_fill (tree, def, name, allocation_done)
     }
   else
     {
-      fill = (fill_type *) xmalloc (4 + sizeof (*fill) - 1);
+      fill = xmalloc (4 + sizeof (*fill) - 1);
       val = r.value;
       fill->data[0] = (val >> 24) & 0xff;
       fill->data[1] = (val >> 16) & 0xff;
@@ -1104,11 +1085,10 @@ exp_get_fill (tree, def, name, allocation_done)
 }
 
 bfd_vma
-exp_get_abs_int (tree, def, name, allocation_done)
-     etree_type *tree;
-     int def ATTRIBUTE_UNUSED;
-     char *name;
-     lang_phase_type allocation_done;
+exp_get_abs_int (etree_type *tree,
+                int def ATTRIBUTE_UNUSED,
+                char *name,
+                lang_phase_type allocation_done)
 {
   etree_value_type res;
   res = exp_fold_tree_no_dot (tree, abs_output_section, allocation_done);
@@ -1120,3 +1100,13 @@ exp_get_abs_int (tree, def, name, allocation_done)
 
   return res.value;
 }
+
+static bfd_vma
+align_n (bfd_vma value, bfd_vma align)
+{
+  if (align <= 1)
+    return value;
+
+  value = (value + align - 1) / align;
+  return value * align;
+}
This page took 0.036138 seconds and 4 git commands to generate.