i386v host/target/native separation

[deliverable/binutils-gdb.git] / gas / write.h

diff --git a/gas/write.h b/gas/write.h
index d3f307200921c05ba47c7ae7d63c42511f8ee4b6..0b47dcbac5b47d40b28cbf2f18c1896b6f6cb6d7 100644 (file)
--- a/gas/write.h
+++ b/gas/write.h
@@ -1,8 +1,6 @@
-/* write.h -> write.c */
+/* write.h
 
-/*   MODIFIED BY CHRIS BENENATI, FOR INTEL CORPORATION, 4/89   */
-/* write.h -> write.c
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992 Free Software Foundation, Inc.
    
    This file is part of GAS, the GNU Assembler.
    
@@ -37,49 +35,32 @@
 
 #define S_LOCAL_NAME(s) (LOCAL_LABEL(S_GET_NAME(s)))
 
-/* The bit_fix was implemented to support machines that need variables
-   to be inserted in bitfields other than 1, 2 and 4 bytes. 
-   Furthermore it gives us a possibillity to mask in bits in the symbol
-   when it's fixed in the objectcode and check the symbols limits.
-   
-   The or-mask is used to set the huffman bits in displacements for the
-   ns32k port.
-   The acbi, addqi, movqi, cmpqi instruction requires an assembler that
-   can handle bitfields. Ie handle an expression, evaluate it and insert
-   the result in an some bitfield. ( ex: 5 bits in a short field of a opcode) 
-   */
-
-struct bit_fix {
-       int                     fx_bit_size;    /* Length of bitfield           */
-       int                     fx_bit_offset;  /* Bit offset to bitfield       */
-       long                    fx_bit_base;    /* Where do we apply the bitfix.
-                                                  If this is zero, default is assumed. */
-       long                  fx_bit_base_adj;/* Adjustment of base */
-       long                    fx_bit_max;     /* Signextended max for bitfield */
-       long                    fx_bit_min;     /* Signextended min for bitfield */
-       long                    fx_bit_add;     /* Or mask, used for huffman prefix */
-};
-typedef struct bit_fix bit_fixS;
+#include "bit_fix.h"
+
 /*
  * FixSs may be built up in any order.
  */
 
 struct fix {
-       fragS *fx_frag; /* Which frag? */
-       long fx_where;  /* Where is the 1st byte to fix up? */
-       symbolS *fx_addsy; /* NULL or Symbol whose value we add in. */
-       symbolS *fx_subsy; /* NULL or Symbol whose value we subtract. */
-       long fx_offset; /* Absolute number we add in. */
-       struct fix *fx_next;    /* NULL or -> next fixS. */
-       short int fx_size;      /* How many bytes are involved? */
-       char fx_pcrel;  /* TRUE: pc-relative. */
-       char fx_pcrel_adjust;/* pc-relative offset adjust */
-       char fx_im_disp;        /* TRUE: value is a displacement */
-       bit_fixS *fx_bit_fixP;  /* IF NULL no bitfix's to do */  
-       char fx_bsr;            /* sequent-hack */
-       enum reloc_type fx_r_type;      /* Sparc hacks */
-       char fx_callj;  /* TRUE if target is a 'callj'
-                          (used by i960) */
+       fragS *fx_frag;            /* Which frag? */
+       long fx_where;             /* Where is the 1st byte to fix up? */
+       symbolS *fx_addsy;         /* NULL or Symbol whose value we add in. */
+       symbolS *fx_subsy;         /* NULL or Symbol whose value we subtract. */
+       long fx_offset;            /* Absolute number we add in. */
+       struct fix *fx_next;       /* NULL or -> next fixS. */
+       short int fx_size;         /* How many bytes are involved? */
+       char fx_pcrel;             /* TRUE: pc-relative. */
+       char fx_pcrel_adjust;      /* pc-relative offset adjust */
+       char fx_im_disp;           /* TRUE: value is a displacement */
+       bit_fixS *fx_bit_fixP;     /* IF NULL no bitfix's to do */  
+       char fx_bsr;               /* sequent-hack */
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
+       /* Hacks for machines where the type of reloc can't be
+          worked out by looking at how big it is */
+
+       int  fx_r_type; 
+#endif
+       char fx_callj;             /* TRUE if target is a 'callj' (used by i960) */
        long fx_addnumber;
 };
 
@@ -90,14 +71,15 @@ COMMON char *next_object_file_charP;
 #ifndef MANY_SEGMENTS
 COMMON fixS *text_fix_root, *text_fix_tail;    /* Chains fixSs. */
 COMMON fixS *data_fix_root, *data_fix_tail;    /* Chains fixSs. */
+COMMON fixS *bss_fix_root,  *bss_fix_tail;     /* Chains fixSs. */
 #endif
 COMMON fixS **seg_fix_rootP, **seg_fix_tailP;  /* -> one of above. */
 extern long string_byte_count;
 extern int section_alignment[];
 
-#ifdef __STDC__
+#if __STDC__ == 1
 
-bit_fixS *bit_fix_new(char size, char offset, long base_type, long base_adj, long min, long max, long add);
+bit_fixS *bit_fix_new(int size, int offset, long base_type, long base_adj, long min, long max, long add);
 void append(char **charPP, char *fromP, unsigned long length);
 void record_alignment(segT seg, int align);
 void write_object_file(void);
@@ -108,10 +90,13 @@ fixS *fix_new(fragS *frag,
              symbolS *add_symbol,
              symbolS *sub_symbol,
              long offset,
-             int pcrel,
-             enum reloc_type r_type);
+             int pcrel
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
+             , int r_type
+#endif
+);
 
-#else
+#else /* not __STDC__ */
 
 bit_fixS *bit_fix_new();
 fixS *fix_new();
@@ -119,7 +104,7 @@ void append();
 void record_alignment();
 void write_object_file();
 
-#endif /* __STDC__ */
+#endif /* not __STDC__ */
 
 /*
  * Local Variables: