From 8edc77b9b48e63d0bb26c517e3c815d6fdc73dc1 Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Sat, 11 Oct 2003 13:40:21 +0000 Subject: * config/tc-sh.c: Convert to ISO C90. Remove unnecessary prototypes and casts. * config/tc-sh.h: Likewise. * config/tc-sh64.c: Likewise. * config/tc-sh64.h: Likewise. --- gas/config/tc-sh64.c | 235 ++++++++++++++++++--------------------------------- 1 file changed, 83 insertions(+), 152 deletions(-) (limited to 'gas/config/tc-sh64.c') diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c index ee63b0e..4ccbe1d 100644 --- a/gas/config/tc-sh64.c +++ b/gas/config/tc-sh64.c @@ -133,63 +133,43 @@ static const unsigned char shmedia_little_nop_pattern[4] = (SHMEDIA_NOP_OPC >> 16) & 255, (SHMEDIA_NOP_OPC >> 24) & 255 }; -static void shmedia_md_begin - PARAMS ((void)); -static int shmedia_parse_reg - PARAMS ((char *, int *, int *, shmedia_arg_type)); -static void shmedia_md_assemble - PARAMS ((char *)); -static void shmedia_md_apply_fix3 - PARAMS ((fixS *, valueT *)); -static int shmedia_md_estimate_size_before_relax - PARAMS ((fragS *, segT)); -static int shmedia_init_reloc - PARAMS ((arelent *, fixS *)); -static char *shmedia_get_operands - PARAMS ((shmedia_opcode_info *, char *, shmedia_operands_info *)); -static void s_sh64_mode - PARAMS ((int)); -static void s_sh64_abi - PARAMS ((int)); -static void shmedia_md_convert_frag - PARAMS ((bfd *, segT, fragS *, bfd_boolean)); -static void shmedia_check_limits - PARAMS ((offsetT *, bfd_reloc_code_real_type, fixS *)); -static void sh64_set_contents_type - PARAMS ((enum sh64_elf_cr_type)); -static void shmedia_get_operand - PARAMS ((char **, shmedia_operand_info *, shmedia_arg_type)); -static unsigned long shmedia_immediate_op - PARAMS ((char *, shmedia_operand_info *, int, bfd_reloc_code_real_type)); -static char *shmedia_parse_exp - PARAMS ((char *, shmedia_operand_info *)); -static void shmedia_frob_file_before_adjust - PARAMS ((void)); -static void sh64_emit_crange - PARAMS ((symbolS *, symbolS *, enum sh64_elf_cr_type)); -static void sh64_flush_last_crange - PARAMS ((bfd *, asection *, PTR)); -static void sh64_flag_output - PARAMS ((void)); -static void sh64_update_contents_mark - PARAMS ((bfd_boolean)); -static void sh64_vtable_entry - PARAMS ((int)); -static void sh64_vtable_inherit - PARAMS ((int)); -static char * strip_datalabels - PARAMS ((void)); -static int shmedia_build_Mytes - PARAMS ((shmedia_opcode_info *, shmedia_operands_info *)); -static shmedia_opcode_info * shmedia_find_cooked_opcode - PARAMS ((char **)); -static unsigned long shmedia_mask_number - PARAMS ((unsigned long, bfd_reloc_code_real_type)); +static void shmedia_md_begin (void); +static int shmedia_parse_reg (char *, int *, int *, shmedia_arg_type); +static void shmedia_md_assemble (char *); +static void shmedia_md_apply_fix3 (fixS *, valueT *); +static int shmedia_md_estimate_size_before_relax (fragS *, segT); +static int shmedia_init_reloc (arelent *, fixS *); +static char *shmedia_get_operands (shmedia_opcode_info *, char *, + shmedia_operands_info *); +static void s_sh64_mode (int); +static void s_sh64_abi (int); +static void shmedia_md_convert_frag (bfd *, segT, fragS *, bfd_boolean); +static void shmedia_check_limits (offsetT *, bfd_reloc_code_real_type, + fixS *); +static void sh64_set_contents_type (enum sh64_elf_cr_type); +static void shmedia_get_operand (char **, shmedia_operand_info *, + shmedia_arg_type); +static unsigned long shmedia_immediate_op (char *, shmedia_operand_info *, + int, bfd_reloc_code_real_type); +static char *shmedia_parse_exp (char *, shmedia_operand_info *); +static void shmedia_frob_file_before_adjust (void); +static void sh64_emit_crange (symbolS *, symbolS *, enum sh64_elf_cr_type); +static void sh64_flush_last_crange (bfd *, asection *, void *); +static void sh64_flag_output (void); +static void sh64_update_contents_mark (bfd_boolean); +static void sh64_vtable_entry (int); +static void sh64_vtable_inherit (int); +static char *strip_datalabels (void); +static int shmedia_build_Mytes (shmedia_opcode_info *, + shmedia_operands_info *); +static shmedia_opcode_info *shmedia_find_cooked_opcode (char **); +static unsigned long shmedia_mask_number (unsigned long, + bfd_reloc_code_real_type); #include "tc-sh.c" void -shmedia_md_end () +shmedia_md_end (void) { symbolS *symp; @@ -295,7 +275,7 @@ shmedia_md_end () + offset" value. */ static void -shmedia_frob_file_before_adjust () +shmedia_frob_file_before_adjust (void) { symbolS *symp; for (symp = symbol_rootP; symp != NULL; symp = symp->sy_next) @@ -334,11 +314,7 @@ shmedia_frob_file_before_adjust () static in read.c. That solution was discarded a too kludgy. */ void -sh64_do_align (n, fill, len, max) - int n; - const char *fill; - int len; - int max; +sh64_do_align (int n, const char *fill, int len, int max) { /* Update region, or put a data region in front. */ sh64_update_contents_mark (TRUE); @@ -371,7 +347,7 @@ sh64_do_align (n, fill, len, max) assembly). */ int -sh64_max_mem_for_rs_align_code () +sh64_max_mem_for_rs_align_code (void) { segment_info_type *seginfo; fragS *mode_start_frag; @@ -403,8 +379,7 @@ sh64_max_mem_for_rs_align_code () /* Put in SHmedia NOP:s if the alignment was created when in SHmedia mode. */ void -sh64_handle_align (frag) - fragS * frag; +sh64_handle_align (fragS * frag) { int bytes = frag->fr_next->fr_address - frag->fr_address - frag->fr_fix; char * p = frag->fr_literal + frag->fr_fix; @@ -440,8 +415,7 @@ sh64_handle_align (frag) /* Set SEC_SH64_ISA32 for SHmedia sections. */ void -shmedia_frob_section_type (sec) - asection *sec; +shmedia_frob_section_type (asection *sec) { segment_info_type *seginfo; seginfo = seg_info (sec); @@ -486,7 +460,7 @@ shmedia_frob_section_type (sec) seems too much for little benefit. */ void -sh64_adjust_symtab () +sh64_adjust_symtab (void) { symbolS *symp; @@ -534,9 +508,7 @@ sh64_adjust_symtab () /* Fill-in an allocated arelent. */ static int -shmedia_init_reloc (rel, fixP) - arelent *rel; - fixS *fixP; +shmedia_init_reloc (arelent *rel, fixS *fixP) { /* Adjust parts of *relp according to *fixp, and tell that it has been done, so default initializations will not happen. */ @@ -608,9 +580,7 @@ shmedia_init_reloc (rel, fixP) /* Hook called from md_apply_fix3 in tc-sh.c. */ static void -shmedia_md_apply_fix3 (fixP, valp) - fixS *fixP; - valueT *valp; +shmedia_md_apply_fix3 (fixS *fixP, valueT *valp) { offsetT val = *valp; char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; @@ -823,11 +793,9 @@ shmedia_md_apply_fix3 (fixP, valp) /* Hook called from md_convert_frag in tc-sh.c. */ static void -shmedia_md_convert_frag (output_bfd, seg, fragP, final) - bfd *output_bfd ATTRIBUTE_UNUSED; - segT seg ATTRIBUTE_UNUSED; - fragS *fragP; - bfd_boolean final; +shmedia_md_convert_frag (bfd *output_bfd ATTRIBUTE_UNUSED, + segT seg ATTRIBUTE_UNUSED, fragS *fragP, + bfd_boolean final) { /* Pointer to first byte in variable-sized part of the frag. */ char *var_partp; @@ -1447,9 +1415,7 @@ shmedia_md_convert_frag (output_bfd, seg, fragP, final) reloc. */ static unsigned long -shmedia_mask_number (number, how) - unsigned long number; - bfd_reloc_code_real_type how; +shmedia_mask_number (unsigned long number, bfd_reloc_code_real_type how) { switch (how) { @@ -1498,10 +1464,8 @@ shmedia_mask_number (number, how) non-NULL, as_bad otherwise. */ static void -shmedia_check_limits (valp, reloc, fixp) - offsetT *valp; - bfd_reloc_code_real_type reloc; - fixS *fixp; +shmedia_check_limits (offsetT *valp, bfd_reloc_code_real_type reloc, + fixS *fixp) { offsetT val = *valp; @@ -1611,11 +1575,8 @@ shmedia_check_limits (valp, reloc, fixp) "or" into the opcode (non-zero if the value was a constant number). */ static unsigned long -shmedia_immediate_op (where, op, pcrel, how) - char *where; - shmedia_operand_info *op; - int pcrel; - bfd_reloc_code_real_type how; +shmedia_immediate_op (char *where, shmedia_operand_info *op, int pcrel, + bfd_reloc_code_real_type how) { unsigned long retval = 0; @@ -1646,11 +1607,7 @@ shmedia_immediate_op (where, op, pcrel, how) chars consumed. */ static int -shmedia_parse_reg (src, mode, reg, argtype) - char *src; - int *mode; - int *reg; - shmedia_arg_type argtype; +shmedia_parse_reg (char *src, int *mode, int *reg, shmedia_arg_type argtype) { int l0 = TOLOWER (src[0]); int l1 = l0 ? TOLOWER (src[1]) : 0; @@ -1933,9 +1890,8 @@ shmedia_parse_reg (src, mode, reg, argtype) /* Called from md_estimate_size_before_relax in tc-sh.c */ static int -shmedia_md_estimate_size_before_relax (fragP, segment_type) - fragS *fragP; - segT segment_type ATTRIBUTE_UNUSED; +shmedia_md_estimate_size_before_relax (fragS *fragP, + segT segment_type ATTRIBUTE_UNUSED) { int old_fr_fix; expressionS *exp; @@ -2240,9 +2196,7 @@ shmedia_md_estimate_size_before_relax (fragP, segment_type) datatypes adjusted. */ static char * -shmedia_parse_exp (s, op) - char *s; - shmedia_operand_info *op; +shmedia_parse_exp (char *s, shmedia_operand_info *op) { char *save; char *new; @@ -2260,10 +2214,8 @@ shmedia_parse_exp (s, op) /* Parse an operand. Store pointer to next character in *PTR. */ static void -shmedia_get_operand (ptr, op, argtype) - char **ptr; - shmedia_operand_info *op; - shmedia_arg_type argtype; +shmedia_get_operand (char **ptr, shmedia_operand_info *op, + shmedia_arg_type argtype) { char *src = *ptr; int mode = -1; @@ -2291,10 +2243,8 @@ shmedia_get_operand (ptr, op, argtype) how much text was consumed. */ static char * -shmedia_get_operands (info, args, operands) - shmedia_opcode_info *info; - char *args; - shmedia_operands_info *operands; +shmedia_get_operands (shmedia_opcode_info *info, char *args, + shmedia_operands_info *operands) { char *ptr = args; int i; @@ -2484,8 +2434,7 @@ shmedia_get_operands (info, args, operands) *STR_P to the first character after the last one read. */ static shmedia_opcode_info * -shmedia_find_cooked_opcode (str_p) - char **str_p; +shmedia_find_cooked_opcode (char **str_p) { char *str = *str_p; char *op_start; @@ -2530,9 +2479,8 @@ shmedia_find_cooked_opcode (str_p) /* Build up an instruction, including allocating the frag. */ static int -shmedia_build_Mytes (opcode, operands) - shmedia_opcode_info *opcode; - shmedia_operands_info *operands; +shmedia_build_Mytes (shmedia_opcode_info *opcode, + shmedia_operands_info *operands) { unsigned long insn = opcode->opcode_base; int i, j; @@ -2821,8 +2769,7 @@ shmedia_build_Mytes (opcode, operands) /* Assemble a SHmedia instruction. */ static void -shmedia_md_assemble (str) - char *str; +shmedia_md_assemble (char *str) { char *op_end; shmedia_opcode_info *opcode; @@ -2869,7 +2816,7 @@ shmedia_md_assemble (str) /* Hook called from md_begin in tc-sh.c. */ void -shmedia_md_begin () +shmedia_md_begin (void) { const shmedia_opcode_info *shmedia_opcode; shmedia_opcode_hash_control = hash_new (); @@ -2886,8 +2833,7 @@ shmedia_md_begin () options was specified. */ static void -s_sh64_mode (ignore) - int ignore ATTRIBUTE_UNUSED; +s_sh64_mode (int ignore ATTRIBUTE_UNUSED) { char *name = input_line_pointer, ch; @@ -2929,8 +2875,7 @@ s_sh64_mode (ignore) --abi options was specified. */ static void -s_sh64_abi (ignore) - int ignore ATTRIBUTE_UNUSED; +s_sh64_abi (int ignore ATTRIBUTE_UNUSED) { char *name = input_line_pointer, ch; @@ -2968,7 +2913,7 @@ s_sh64_abi (ignore) when options were being parsed. */ const char * -sh64_target_format () +sh64_target_format (void) { #ifdef TE_NetBSD /* For NetBSD, if the ISA is unspecified, always use SHmedia. */ @@ -3052,7 +2997,7 @@ sh64_target_format () /* The worker function of TARGET_MACH. */ int -sh64_target_mach () +sh64_target_mach (void) { /* We need to explicitly set bfd_mach_sh5 instead of the default 0. But we only do this for the 64-bit ABI: if we do it for the 32-bit ABI, @@ -3077,9 +3022,7 @@ sh64_target_mach () md_pcrel_from (in tc-sh.c). */ valueT -shmedia_md_pcrel_from_section (fixP, sec) - struct fix *fixP; - segT sec ATTRIBUTE_UNUSED; +shmedia_md_pcrel_from_section (struct fix *fixP, segT sec ATTRIBUTE_UNUSED) { know (fixP->fx_frag->fr_type == rs_machine_dependent); @@ -3128,10 +3071,8 @@ shmedia_md_pcrel_from_section (fixP, sec) and ENDSYM marking end, and CR_TYPE specifying the type. */ static void -sh64_emit_crange (startsym, endsym, cr_type) - symbolS *startsym; - symbolS *endsym; - enum sh64_elf_cr_type cr_type; +sh64_emit_crange (symbolS *startsym, symbolS *endsym, + enum sh64_elf_cr_type cr_type) { expressionS exp; segT current_seg = now_seg; @@ -3176,8 +3117,7 @@ sh64_emit_crange (startsym, endsym, cr_type) function isn't called. */ static void -sh64_set_contents_type (new_contents_type) - enum sh64_elf_cr_type new_contents_type; +sh64_set_contents_type (enum sh64_elf_cr_type new_contents_type) { segment_info_type *seginfo; @@ -3275,8 +3215,7 @@ _("SHmedia code not allowed in same section as constants and SHcompact code")); doesn't matter whether or not an assembled opcode is nearby. */ void -sh64_frob_label (symp) - symbolS *symp; +sh64_frob_label (symbolS *symp) { segT seg = S_GET_SEGMENT (symp); static const symbolS *null = NULL; @@ -3294,11 +3233,8 @@ sh64_frob_label (symp) symbol hook. */ int -sh64_consume_datalabel (name, exp, cp, operandf) - const char *name; - expressionS *exp; - char *cp; - segT (*operandf) PARAMS ((expressionS *)); +sh64_consume_datalabel (const char *name, expressionS *exp, char *cp, + segT (*operandf) (expressionS *)) { static int parsing_datalabel = 0; @@ -3397,8 +3333,7 @@ sh64_consume_datalabel (name, exp, cp, operandf) then we need not output the main symbol. */ int -sh64_exclude_symbol (symp) - symbolS *symp; +sh64_exclude_symbol (symbolS *symp) { symbolS *main_symbol = *symbol_get_tc (symp); @@ -3412,8 +3347,7 @@ sh64_exclude_symbol (symp) a new region if needed. */ static void -sh64_update_contents_mark (update_type) - bfd_boolean update_type; +sh64_update_contents_mark (bfd_boolean update_type) { segment_info_type *seginfo; seginfo = seg_info (now_seg); @@ -3466,7 +3400,7 @@ sh64_update_contents_mark (update_type) just switching segments. */ void -sh64_flush_pending_output () +sh64_flush_pending_output (void) { sh64_update_contents_mark (TRUE); sh_flush_pending_output (); @@ -3475,10 +3409,8 @@ sh64_flush_pending_output () /* Flush out the last crange descriptor after all insns have been emitted. */ static void -sh64_flush_last_crange (abfd, seg, countparg) - bfd *abfd ATTRIBUTE_UNUSED; - asection *seg; - PTR countparg ATTRIBUTE_UNUSED; +sh64_flush_last_crange (bfd *abfd ATTRIBUTE_UNUSED, asection *seg, + void *countparg ATTRIBUTE_UNUSED) { segment_info_type *seginfo; @@ -3517,7 +3449,7 @@ sh64_flush_last_crange (abfd, seg, countparg) descriptors. */ static void -sh64_flag_output () +sh64_flag_output (void) { if (sh64_isa_mode != sh64_isa_unspecified && !seen_insn @@ -3533,7 +3465,7 @@ sh64_flag_output () any we find. */ static char * -strip_datalabels () +strip_datalabels (void) { char *src, *dest, *start=input_line_pointer; @@ -3553,8 +3485,7 @@ strip_datalabels () } static void -sh64_vtable_entry (ignore) - int ignore ATTRIBUTE_UNUSED; +sh64_vtable_entry (int ignore ATTRIBUTE_UNUSED) { char *eol = strip_datalabels (); @@ -3563,11 +3494,11 @@ sh64_vtable_entry (ignore) } static void -sh64_vtable_inherit (ignore) - int ignore ATTRIBUTE_UNUSED; +sh64_vtable_inherit (int ignore ATTRIBUTE_UNUSED) { char *eol = strip_datalabels (); obj_elf_vtable_inherit (0); input_line_pointer = eol; } + -- cgit v1.1