include/elf/

[deliverable/binutils-gdb.git] / gas / config / tc-ns32k.h

diff --git a/gas/config/tc-ns32k.h b/gas/config/tc-ns32k.h
index 6b89482c2857e8d854eb235ac64e64d2ad3580f6..258afd0857f965b4175e827f52789c398c115ca1 100644 (file)
--- a/gas/config/tc-ns32k.h
+++ b/gas/config/tc-ns32k.h
@@ -1,5 +1,6 @@
 /* tc-ns32k.h -- Opcode table for National Semi 32k processor
-   Copyright (C) 1987, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
+   Copyright 1987, 1992, 1993, 1994, 1995, 1997, 2000
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -72,11 +73,10 @@ extern void fix_new_ns32k_exp PARAMS((fragS *frag,
                                   fragS *opcode_frag,
                                   unsigned int opcode_offset));
 
-
 extern void fix_new_ns32k PARAMS ((fragS *frag,
                                   int where,
                                   int size,
-                                  struct symbol *add_symbol,
+                                  symbolS *add_symbol,
                                   long offset,
                                   int pcrel,
                                   int im_disp,
@@ -98,20 +98,26 @@ extern void cons_fix_new_ns32k PARAMS ((fragS *frag,
 extern const struct relax_type md_relax_table[];
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 
+#define TC_FRAG_TYPE                           \
+struct {                                       \
+  fragS *fr_opcode_fragP;                      \
+  unsigned int fr_opcode_offset;               \
+  char fr_bsr;                                 \
+}
 
 #define TC_FRAG_INIT(X)                                \
   do                                           \
      {                                         \
-       frag_opcode_frag(X) = NULL;             \
-       frag_opcode_offset(X) = 0;              \
-       frag_bsr(X) = 0;                                \
+       frag_opcode_frag (X) = NULL;            \
+       frag_opcode_offset (X) = 0;             \
+       frag_bsr (X) = 0;                               \
      }                                         \
-  while(0)
+  while (0)
 
 /* Accessor macros for things which may move around */
-#define frag_opcode_frag(X) (X)->fr_targ.fr_ns32k.fr_opcode_fragP
-#define frag_opcode_offset(X) (X)->fr_targ.fr_ns32k.fr_opcode_offset
-#define frag_bsr(X) (X)->fr_targ.fr_ns32k.fr_bsr
+#define frag_opcode_frag(X)   (X)->tc_frag_data.fr_opcode_fragP
+#define frag_opcode_offset(X) (X)->tc_frag_data.fr_opcode_offset
+#define frag_bsr(X)           (X)->tc_frag_data.fr_bsr
 
 #define TC_FIX_TYPE                            \
 struct                                         \
@@ -123,11 +129,11 @@ struct                                            \
 
 /* Accessor macros for things which may move around.
    See comments in write.h.  */
-#define fix_im_disp(X)  (X)->fx_im_disp
-#define fix_bit_fixP(X) (X)->fx_bit_fixP
-#define fix_opcode_frag(X) (X)->tc_fix_data.opcode_fragP
+#define fix_im_disp(X)       (X)->fx_im_disp
+#define fix_bit_fixP(X)      (X)->fx_bit_fixP
+#define fix_opcode_frag(X)   (X)->tc_fix_data.opcode_fragP
 #define fix_opcode_offset(X) (X)->tc_fix_data.opcode_offset
-#define fix_bsr(X) (X)->tc_fix_data.bsr
+#define fix_bsr(X)           (X)->tc_fix_data.bsr
 
 #define TC_INIT_FIX_DATA(X)                    \
   do                                           \
@@ -136,14 +142,14 @@ struct                                            \
        fix_opcode_offset(X) = 0;               \
        fix_bsr(X) = 0;                         \
      }                                         \
-  while(0)
+  while (0)
 
 #define TC_FIX_DATA_PRINT(FILE, FIXP)                                  \
   do                                                                   \
     {                                                                  \
-      fprintf((FILE), "opcode_frag=%ld, operand offset=%d, bsr=%d\n",  \
+      fprintf ((FILE), "opcode_frag=%ld, operand offset=%d, bsr=%d\n", \
              (unsigned long) fix_opcode_frag (FIXP),                   \
              fix_opcode_offset (FIXP),                                 \
              fix_bsr (FIXP));                                          \
     }                                                                  \
-  while(0)
+  while (0)