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.
129 lines
4.2 KiB
C
129 lines
4.2 KiB
C
/* tc-tic54x.h -- Header file for tc-tic54x.c
|
|
Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
|
Contributed by Timothy Wall (twall@alum.mit.edu)
|
|
|
|
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_TIC54X_H_
|
|
#define _TC_TIC54X_H_
|
|
|
|
/* select the proper coff format (see obj-coff.h) */
|
|
#define TC_TIC54X
|
|
|
|
#define TARGET_BYTES_BIG_ENDIAN 0
|
|
#define OCTETS_PER_BYTE_POWER 1
|
|
|
|
#define TARGET_ARCH bfd_arch_tic54x
|
|
|
|
#define WORKING_DOT_WORD 1
|
|
|
|
#define MAX_OPERANDS 4
|
|
#define PARALLEL_SEPARATOR '|'
|
|
#define LABELS_WITHOUT_COLONS 1
|
|
/* accept 0FFFFh, 1010b, etc. */
|
|
#define NUMBERS_WITH_SUFFIX 1
|
|
/* $ is section program counter */
|
|
#define DOLLAR_DOT 1
|
|
/* accept parallel lines like
|
|
add #1,a || ld #1, b
|
|
(may also be split across lines)
|
|
*/
|
|
#define DOUBLEBAR_PARALLEL 1
|
|
/* affects preprocessor */
|
|
#define KEEP_WHITE_AROUND_COLON 1
|
|
|
|
struct bit_info
|
|
{
|
|
segT seg;
|
|
#define TYPE_SPACE 0
|
|
#define TYPE_BES 1
|
|
#define TYPE_FIELD 2
|
|
int type;
|
|
symbolS *sym;
|
|
valueT value;
|
|
char *where;
|
|
int offset;
|
|
};
|
|
|
|
/* We sometimes need to keep track of bit offsets within words */
|
|
#define TC_FRAG_TYPE int
|
|
#define TC_FRAG_INIT(FRAGP) do {(FRAGP)->tc_frag_data = 0;}while (0)
|
|
|
|
/* tell GAS whether the given token is indeed a code label */
|
|
#define TC_START_LABEL_WITHOUT_COLON(c,ptr) tic54x_start_label(c,ptr)
|
|
extern int tic54x_start_label (int, char *);
|
|
|
|
/* custom handling for relocations in cons expressions */
|
|
#define TC_CONS_FIX_NEW(FRAG, OFF, LEN, EXP, RELOC) \
|
|
tic54x_cons_fix_new (FRAG, OFF, LEN, EXP, RELOC)
|
|
extern void tic54x_cons_fix_new (fragS *, int, int, expressionS *,
|
|
bfd_reloc_code_real_type);
|
|
|
|
/* Define md_number_to_chars as the appropriate standard big endian or
|
|
little endian function. Mostly littleendian, but longwords and floats are
|
|
stored MS word first.
|
|
*/
|
|
|
|
#define md_number_to_chars tic54x_number_to_chars
|
|
extern void tic54x_number_to_chars (char *, valueT, int);
|
|
#define tc_adjust_symtab() tic54x_adjust_symtab()
|
|
extern void tic54x_adjust_symtab (void);
|
|
#define tc_unrecognized_line(ch) tic54x_unrecognized_line(ch)
|
|
extern int tic54x_unrecognized_line (int ch);
|
|
#define md_parse_name(s,e,m,c) tic54x_parse_name(s,e)
|
|
extern int tic54x_parse_name (char *name, expressionS *e);
|
|
#define md_undefined_symbol(s) tic54x_undefined_symbol(s)
|
|
extern symbolS *tic54x_undefined_symbol (char *name);
|
|
#define md_macro_start() tic54x_macro_start()
|
|
extern void tic54x_macro_start (void);
|
|
#define md_macro_end() tic54x_macro_end()
|
|
extern void tic54x_macro_end (void);
|
|
#define md_macro_info(args) tic54x_macro_info(args)
|
|
struct macro_struct;
|
|
extern void tic54x_macro_info (const struct macro_struct *);
|
|
#define tc_frob_label(sym) tic54x_define_label (sym)
|
|
extern void tic54x_define_label (symbolS *);
|
|
|
|
#define md_start_line_hook() tic54x_start_line_hook()
|
|
extern void tic54x_start_line_hook (void);
|
|
|
|
#define md_estimate_size_before_relax(f,s) \
|
|
tic54x_estimate_size_before_relax(f,s)
|
|
extern int tic54x_estimate_size_before_relax(fragS *, segT);
|
|
|
|
#define md_relax_frag(seg, f,s) tic54x_relax_frag(f,s)
|
|
extern int tic54x_relax_frag(fragS *, long);
|
|
|
|
#define md_convert_frag(b,s,f) tic54x_convert_frag(b,s,f)
|
|
extern void tic54x_convert_frag(bfd *, segT, fragS *);
|
|
|
|
/* Other things we don't support... */
|
|
|
|
/* Define away the call to md_operand in the expression parsing code.
|
|
This is called whenever the expression parser can't parse the input
|
|
and gives the assembler backend a chance to deal with it instead. */
|
|
|
|
#define md_operand(X)
|
|
|
|
/* spruce up the listing output */
|
|
#define LISTING_WORD_SIZE 2
|
|
|
|
extern void tic54x_global (int);
|
|
|
|
#endif
|