X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-ns32k.h;h=d905f663845945a0a3749ea0f4bcb91c5c25ee3c;hb=507916b8551f6227da9fe8071267c164a3014b79;hp=e547bf59a9aa0bc75ce53fa4992d09a2063c02b7;hpb=a161fe53205dbc69d42f5a123b2b04346724b2de;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/config/tc-ns32k.h b/gas/config/tc-ns32k.h
index e547bf59a9..d905f66384 100644
--- a/gas/config/tc-ns32k.h
+++ b/gas/config/tc-ns32k.h
@@ -1,12 +1,11 @@
 /* tc-ns32k.h -- Opcode table for National Semi 32k processor
-   Copyright 1987, 1992, 1993, 1994, 1995, 1997, 2000, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful,
@@ -16,36 +15,28 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; 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.  */
 
 #define TC_NS32K
 
 #define TARGET_BYTES_BIG_ENDIAN	0
 
 #define TC_PCREL_ADJUST(F) md_pcrel_adjust(F)
-extern int md_pcrel_adjust PARAMS((fragS *fragP));
+extern int md_pcrel_adjust (fragS *);
 
-#ifdef BFD_ASSEMBLER
 #define NO_RELOC BFD_RELOC_NONE
 
 #define TARGET_ARCH		bfd_arch_ns32k
 
-#ifndef TARGET_FORMAT		/* Maybe defined in te-*.h */
+#ifndef TARGET_FORMAT		/* Maybe defined in te-*.h.  */
 #define TARGET_FORMAT		"a.out-pc532-mach"
 #endif
-#else
-#define NO_RELOC 0
-#endif
 
 #define LOCAL_LABELS_FB 1
 
 #include "bit_fix.h"
 
-#define tc_aout_pre_write_hook(x)	{;}	/* not used */
-#define tc_crawl_symbol_chain(a)	{;}	/* not used */
-#define tc_headers_hook(a)		{;}	/* not used */
-
 #ifdef SEQUENT_COMPATABILITY
 #define DEF_MODEC 20
 #define DEF_MODEL 21
@@ -63,15 +54,8 @@ extern int md_pcrel_adjust PARAMS((fragS *fragP));
 #define ARG_LEN 50
 
 #define TC_CONS_FIX_NEW cons_fix_new_ns32k
-extern void fix_new_ns32k_exp PARAMS ((fragS *, int, int, expressionS *,
-				       int, int, bit_fixS *, int, fragS *,
-				       unsigned int));
-
-extern void fix_new_ns32k PARAMS ((fragS *, int, int, symbolS *, long,
-				   int, int, bit_fixS *, int, fragS *,
-				   unsigned int));
-
-extern void cons_fix_new_ns32k PARAMS ((fragS *, int, int, expressionS *));
+extern void cons_fix_new_ns32k (fragS *, int, int, expressionS *,
+				bfd_reloc_code_real_type);
 
 /* The NS32x32 has a non 0 nop instruction which should be used in aligns.  */
 #define NOP_OPCODE 0xa2
@@ -89,7 +73,7 @@ extern const struct relax_type md_relax_table[];
       char         fr_bsr;			\
     }
 
-#define TC_FRAG_INIT(X)				\
+#define TC_FRAG_INIT(X, MAX_BYTES)		\
   do						\
      {						\
        frag_opcode_frag (X) = NULL;		\
@@ -107,14 +91,16 @@ extern const struct relax_type md_relax_table[];
   struct					\
     {						\
       fragS *      opcode_fragP;		\
+      bit_fixS *   fx_bit_fixP;			\
       unsigned int opcode_offset;		\
       unsigned int bsr : 1;			\
+      unsigned int fx_im_disp : 2;		\
     }
 
 /* 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_im_disp(X)       (X)->tc_fix_data.fx_im_disp
+#define fix_bit_fixP(X)      (X)->tc_fix_data.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
@@ -124,16 +110,20 @@ extern const struct relax_type md_relax_table[];
      {						\
        fix_opcode_frag(X) = NULL;		\
        fix_opcode_offset(X) = 0;		\
+       fix_bit_fixP(X) = NULL;			\
        fix_bsr(X) = 0;				\
+       fix_im_disp(X) = 0;			\
      }						\
   while (0)
 
 #define TC_FIX_DATA_PRINT(FILE, FIX)					\
   do									\
     {									\
-      fprintf ((FILE), "opcode_frag=%ld, operand offset=%d, bsr=%d\n",	\
-	      (unsigned long) fix_opcode_frag (FIX),			\
-	      fix_opcode_offset (FIX),					\
-	      fix_bsr (FIX));						\
+      fprintf ((FILE), "opcode_frag=%ld, operand offset=%d, bsr=%d, "	\
+	       "im_disp=%d\n",						\
+	       (unsigned long) fix_opcode_frag (FIX),			\
+	       fix_opcode_offset (FIX),					\
+	       fix_bsr (FIX),						\
+	       fix_im_disp (FIX));					\
     }									\
   while (0)