mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
62ebcb5cbe
A number of targets pass extra information from TC_PARSE_CONS_EXPRESSION to TC_CONS_FIX_NEW via static variables. That's OK, but not best practice. tc-ppc.c goes further in implementing its own replacement for cons(), because the generic one doesn't allow relocation modifiers on constants. This patch fixes both of these warts. * gas/config/tc-alpha.h (TC_CONS_FIX_NEW): Add RELOC parameter. * gas/config/tc-arc.c (arc_cons_fix_new): Add reloc parameter. * gas/config/tc-arc.h (arc_cons_fix_new): Update prototype. (TC_CONS_FIX_NEW): Add RELOC parameter. * gas/config/tc-arm.c (cons_fix_new_arm): Similarly * gas/config/tc-arm.h (cons_fix_new_arm, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-cr16.c (cr16_cons_fix_new): Similarly. * gas/config/tc-cr16.h (cr16_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-crx.h (TC_CONS_FIX_NEW): Similarly. * gas/config/tc-m32c.c (m32c_cons_fix_new): Similarly. * gas/config/tc-m32c.h (m32c_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-mn10300.c (mn10300_cons_fix_new): Similarly. * gas/config/tc-mn10300.h (mn10300_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-ns32k.c (cons_fix_new_ns32k): Similarly. * gas/config/tc-ns32k.h (cons_fix_new_ns32k): Similarly. * gas/config/tc-pj.c (pj_cons_fix_new_pj): Similarly. * gas/config/tc-pj.h (pj_cons_fix_new_pj, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-rx.c (rx_cons_fix_new): Similarly. * gas/config/tc-rx.h (rx_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-sh.c (sh_cons_fix_new): Similarly. * gas/config/tc-sh.h (sh_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-tic54x.c (tic54x_cons_fix_new): Similarly. * gas/config/tc-tic54x.h (tic54x_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-tic6x.c (tic6x_cons_fix_new): Similarly. * gas/config/tc-tic6x.h (tic6x_cons_fix_new, TC_CONS_FIX_NEW): Similarly. * gas/config/tc-arc.c (arc_parse_cons_expression): Return reloc. * gas/config/tc-arc.h (arc_parse_cons_expression): Update proto. * gas/config/tc-avr.c (exp_mod_data): Make global. (pexp_mod_data): Delete. (avr_parse_cons_expression): Return exp_mod_data pointer. (avr_cons_fix_new): Add exp_mod_data_t pointer param. (exp_mod_data_t): Move typedef.. * gas/config/tc-avr.h: ..to here. (exp_mod_data): Declare. (TC_PARSE_CONS_RETURN_TYPE, TC_PARSE_CONS_RETURN_NONE): Define. (avr_parse_cons_expression, avr_cons_fix_new): Update prototype. (TC_CONS_FIX_NEW): Update. * gas/config/tc-hppa.c (hppa_field_selector): Delete static var. (cons_fix_new_hppa): Add hppa_field_selector param. (fix_new_hppa): Adjust. (parse_cons_expression_hppa): Return field selector. * gas/config/tc-hppa.h (parse_cons_expression_hppa): Update proto. (cons_fix_new_hppa): Likewise. (TC_PARSE_CONS_RETURN_TYPE, TC_PARSE_CONS_RETURN_NONE): Define. * gas/config/tc-i386.c (got_reloc): Delete static var. (x86_cons_fix_new): Add reloc param. (x86_cons): Return got reloc. * gas/config/tc-i386.h (x86_cons, x86_cons_fix_new): Update proto. (TC_CONS_FIX_NEW): Add RELOC param. * gas/config/tc-ia64.c (ia64_cons_fix_new): Add reloc param. Adjust calls. * gas/config/tc-ia64.h (ia64_cons_fix_new): Update prototype. (TC_CONS_FIX_NEW): Add reloc param. * gas/config/tc-microblaze.c (parse_cons_expression_microblaze): Return reloc. (cons_fix_new_microblaze): Add reloc param. * gas/config/tc-microblaze.h: Formatting. (parse_cons_expression_microblaze): Update proto. (cons_fix_new_microblaze): Likewise. * gas/config/tc-nios2.c (nios2_tls_ldo_reloc): Delete static var. (nios2_cons): Return ldo reloc. (nios2_cons_fix_new): Delete. * gas/config/tc-nios2.h (nios2_cons): Update prototype. (nios2_cons_fix_new, TC_CONS_FIX_NEW): Delete. * gas/config/tc-ppc.c (md_pseudo_table): Remove quad, long, word, short. Make llong use cons. (ppc_elf_suffix): Return BFD_RELOC_NONE rather than BFD_RELOC_UNUSED. (ppc_elf_cons): Delete. (ppc_elf_parse_cons): New function. (ppc_elf_validate_fix): Don't check for BFD_RELOC_UNUSED. (md_assemble): Use BFD_RELOC_NONE rather than BFD_RELOC_UNUSED. * gas/config/tc-ppc.h (TC_PARSE_CONS_EXPRESSION): Define (ppc_elf_parse_cons): Declare. * gas/config/tc-sparc.c (sparc_cons_special_reloc): Delete static var. (sparc_cons): Return reloc specifier. (cons_fix_new_sparc): Add reloc specifier param. (sparc_cfi_emit_pcrel_expr): Use emit_expr_with_reloc. * gas/config/tc-sparc.h (TC_PARSE_CONS_RETURN_TYPE): Define. (TC_PARSE_CONS_RETURN_NONE): Define. (sparc_cons, cons_fix_new_sparc): Update prototype. * gas/config/tc-v850.c (hold_cons_reloc): Delete static var. (v850_reloc_prefix): Use BFD_RELOC_NONE rather than BFD_RELOC_UNUSED. (md_assemble): Likewise. (parse_cons_expression_v850): Return reloc. (cons_fix_new_v850): Add reloc parameter. * gas/config/tc-v850.h (parse_cons_expression_v850): Update proto. (cons_fix_new_v850): Likewise. * gas/config/tc-vax.c (vax_cons_special_reloc): Delete static var. (vax_cons): Return reloc. (vax_cons_fix_new): Add reloc parameter. * gas/config/tc-vax.h (vax_cons, vax_cons_fix_new): Update proto. * gas/config/tc-xstormy16.c (xstormy16_cons_fix_new): Add reloc param. * gas/config/tc-xstormy16.h (xstormy16_cons_fix_new): Update proto. * gas/dwarf2dbg.c (TC_PARSE_CONS_RETURN_NONE): Provide default. (emit_fixed_inc_line_addr): Adjust exmit_expr_fix calls. * gas/read.c (TC_PARSE_CONS_EXPRESSION): Return value. (do_parse_cons_expression): Adjust. (cons_worker): Pass return value from TC_PARSE_CONS_EXPRESSION to emit_expr_with_reloc. (emit_expr_with_reloc): New function handling reloc, mostly extracted from.. (emit_expr): ..here. (emit_expr_fix): Add reloc param. Adjust TC_CONS_FIX_NEW invocation. Handle reloc. (parse_mri_cons): Convert to ISO. * gas/read.h (TC_PARSE_CONS_RETURN_TYPE): Define. (TC_PARSE_CONS_RETURN_NONE): Define. (emit_expr_with_reloc): Declare. (emit_expr_fix): Update prototype. * gas/write.c (write_object_file): Update TC_CONS_FIX_NEW invocation.
121 lines
4.2 KiB
C
121 lines
4.2 KiB
C
/* tc-microblaze.h -- Header file for tc-microblaze.c.
|
|
|
|
Copyright (C) 2009-2014 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 3, or (at your option)
|
|
any later version.
|
|
|
|
GAS is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
02110-1301, USA. */
|
|
|
|
#ifndef TC_MICROBLAZE
|
|
#define TC_MICROBLAZE 1
|
|
|
|
#define TARGET_ARCH bfd_arch_microblaze
|
|
#ifndef TARGET_BYTES_BIG_ENDIAN
|
|
/* Used to initialise target_big_endian. */
|
|
#define TARGET_BYTES_BIG_ENDIAN 1
|
|
#endif
|
|
|
|
#define IGNORE_NONSTANDARD_ESCAPES
|
|
|
|
#define TC_RELOC_MANGLE(a,b,c) tc_reloc_mangle (a, b, c)
|
|
|
|
/* We need to handle expressions of type "symbol op symbol" and create
|
|
relocs for such expressions as -relax in linker can change the value
|
|
of such expressions */
|
|
#define TC_CONS_FIX_NEW cons_fix_new_microblaze
|
|
#define TC_PARSE_CONS_EXPRESSION(EXP, NBYTES) \
|
|
parse_cons_expression_microblaze (EXP, NBYTES)
|
|
extern bfd_reloc_code_real_type parse_cons_expression_microblaze
|
|
(expressionS *, int);
|
|
|
|
#define TC_FORCE_RELOCATION_SECTION(FIXP,SEG) 1
|
|
#define UNDEFINED_DIFFERENCE_OK 1
|
|
|
|
#define TC_FORCE_RELOCATION_LOCAL(FIX) \
|
|
(!(FIX)->fx_pcrel \
|
|
|| (FIX)->fx_r_type == BFD_RELOC_MICROBLAZE_64_GOT \
|
|
|| (FIX)->fx_r_type == BFD_RELOC_MICROBLAZE_64_PLT \
|
|
|| (FIX)->fx_r_type == BFD_RELOC_MICROBLAZE_64_GOTOFF \
|
|
|| (FIX)->fx_r_type == BFD_RELOC_MICROBLAZE_32_GOTOFF \
|
|
|| TC_FORCE_RELOCATION (FIX))
|
|
|
|
#define tc_fix_adjustable(X) tc_microblaze_fix_adjustable(X)
|
|
extern int tc_microblaze_fix_adjustable (struct fix *);
|
|
|
|
extern const struct relax_type md_relax_table[];
|
|
#define TC_GENERIC_RELAX_TABLE md_relax_table
|
|
|
|
/* We don't need to handle .word strangely. */
|
|
#define WORKING_DOT_WORD
|
|
|
|
#define LISTING_HEADER "Xilinx MicroBlaze GAS Listing"
|
|
#define LISTING_LHS_CONT_LINES 4
|
|
|
|
#define NEED_FX_R_TYPE 1
|
|
|
|
/* We want local label support. */
|
|
#define LOCAL_LABELS_FB 1
|
|
|
|
/* Want the section information too... */
|
|
#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
|
|
|
|
#define MD_APPLY_FIX3 /* We want the segment as well. */
|
|
|
|
/* We set the fx_done field appropriately in md_apply_fix. */
|
|
#define TC_HANDLES_FX_DONE
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
#define TARGET_FORMAT (target_big_endian ? "elf32-microblaze" : "elf32-microblazeel")
|
|
|
|
#define ELF_TC_SPECIAL_SECTIONS \
|
|
{ ".sdata", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, \
|
|
{ ".sbss", SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, \
|
|
{ ".sdata2", SHT_PROGBITS, SHF_ALLOC }, \
|
|
{ ".sbss2", SHT_PROGBITS, SHF_ALLOC }, \
|
|
/* Other special sections not generated by the assembler: .reginfo,
|
|
.liblist, .conflict, .gptab, .got, .dynamic, .rel.dyn. */
|
|
|
|
#endif /* OBJ_ELF */
|
|
|
|
#ifndef TARGET_FORMAT
|
|
# error No target format specified.
|
|
#endif
|
|
|
|
#include "write.h" /* For definition of fixS */
|
|
|
|
extern void md_begin (void);
|
|
extern void md_assemble (char *);
|
|
extern symbolS * md_undefined_symbol (char *);
|
|
extern char * md_atof (int, char *, int *);
|
|
extern int md_parse_option (int, char *);
|
|
extern void md_show_usage (FILE *);
|
|
extern void md_convert_frag (bfd *, segT, fragS *);
|
|
extern void md_operand (expressionS *);
|
|
extern int md_estimate_size_before_relax (fragS *, segT);
|
|
extern void md_number_to_chars (char *, valueT, int);
|
|
extern valueT md_section_align (segT, valueT);
|
|
extern long md_pcrel_from_section (fixS *, segT);
|
|
extern arelent * tc_gen_reloc (asection *, fixS *);
|
|
extern void cons_fix_new_microblaze (fragS *, int, int,
|
|
expressionS *,
|
|
bfd_reloc_code_real_type);
|
|
extern void md_apply_fix3 (fixS *, valueT *, segT);
|
|
|
|
#define EXTERN_FORCE_RELOC -1
|
|
|
|
#endif /* TC_MICROBLAZE */
|