*** empty log message ***

[binutils.git] / ld / ldexp.h

diff --git a/ld/ldexp.h b/ld/ldexp.h
index df814df4df09970a4aece94db93a69dbedfd1c2a..fed3a0da44c9e2d62f7f944a6549b82ad7b3d8e1 100644 (file)
--- a/ld/ldexp.h
+++ b/ld/ldexp.h
@@ -1,6 +1,6 @@
 /* ldexp.h -
-   Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GLD, the Gnu Linker.
 
@@ -16,8 +16,8 @@
 
    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, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #ifndef LDEXP_H
 #define LDEXP_H
@@ -26,7 +26,7 @@
 typedef struct {
   bfd_vma value;
   char *str;
-  struct lang_output_section_statement_struct *section;
+  asection *section;
   bfd_boolean valid_p;
 } etree_value_type;
 
@@ -40,8 +40,6 @@ typedef struct {
     etree_assign,
     etree_provide,
     etree_provided,
-    etree_undef,
-    etree_unspec,
     etree_value,
     etree_assert,
     etree_rel
@@ -65,6 +63,7 @@ typedef union etree_union {
     node_type type;
     const char *dst;
     union etree_union *src;
+    bfd_boolean hidden;
   } assign;
   struct {
     node_type type;
@@ -91,54 +90,94 @@ typedef union etree_union {
   } assert_s;
 } etree_type;
 
-extern struct exp_data_seg {
-  enum {
-    exp_dataseg_none,
-    exp_dataseg_align_seen,
-    exp_dataseg_end_seen,
-    exp_dataseg_adjust
-  } phase;
-  bfd_vma base, end, pagesize;
-} exp_data_seg;
+typedef enum {
+  lang_first_phase_enum,
+  lang_mark_phase_enum,
+  lang_allocating_phase_enum,
+  lang_final_phase_enum
+} lang_phase_type;
+
+struct ldexp_control {
+  /* Modify expression evaluation depending on this.  */
+  lang_phase_type phase;
+
+  /* Principally used for diagnostics.  */
+  bfd_boolean assigning_to_dot;
+
+  /* Working results.  */
+  etree_value_type result;
+  bfd_vma dot;
+
+  /* Current dot and section passed to ldexp folder.  */
+  bfd_vma *dotp;
+  asection *section;
+
+  /* State machine and results for DATASEG.  */
+  struct {
+    enum {
+      exp_dataseg_none,
+      exp_dataseg_align_seen,
+      exp_dataseg_relro_seen,
+      exp_dataseg_end_seen,
+      exp_dataseg_relro_adjust,
+      exp_dataseg_adjust
+    } phase;
+
+    bfd_vma base, min_base, relro_end, end, pagesize, maxpagesize;
+  } dataseg;
+};
+
+extern struct ldexp_control expld;
+
+/* A maps from a segment name to a base address.  */
+typedef struct segment_struct {
+  /* The next segment in the linked list.  */
+  struct segment_struct *next;
+  /* The name of the sgement.  */
+  const char *name;
+  /* The base address for the segment.  */
+  bfd_vma value;
+  /* True if a SEGMENT_START directive corresponding to this segment
+     has been seen.  */
+  bfd_boolean used;
+} segment_type;
+
+/* The segments specified by the user on the command-line.  */
+extern segment_type *segments;
 
 typedef struct _fill_type fill_type;
 
 etree_type *exp_intop
-  PARAMS ((bfd_vma));
+  (bfd_vma);
 etree_type *exp_bigintop
-  PARAMS ((bfd_vma, char *));
+  (bfd_vma, char *);
 etree_type *exp_relop
-  PARAMS ((asection *, bfd_vma));
-etree_value_type invalid
-  PARAMS ((void));
-etree_value_type exp_fold_tree
-  PARAMS ((etree_type *, struct lang_output_section_statement_struct *,
-          lang_phase_type, bfd_vma, bfd_vma *));
+  (asection *, bfd_vma);
+void exp_fold_tree
+  (etree_type *, asection *, bfd_vma *);
 etree_type *exp_binop
-  PARAMS ((int, etree_type *, etree_type *));
+  (int, etree_type *, etree_type *);
 etree_type *exp_trinop
-  PARAMS ((int,etree_type *, etree_type *, etree_type *));
+  (int,etree_type *, etree_type *, etree_type *);
 etree_type *exp_unop
-  PARAMS ((int, etree_type *));
+  (int, etree_type *);
 etree_type *exp_nameop
-  PARAMS ((int, const char *));
+  (int, const char *);
 etree_type *exp_assop
-  PARAMS ((int, const char *, etree_type *));
+  (int, const char *, etree_type *);
 etree_type *exp_provide
-  PARAMS ((const char *, etree_type *));
+  (const char *, etree_type *, bfd_boolean);
 etree_type *exp_assert
-  PARAMS ((etree_type *, const char *));
+  (etree_type *, const char *);
 void exp_print_tree
-  PARAMS ((etree_type *));
+  (etree_type *);
 bfd_vma exp_get_vma
-  PARAMS ((etree_type *, bfd_vma, char *, lang_phase_type));
+  (etree_type *, bfd_vma, char *);
 int exp_get_value_int
-  PARAMS ((etree_type *, int, char *, lang_phase_type));
+  (etree_type *, int, char *);
 fill_type *exp_get_fill
-  PARAMS ((etree_type *, fill_type *, char *, lang_phase_type));
+  (etree_type *, fill_type *, char *);
 bfd_vma exp_get_abs_int
-  PARAMS ((etree_type *, int, char *, lang_phase_type));
-bfd_vma align_n
-  PARAMS ((bfd_vma, bfd_vma));
+  (etree_type *, int, char *);
 
 #endif