X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-fr30.h;h=590cfa68b2a0ac1917db3603fea8a50114c683b2;hb=6eb7d83039db70127a6eb3e4b64ecae782c42f00;hp=87be397fa4e2895da48ad589f0acff2d138149ad;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/config/tc-fr30.h b/gas/config/tc-fr30.h
index 87be397fa4..590cfa68b2 100644
--- a/gas/config/tc-fr30.h
+++ b/gas/config/tc-fr30.h
@@ -1,11 +1,11 @@
 /* tc-fr30.h -- Header file for tc-fr30.c.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 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,
@@ -15,16 +15,11 @@
 
    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. */
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #define TC_FR30
 
-#ifndef BFD_ASSEMBLER
-/* leading space so will compile with cc */
- #error FR30 support requires BFD_ASSEMBLER
-#endif
-
 #define LISTING_HEADER "FR30 GAS "
 
 /* The target BFD architecture.  */
@@ -34,53 +29,37 @@
 
 #define TARGET_BYTES_BIG_ENDIAN 1
 
-/* call md_pcrel_from_section, not md_pcrel_from */
-long md_pcrel_from_section PARAMS ((struct fix *, segT));
-#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
-
 /* Permit temporary numeric labels.  */
 #define LOCAL_LABELS_FB 1
 
-#define DIFF_EXPR_OK		/* .-foo gets turned into PC relative relocs */
+#define DIFF_EXPR_OK		/* .-foo gets turned into PC relative relocs.  */
 
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-#define MD_APPLY_FIX3
-#define md_apply_fix3 gas_cgen_md_apply_fix3
+/* Values passed to md_apply_fix don't include the symbol value.  */
+#define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define TC_FRAG_INIT(fragP) \
-do { \
-  (fragP)->fr_cgen.insn = 0; \
-  (fragP)->fr_cgen.opindex = 0; \
-  (fragP)->fr_cgen.opinfo = 0; \
-} while (0);
+#define md_apply_fix gas_cgen_md_apply_fix
 
-#define TC_HANDLES_FX_DONE
+#define tc_fix_adjustable(FIX) fr30_fix_adjustable (FIX)
+struct fix;
+extern bfd_boolean fr30_fix_adjustable (struct fix *);
 
 #define tc_gen_reloc gas_cgen_tc_gen_reloc
 
 /* Call md_pcrel_from_section(), not md_pcrel_from().  */
-#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
-extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
-
-/* Record a pointer to the insn table entry for each fixup.  */
-#define TC_FIX_TYPE struct { PTR insn; int opinfo; }
-#define TC_INIT_FIX_DATA(FIXP) \
-  ((FIXP)->tc_fix_data.insn = NULL, (FIXP)->tc_fix_data.opinfo = 0)
+#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section (FIX, SEC)
+extern long md_pcrel_from_section (struct fix *, segT);
 
 /* For 8 vs 16 vs 32 bit branch selection.  */
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 extern const struct relax_type md_relax_table[];
 
 /* We need a special version of the TC_START_LABEL macro so that we
-   allow the LDI:8, LDI:20 and LDI:32 instructions to be parsed as
-   such.  Note - in a HORRIBLE HACK, we make use of the knowledge that
-   this marco is only ever evaluated in one place (read_a_source_file
-   in read.c) where we can access the local variable 's' - the start
-   of the symbol that was terminated by 'character'.  Also we need to
-   be able to change the contents of the local variable 'c' which is
-   passed to this macro as 'character'.  */
-#define TC_START_LABEL(character, i_l_p)			\
-  ((character) != ':' ? 0 : (character = fr30_is_label_start (s)) ? 0 : ((character = ':'), 1))
-extern char fr30_is_label_start PARAMS ((char *));
+   allow the LDI:8, LDI:20, LDI:32 and delay slot instructions to be
+   parsed as such.  We need to be able to change the contents of the
+   var storing what was at the NUL delimiter.  */
+#define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR)		\
+  (NEXT_CHAR == ':' && !fr30_is_colon_insn (STR, &NUL_CHAR))
+extern int fr30_is_colon_insn (char *, char *);