mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-03 04:12:10 +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.
200 lines
6.7 KiB
C
200 lines
6.7 KiB
C
/* read.h - of read.c
|
|
Copyright (C) 1986-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. */
|
|
|
|
extern char *input_line_pointer; /* -> char we are parsing now. */
|
|
|
|
/* Define to make whitespace be allowed in many syntactically
|
|
unnecessary places. Normally undefined. For compatibility with
|
|
ancient GNU cc. */
|
|
/* #undef PERMIT_WHITESPACE */
|
|
#define PERMIT_WHITESPACE
|
|
|
|
#ifdef PERMIT_WHITESPACE
|
|
#define SKIP_WHITESPACE() \
|
|
((*input_line_pointer == ' ') ? ++input_line_pointer : 0)
|
|
#else
|
|
#define SKIP_WHITESPACE() know(*input_line_pointer != ' ' )
|
|
#endif
|
|
|
|
#define LEX_NAME (1) /* may continue a name */
|
|
#define LEX_BEGIN_NAME (2) /* may begin a name */
|
|
#define LEX_END_NAME (4) /* ends a name */
|
|
|
|
#define is_name_beginner(c) \
|
|
( lex_type[(unsigned char) (c)] & LEX_BEGIN_NAME )
|
|
#define is_part_of_name(c) \
|
|
( lex_type[(unsigned char) (c)] & LEX_NAME )
|
|
#define is_name_ender(c) \
|
|
( lex_type[(unsigned char) (c)] & LEX_END_NAME )
|
|
|
|
#ifndef is_a_char
|
|
#define CHAR_MASK (0xff)
|
|
#define NOT_A_CHAR (CHAR_MASK+1)
|
|
#define is_a_char(c) (((unsigned) (c)) <= CHAR_MASK)
|
|
#endif /* is_a_char() */
|
|
|
|
extern char lex_type[];
|
|
extern char is_end_of_line[];
|
|
|
|
extern int is_it_end_of_statement (void);
|
|
extern char *find_end_of_line (char *, int);
|
|
|
|
extern int target_big_endian;
|
|
|
|
/* These are initialized by the CPU specific target files (tc-*.c). */
|
|
extern const char comment_chars[];
|
|
extern const char line_comment_chars[];
|
|
extern const char line_separator_chars[];
|
|
|
|
/* Table of -I directories. */
|
|
extern char **include_dirs;
|
|
extern int include_dir_count;
|
|
extern int include_dir_maxlen;
|
|
|
|
/* The offset in the absolute section. */
|
|
extern addressT abs_section_offset;
|
|
|
|
/* The label on a line, used by some of the pseudo-ops. */
|
|
extern symbolS *line_label;
|
|
|
|
/* This is used to support MRI common sections. */
|
|
extern symbolS *mri_common_symbol;
|
|
|
|
/* True if a stabs line debug statement is currently being emitted. */
|
|
extern int outputting_stabs_line_debug;
|
|
|
|
/* Possible arguments to .linkonce. */
|
|
enum linkonce_type {
|
|
LINKONCE_UNSET = 0,
|
|
LINKONCE_DISCARD,
|
|
LINKONCE_ONE_ONLY,
|
|
LINKONCE_SAME_SIZE,
|
|
LINKONCE_SAME_CONTENTS
|
|
};
|
|
|
|
#ifndef TC_CASE_SENSITIVE
|
|
extern char original_case_string[];
|
|
#endif
|
|
|
|
#ifndef TC_PARSE_CONS_RETURN_TYPE
|
|
#define TC_PARSE_CONS_RETURN_TYPE bfd_reloc_code_real_type
|
|
#define TC_PARSE_CONS_RETURN_NONE BFD_RELOC_NONE
|
|
#endif
|
|
|
|
extern void pop_insert (const pseudo_typeS *);
|
|
extern unsigned int get_stab_string_offset
|
|
(const char *string, const char *stabstr_secname);
|
|
extern void aout_process_stab (int, const char *, int, int, int);
|
|
extern char *demand_copy_string (int *lenP);
|
|
extern char *demand_copy_C_string (int *len_pointer);
|
|
extern char get_absolute_expression_and_terminator (long *val_pointer);
|
|
extern offsetT get_absolute_expression (void);
|
|
extern unsigned int next_char_of_string (void);
|
|
extern void s_mri_sect (char *);
|
|
extern char *mri_comment_field (char *);
|
|
extern void mri_comment_end (char *, int);
|
|
extern void add_include_dir (char *path);
|
|
extern void cons (int nbytes);
|
|
extern void demand_empty_rest_of_line (void);
|
|
extern void emit_expr (expressionS *exp, unsigned int nbytes);
|
|
extern void emit_expr_with_reloc (expressionS *exp, unsigned int nbytes,
|
|
TC_PARSE_CONS_RETURN_TYPE);
|
|
extern void emit_expr_fix (expressionS *, unsigned int, fragS *, char *,
|
|
TC_PARSE_CONS_RETURN_TYPE);
|
|
extern void equals (char *sym_name, int reassign);
|
|
extern void float_cons (int float_type);
|
|
extern void ignore_rest_of_line (void);
|
|
#define discard_rest_of_line ignore_rest_of_line
|
|
extern int output_leb128 (char *, valueT, int sign);
|
|
extern void pseudo_set (symbolS * symbolP);
|
|
extern void read_a_source_file (char *name);
|
|
extern void read_begin (void);
|
|
extern void read_print_statistics (FILE *);
|
|
extern int sizeof_leb128 (valueT, int sign);
|
|
extern void stabs_generate_asm_file (void);
|
|
extern void stabs_generate_asm_lineno (void);
|
|
extern void stabs_generate_asm_func (const char *, const char *);
|
|
extern void stabs_generate_asm_endfunc (const char *, const char *);
|
|
extern void do_repeat (int,const char *,const char *);
|
|
extern void do_repeat_with_expander (int, const char *, const char *, const char *);
|
|
extern void end_repeat (int);
|
|
extern void do_parse_cons_expression (expressionS *, int);
|
|
|
|
extern void generate_lineno_debug (void);
|
|
|
|
extern void s_abort (int) ATTRIBUTE_NORETURN;
|
|
extern void s_align_bytes (int arg);
|
|
extern void s_align_ptwo (int);
|
|
extern void bss_alloc (symbolS *, addressT, int);
|
|
extern offsetT parse_align (int);
|
|
extern symbolS *s_comm_internal (int, symbolS *(*) (int, symbolS *, addressT));
|
|
extern symbolS *s_lcomm_internal (int, symbolS *, addressT);
|
|
extern void s_app_file_string (char *, int);
|
|
extern void s_app_file (int);
|
|
extern void s_app_line (int);
|
|
extern void s_bundle_align_mode (int);
|
|
extern void s_bundle_lock (int);
|
|
extern void s_bundle_unlock (int);
|
|
extern void s_comm (int);
|
|
extern void s_data (int);
|
|
extern void s_desc (int);
|
|
extern void s_else (int arg);
|
|
extern void s_elseif (int arg);
|
|
extern void s_end (int arg);
|
|
extern void s_endif (int arg);
|
|
extern void s_err (int);
|
|
extern void s_errwarn (int);
|
|
extern void s_fail (int);
|
|
extern void s_fill (int);
|
|
extern void s_float_space (int mult);
|
|
extern void s_func (int);
|
|
extern void s_globl (int arg);
|
|
extern void s_if (int arg);
|
|
extern void s_ifb (int arg);
|
|
extern void s_ifc (int arg);
|
|
extern void s_ifdef (int arg);
|
|
extern void s_ifeqs (int arg);
|
|
extern void s_ignore (int arg);
|
|
extern void s_include (int arg);
|
|
extern void s_irp (int arg);
|
|
extern void s_lcomm (int needs_align);
|
|
extern void s_lcomm_bytes (int needs_align);
|
|
extern void s_leb128 (int sign);
|
|
extern void s_linkonce (int);
|
|
extern void s_lsym (int);
|
|
extern void s_macro (int);
|
|
extern void s_mexit (int);
|
|
extern void s_mri (int);
|
|
extern void s_mri_common (int);
|
|
extern void s_org (int);
|
|
extern void s_print (int);
|
|
extern void s_purgem (int);
|
|
extern void s_rept (int);
|
|
extern void s_set (int);
|
|
extern void s_space (int mult);
|
|
extern void s_stab (int what);
|
|
extern void s_struct (int);
|
|
extern void s_text (int);
|
|
extern void stringer (int append_zero);
|
|
extern void s_xstab (int what);
|
|
extern void s_rva (int);
|
|
extern void s_incbin (int);
|
|
extern void s_weakref (int);
|