mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +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.
122 lines
4.7 KiB
C
122 lines
4.7 KiB
C
/* Definitions for Altera Nios II assembler.
|
|
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
|
Contributed by Nigel Gray (ngray@altera.com).
|
|
Contributed by Mentor Graphics, 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_NIOS2
|
|
#define TC_NIOS2
|
|
|
|
/* If unspecified, default to little endian. We can explicitly specify
|
|
* a big-endian default by configuring with --target=nios2eb-elf. We
|
|
* can override the default with the -EB and -EL options. */
|
|
#ifndef TARGET_BYTES_BIG_ENDIAN
|
|
#define TARGET_BYTES_BIG_ENDIAN 0
|
|
#endif
|
|
|
|
/* Words are big enough to hold addresses. */
|
|
#define WORKING_DOT_WORD 1
|
|
|
|
#ifdef OBJ_ELF
|
|
extern const char *nios2_target_format (void);
|
|
#define TARGET_FORMAT nios2_target_format ()
|
|
#define TARGET_ARCH bfd_arch_nios2
|
|
#endif
|
|
|
|
/* A NIOS2 instruction consists of tokens and separator characters
|
|
the tokens are things like the instruction name (add, or jmp etc),
|
|
the register indices ($5, $7 etc), and constant expressions. The
|
|
separator characters are commas, brackets and space.
|
|
The instruction name is always separated from other tokens by a space
|
|
The maximum number of tokens in an instruction is 5 (the instruction name,
|
|
3 arguments, and a 4th string representing the expected instructin opcode
|
|
after assembly. The latter is only used when the assemble is running in
|
|
self test mode, otherwise its presence will generate an error. */
|
|
#define NIOS2_MAX_INSN_TOKENS 6
|
|
|
|
/* There are no machine-specific operands so we #define this to nothing. */
|
|
#define md_operand(x)
|
|
|
|
/* Function prototypes exported to rest of GAS. */
|
|
extern void md_assemble (char *op_str);
|
|
extern void md_end (void);
|
|
extern void md_begin (void);
|
|
|
|
#define TC_FORCE_RELOCATION(fixp) nios2_force_relocation (fixp)
|
|
extern int nios2_force_relocation (struct fix *);
|
|
|
|
#define tc_fix_adjustable(fixp) nios2_fix_adjustable (fixp)
|
|
extern int nios2_fix_adjustable (struct fix *);
|
|
|
|
#define tc_frob_label(lab) nios2_frob_label (lab)
|
|
extern void nios2_frob_label (symbolS *);
|
|
|
|
#define tc_frob_symbol(symp, punt) punt = nios2_frob_symbol (symp) ? 1 : punt
|
|
extern int nios2_frob_symbol (symbolS * symp);
|
|
|
|
#define md_cons_align(nbytes) nios2_cons_align (nbytes)
|
|
extern void nios2_cons_align (int);
|
|
|
|
extern void md_convert_frag (bfd * headers, segT sec, fragS * fragP);
|
|
|
|
/* When relaxing, we need to generate relocations for alignment
|
|
directives. */
|
|
#define HANDLE_ALIGN(frag) nios2_handle_align (frag)
|
|
extern void nios2_handle_align (fragS *);
|
|
|
|
#define md_relax_frag nios2_relax_frag
|
|
extern long nios2_relax_frag (segT segment, fragS * fragP, long stretch);
|
|
|
|
#ifdef OBJ_ELF
|
|
#define ELF_TC_SPECIAL_SECTIONS \
|
|
{ ".sdata", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \
|
|
{ ".sbss", SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \
|
|
{ ".lit4", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \
|
|
{ ".lit8", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL },
|
|
|
|
/* Processor-specific section directives. */
|
|
#define md_elf_section_letter nios2_elf_section_letter
|
|
extern int nios2_elf_section_letter (int, char **);
|
|
#define md_elf_section_flags nios2_elf_section_flags
|
|
extern flagword nios2_elf_section_flags (flagword, int, int);
|
|
#endif
|
|
|
|
#define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
|
|
|
|
#define DIFF_EXPR_OK
|
|
|
|
/* Nios2 ABI doesn't have 32-bit PCREL relocation, and, as relocations for
|
|
CFI information will be in section other than .text, we can't use PC-biased
|
|
relocs. */
|
|
#define CFI_DIFF_EXPR_OK 0
|
|
|
|
#define TC_PARSE_CONS_EXPRESSION(EXP, NBYTES) nios2_cons (EXP, NBYTES)
|
|
extern bfd_reloc_code_real_type nios2_cons (expressionS *exp, int size);
|
|
|
|
/* We want .cfi_* pseudo-ops for generating unwind info. */
|
|
#define TARGET_USE_CFIPOP 1
|
|
#define DWARF2_DEFAULT_RETURN_COLUMN 31
|
|
#define DWARF2_CIE_DATA_ALIGNMENT (-4)
|
|
#define tc_regname_to_dw2regnum nios2_regname_to_dw2regnum
|
|
extern int nios2_regname_to_dw2regnum (char *regname);
|
|
#define tc_cfi_frame_initial_instructions nios2_frame_initial_instructions
|
|
extern void nios2_frame_initial_instructions (void);
|
|
|
|
#endif /* TC_NIOS2 */
|