X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gas%2Fconfig%2Ftc-tic54x.c;h=5dd772e015ad06be7b8d2b29f5565cdd6f2e46e1;hb=39d911fc3c6519799ca1af4365d4b56f9d71ca94;hp=b1c7c2167c6f5d3fc220acea8d7d52acdd660f52;hpb=5d6255fea654e42fc10353d52f60cf56970744d5;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c index b1c7c2167c..5dd772e015 100644 --- a/gas/config/tc-tic54x.c +++ b/gas/config/tc-tic54x.c @@ -1,12 +1,12 @@ /* tc-tic54x.c -- Assembly code for the Texas Instruments TMS320C54X - Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999-2016 Free Software Foundation, Inc. Contributed by Timothy Wall (twall@cygnus.com) 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 2, or (at your option) + 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, @@ -16,8 +16,8 @@ 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, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ /* Texas Instruments TMS320C54X machine specific gas. Written by Timothy Wall (twall@alum.mit.edu). @@ -44,10 +44,8 @@ COFF1 limits section names to 8 characters. Some of the default behavior changed from COFF1 to COFF2. */ -#include -#include -#include #include "as.h" +#include #include "safe-ctype.h" #include "sb.h" #include "macro.h" @@ -82,7 +80,7 @@ static struct stag typedef struct _tic54x_insn { - const template *tm; /* Opcode template. */ + const insn_template *tm; /* Opcode template. */ char mnemonic[MAX_LINE]; /* Opcode name/mnemonic. */ char parmnemonic[MAX_LINE]; /* 2nd mnemonic of parallel insn. */ @@ -153,9 +151,6 @@ struct option md_longopts[] = { "mfar-mode", no_argument, NULL, OPTION_ADDRESS_MODE }, { "mf", no_argument, NULL, OPTION_ADDRESS_MODE }, { "mcpu", required_argument, NULL, OPTION_CPU_VERSION }, -#if 0 - { "mcoff-version", required_argument, NULL, OPTION_COFF_VERSION }, -#endif { "merrors-to-file", required_argument, NULL, OPTION_STDERR_TO_FILE }, { "me", required_argument, NULL, OPTION_STDERR_TO_FILE }, { NULL, no_argument, NULL, 0}, @@ -226,132 +221,18 @@ static struct hash_control *misc_symbol_hash; } \ while (0) -static void tic54x_emit_char PARAMS ((char)); -static fragS * frag_prev PARAMS ((fragS *, segT)); -static fragS * bit_offset_frag PARAMS ((fragS *, segT)); -static int frag_bit_offset PARAMS ((fragS *, segT)); -static char * parse_expression PARAMS ((char *, expressionS *)); -static void tic54x_asg PARAMS ((int)); -static void tic54x_eval PARAMS ((int)); -static void tic54x_bss PARAMS ((int)); -static void stag_add_field_symbols PARAMS ((struct stag *, const char *, bfd_vma, symbolS *, const char *)); -static void stag_add_field PARAMS ((struct stag *, const char *, bfd_vma, struct stag *)); -static void tic54x_struct PARAMS ((int)); -static void tic54x_endstruct PARAMS ((int)); -static void tic54x_tag PARAMS ((int)); -static void tic54x_struct_field PARAMS ((int)); -static void tic54x_cons PARAMS ((int)); -static void tic54x_remove_local_label PARAMS ((const char *, PTR)); -static void tic54x_clear_local_labels PARAMS ((int)); -static void tic54x_sect PARAMS ((int)); -static void tic54x_space PARAMS ((int)); -static void tic54x_usect PARAMS ((int)); -static enum cpu_version lookup_version PARAMS ((const char *)); -static void set_cpu PARAMS ((enum cpu_version)); -static void tic54x_version PARAMS ((int)); -static void tic54x_float_cons PARAMS ((int)); -static void tic54x_stringer PARAMS ((int)); -static void tic54x_p2align PARAMS ((int)); -static void tic54x_align_words PARAMS ((int)); -static void tic54x_field PARAMS ((int)); -static int tic54x_initialized_section PARAMS ((segT)); -static void tic54x_clink PARAMS ((int)); -static void tic54x_set_default_include PARAMS ((int)); -static void tic54x_include PARAMS ((int)); -static void tic54x_message PARAMS ((int)); -static void tic54x_label PARAMS ((int)); -static void tic54x_mmregs PARAMS ((int)); -static void tic54x_loop PARAMS ((int)); -static void tic54x_endloop PARAMS ((int)); -static void tic54x_break PARAMS ((int)); -static void set_address_mode PARAMS ((int)); -static void tic54x_address_mode PARAMS ((int)); -static void tic54x_sblock PARAMS ((int)); -static void tic54x_set PARAMS ((int)); -static void tic54x_fclist PARAMS ((int)); -static void tic54x_sslist PARAMS ((int)); -static void tic54x_var PARAMS ((int)); -static void tic54x_mlib PARAMS ((int)); -static int subsym_symlen PARAMS ((char *, char *)); -static int subsym_symcmp PARAMS ((char *, char *)); -static int subsym_firstch PARAMS ((char *, char *)); -static int subsym_lastch PARAMS ((char *, char *)); -static int subsym_isdefed PARAMS ((char *, char *)); -static int subsym_ismember PARAMS ((char *, char *)); -static int subsym_iscons PARAMS ((char *, char *)); -static int subsym_isname PARAMS ((char *, char *)); -static int subsym_isreg PARAMS ((char *, char *)); -static int subsym_structsz PARAMS ((char *, char *)); -static int subsym_structacc PARAMS ((char *, char *)); -static float math_ceil PARAMS ((float, float)); -static float math_cvi PARAMS ((float, float)); -static float math_floor PARAMS ((float, float)); -static float math_fmod PARAMS ((float, float)); -static float math_int PARAMS ((float, float)); -static float math_round PARAMS ((float, float)); -static float math_sgn PARAMS ((float, float)); -static float math_trunc PARAMS ((float, float)); -static float math_acos PARAMS ((float, float)); -static float math_asin PARAMS ((float, float)); -static float math_atan PARAMS ((float, float)); -static float math_atan2 PARAMS ((float, float)); -static float math_cosh PARAMS ((float, float)); -static float math_cos PARAMS ((float, float)); -static float math_cvf PARAMS ((float, float)); -static float math_exp PARAMS ((float, float)); -static float math_fabs PARAMS ((float, float)); -static float math_ldexp PARAMS ((float, float)); -static float math_log10 PARAMS ((float, float)); -static float math_log PARAMS ((float, float)); -static float math_max PARAMS ((float, float)); -static float math_min PARAMS ((float, float)); -static float math_pow PARAMS ((float, float)); -static float math_sin PARAMS ((float, float)); -static float math_sinh PARAMS ((float, float)); -static float math_sqrt PARAMS ((float, float)); -static float math_tan PARAMS ((float, float)); -static float math_tanh PARAMS ((float, float)); -static int is_accumulator PARAMS ((struct opstruct *)); -static int get_operands PARAMS ((struct opstruct operands[], char *)); -static int is_immediate PARAMS ((struct opstruct *)); -static int is_absolute PARAMS ((struct opstruct *)); -static int is_indirect PARAMS ((struct opstruct *)); -static int is_dual PARAMS ((struct opstruct *)); -static int is_mmreg PARAMS ((struct opstruct *)); -static int is_type PARAMS ((struct opstruct *, enum optype)); -static int operands_match PARAMS ((tic54x_insn *, struct opstruct *, int, const enum optype *, int, int)); -static int encode_dmad PARAMS ((tic54x_insn *, struct opstruct *, int)); -static int encode_address PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_indirect PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_integer PARAMS ((tic54x_insn *, struct opstruct *, int, int, int, unsigned short)); -static int encode_condition PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_cc3 PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_arx PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_cc2 PARAMS ((tic54x_insn *, struct opstruct *)); -static int encode_operand PARAMS ((tic54x_insn *, enum optype, struct opstruct *)); -static void emit_insn PARAMS ((tic54x_insn *)); -static int build_insn PARAMS ((tic54x_insn *)); -static int optimize_insn PARAMS ((tic54x_insn *)); -static int tic54x_parse_insn PARAMS ((tic54x_insn *, char *)); -static int next_line_shows_parallel PARAMS ((char *)); -static int tic54x_parse_parallel_insn_firstline PARAMS ((tic54x_insn *, char *)); -static int tic54x_parse_parallel_insn_lastline PARAMS ((tic54x_insn *, char *)); -static char * subsym_get_arg PARAMS ((char *, char *, char **, int)); -static void subsym_create_or_replace PARAMS ((char *, char *)); -static char * subsym_lookup PARAMS ((char *, int)); -static char * subsym_substitute PARAMS ((char *, int)); + +static void subsym_create_or_replace (char *, char *); +static char *subsym_lookup (char *, int); +static char *subsym_substitute (char *, int); void -md_show_usage (stream) - FILE *stream; +md_show_usage (FILE *stream) { fprintf (stream, _("C54x-specific command line options:\n")); fprintf (stream, _("-mfar-mode | -mf Use extended addressing\n")); fprintf (stream, _("-mcpu= Specify the CPU version\n")); -#if 0 - fprintf (stream, _("-mcoff-version={0|1|2} Select COFF version\n")); -#endif fprintf (stream, _("-merrors-to-file \n")); fprintf (stream, _("-me Redirect errors to a file\n")); } @@ -359,22 +240,19 @@ md_show_usage (stream) /* Output a single character (upper octect is zero). */ static void -tic54x_emit_char (c) - char c; +tic54x_emit_char (char c) { - expressionS exp; + expressionS expn; - exp.X_op = O_constant; - exp.X_add_number = c; - emit_expr (&exp, 2); + expn.X_op = O_constant; + expn.X_add_number = c; + emit_expr (&expn, 2); } /* Walk backwards in the frag chain. */ static fragS * -frag_prev (frag, seg) - fragS *frag; - segT seg; +frag_prev (fragS *frag, segT seg) { segment_info_type *seginfo = seg_info (seg); fragS *fragp; @@ -387,9 +265,7 @@ frag_prev (frag, seg) } static fragS * -bit_offset_frag (frag, seg) - fragS *frag; - segT seg; +bit_offset_frag (fragS *frag, segT seg) { while (frag != NULL) { @@ -407,9 +283,7 @@ bit_offset_frag (frag, seg) none. .field/.space/.bes may leave words partially allocated. */ static int -frag_bit_offset (frag, seg) - fragS *frag; - segT seg; +frag_bit_offset (fragS *frag, segT seg) { frag = bit_offset_frag (frag, seg); @@ -423,16 +297,14 @@ frag_bit_offset (frag, seg) expression. */ static char * -parse_expression (str, exp) - char *str; - expressionS * exp; +parse_expression (char *str, expressionS *expn) { char *s; char *tmp; tmp = input_line_pointer; /* Save line pointer. */ input_line_pointer = str; - expression (exp); + expression (expn); s = input_line_pointer; input_line_pointer = tmp; /* Restore line pointer. */ return s; /* Return pointer to where parsing stopped. */ @@ -445,13 +317,11 @@ parse_expression (str, exp) unsupported. */ static void -tic54x_asg (x) - int x ATTRIBUTE_UNUSED; +tic54x_asg (int x ATTRIBUTE_UNUSED) { int c; char *name; char *str; - char *tmp; int quoted = *input_line_pointer == '"'; ILLEGAL_WITHIN_STRUCT (); @@ -480,23 +350,19 @@ tic54x_asg (x) return; } - name = ++input_line_pointer; - c = get_symbol_end (); /* Get terminator. */ + ++input_line_pointer; + c = get_symbol_name (&name); /* Get terminator. */ if (!ISALPHA (*name)) { - as_bad ("symbols assigned with .asg must begin with a letter"); + as_bad (_("symbols assigned with .asg must begin with a letter")); ignore_rest_of_line (); return; } - tmp = xmalloc (strlen (str) + 1); - strcpy (tmp, str); - str = tmp; - tmp = xmalloc (strlen (name) + 1); - strcpy (tmp, name); - name = tmp; + str = xstrdup (str); + name = xstrdup (name); subsym_create_or_replace (name, str); - *input_line_pointer = c; + (void) restore_line_pointer (c); demand_empty_rest_of_line (); } @@ -507,8 +373,7 @@ tic54x_asg (x) table, since that's what works best. */ static void -tic54x_eval (x) - int x ATTRIBUTE_UNUSED; +tic54x_eval (int x ATTRIBUTE_UNUSED) { char c; int value; @@ -541,11 +406,9 @@ tic54x_eval (x) ignore_rest_of_line (); return; } - name = input_line_pointer; - c = get_symbol_end (); /* Get terminator. */ - tmp = xmalloc (strlen (name) + 1); - name = strcpy (tmp, name); - *input_line_pointer = c; + c = get_symbol_name (&name); /* Get terminator. */ + name = xstrdup (name); + (void) restore_line_pointer (c); if (!ISALPHA (*name)) { @@ -562,8 +425,7 @@ tic54x_eval (x) But since there's not written rule as to when, don't even bother trying to match their behavior. */ sprintf (valuestr, "%d", value); - tmp = xmalloc (strlen (valuestr) + 1); - strcpy (tmp, valuestr); + tmp = xstrdup (valuestr); subsym_create_or_replace (name, tmp); demand_empty_rest_of_line (); @@ -584,8 +446,7 @@ tic54x_eval (x) (not yet implemented). */ static void -tic54x_bss (x) - int x ATTRIBUTE_UNUSED; +tic54x_bss (int x ATTRIBUTE_UNUSED) { char c; char *name; @@ -602,11 +463,12 @@ tic54x_bss (x) current_seg = now_seg; /* Save current seg. */ current_subseg = now_subseg; /* Save current subseg. */ - name = input_line_pointer; - c = get_symbol_end (); /* Get terminator. */ + c = get_symbol_name (&name); /* Get terminator. */ + if (c == '"') + c = * ++ input_line_pointer; if (c != ',') { - as_bad (".bss size argument missing\n"); + as_bad (_(".bss size argument missing\n")); ignore_rest_of_line (); return; } @@ -615,7 +477,7 @@ tic54x_bss (x) words = get_absolute_expression (); if (words < 0) { - as_bad (".bss size %d < 0!", words); + as_bad (_(".bss size %d < 0!"), words); ignore_rest_of_line (); return; } @@ -667,35 +529,29 @@ tic54x_bss (x) } if (block) - bss_section->flags |= SEC_BLOCK; + bss_section->flags |= SEC_TIC54X_BLOCK; subseg_set (current_seg, current_subseg); /* Restore current seg. */ demand_empty_rest_of_line (); } static void -stag_add_field_symbols (stag, path, base_offset, rootsym, root_stag_name) - struct stag *stag; - const char *path; - bfd_vma base_offset; - symbolS *rootsym; - const char *root_stag_name; -{ - char prefix[strlen (path) + 2]; +stag_add_field_symbols (struct stag *stag, + const char *path, + bfd_vma base_offset, + symbolS *rootsym, + const char *root_stag_name) +{ + char * prefix; struct stag_field *field = stag->field; /* Construct a symbol for every field contained within this structure including fields within structure fields. */ - strcpy (prefix, path); - if (*path) - strcat (prefix, "."); + prefix = concat (path, *path ? "." : "", NULL); while (field != NULL) { - int len = strlen (prefix) + strlen (field->name) + 2; - char *name = xmalloc (len); - strcpy (name, prefix); - strcat (name, field->name); + char *name = concat (prefix, field->name, NULL); if (rootsym == NULL) { @@ -709,12 +565,10 @@ stag_add_field_symbols (stag, path, base_offset, rootsym, root_stag_name) } else { - char *replacement = xmalloc (strlen (name) - + strlen (stag->name) + 2); - strcpy (replacement, S_GET_NAME (rootsym)); - strcat (replacement, "+"); - strcat (replacement, root_stag_name); - strcat (replacement, name + strlen (S_GET_NAME (rootsym))); + char *replacement; + + replacement = concat (S_GET_NAME (rootsym), "+", root_stag_name, + name + strlen (S_GET_NAME (rootsym)), NULL); hash_insert (subsym_hash[0], name, replacement); } @@ -725,23 +579,23 @@ stag_add_field_symbols (stag, path, base_offset, rootsym, root_stag_name) field->offset, rootsym, root_stag_name); field = field->next; + free (name); } + free (prefix); } /* Keep track of stag fields so that when structures are nested we can add the complete dereferencing symbols to the symbol table. */ static void -stag_add_field (parent, name, offset, stag) - struct stag *parent; - const char *name; - bfd_vma offset; - struct stag *stag; +stag_add_field (struct stag *parent, + const char *name, + bfd_vma offset, + struct stag *stag) { - struct stag_field *sfield = xmalloc (sizeof (struct stag_field)); + struct stag_field *sfield = XCNEW (struct stag_field); - memset (sfield, 0, sizeof (*sfield)); - sfield->name = strcpy (xmalloc (strlen (name) + 1), name); + sfield->name = xstrdup (name); sfield->offset = offset; sfield->bitfield_offset = parent->current_bitfield_offset; sfield->stag = stag; @@ -768,8 +622,7 @@ stag_add_field (parent, name, offset, stag) Start defining structure offsets (symbols in absolute section). */ static void -tic54x_struct (arg) - int arg; +tic54x_struct (int arg) { int start_offset = 0; int is_union = arg; @@ -802,8 +655,7 @@ tic54x_struct (arg) if (current_stag) { /* Nesting, link to outer one. */ - current_stag->inner = (struct stag *) xmalloc (sizeof (struct stag)); - memset (current_stag->inner, 0, sizeof (struct stag)); + current_stag->inner = XCNEW (struct stag); current_stag->inner->outer = current_stag; current_stag = current_stag->inner; if (start_offset) @@ -812,8 +664,7 @@ tic54x_struct (arg) } else { - current_stag = (struct stag *) xmalloc (sizeof (struct stag)); - memset (current_stag, 0, sizeof (struct stag)); + current_stag = XCNEW (struct stag); abs_section_offset = start_offset; } current_stag->is_union = is_union; @@ -829,11 +680,12 @@ tic54x_struct (arg) } else { - char label[strlen (S_GET_NAME (line_label)) + 1]; - strcpy (label, S_GET_NAME (line_label)); - current_stag->sym = symbol_new (label, absolute_section, + char * label = xstrdup (S_GET_NAME (line_label)); + current_stag->sym = symbol_new (label, + absolute_section, (valueT) abs_section_offset, &zero_address_frag); + free (label); } current_stag->name = S_GET_NAME (current_stag->sym); SF_SET_LOCAL (current_stag->sym); @@ -849,8 +701,7 @@ tic54x_struct (arg) of the structure. */ static void -tic54x_endstruct (is_union) - int is_union; +tic54x_endstruct (int is_union) { int size; const char *path = @@ -915,11 +766,10 @@ tic54x_endstruct (is_union) format on the existing allocated space. */ static void -tic54x_tag (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_tag (int ignore ATTRIBUTE_UNUSED) { - char *name = input_line_pointer; - int c = get_symbol_end (); + char *name; + int c = get_symbol_name (&name); struct stag *stag = (struct stag *) hash_find (stag_hash, name); if (!stag) @@ -939,9 +789,9 @@ tic54x_tag (ignore) } else { - char label[strlen (S_GET_NAME (line_label)) + 1]; + char * label; - strcpy (label, S_GET_NAME (line_label)); + label = xstrdup (S_GET_NAME (line_label)); if (current_stag != NULL) stag_add_field (current_stag, label, abs_section_offset - S_GET_VALUE (current_stag->sym), @@ -954,18 +804,20 @@ tic54x_tag (ignore) { as_bad (_(".tag target '%s' undefined"), label); ignore_rest_of_line (); + free (label); return; } stag_add_field_symbols (stag, S_GET_NAME (sym), S_GET_VALUE (stag->sym), sym, stag->name); } + free (label); } /* Bump by the struct size, but only if we're within a .struct section. */ if (current_stag != NULL && !current_stag->is_union) abs_section_offset += stag->size; - *input_line_pointer = c; + (void) restore_line_pointer (c); demand_empty_rest_of_line (); line_label = NULL; } @@ -975,8 +827,7 @@ tic54x_tag (ignore) and .word. */ static void -tic54x_struct_field (type) - int type; +tic54x_struct_field (int type) { int size; int count = 1; @@ -1070,12 +921,13 @@ tic54x_struct_field (type) } else { - char label[strlen (S_GET_NAME (line_label) + 1)]; + char * label; - strcpy (label, S_GET_NAME (line_label)); + label = xstrdup (S_GET_NAME (line_label)); stag_add_field (current_stag, label, abs_section_offset - S_GET_VALUE (current_stag->sym), NULL); + free (label); } if (current_stag->is_union) @@ -1095,8 +947,7 @@ tic54x_struct_field (type) /* Handle .byte, .word. .int, .long and all variants. */ static void -tic54x_cons (type) - int type; +tic54x_cons (int type) { unsigned int c; int octets; @@ -1155,28 +1006,28 @@ tic54x_cons (type) } else { - expressionS exp; + expressionS expn; - input_line_pointer = parse_expression (input_line_pointer, &exp); - if (exp.X_op == O_constant) + input_line_pointer = parse_expression (input_line_pointer, &expn); + if (expn.X_op == O_constant) { - offsetT value = exp.X_add_number; + offsetT value = expn.X_add_number; /* Truncate overflows. */ switch (octets) { case 1: if ((value > 0 && value > 0xFF) || (value < 0 && value < - 0x100)) - as_warn ("Overflow in expression, truncated to 8 bits"); + as_warn (_("Overflow in expression, truncated to 8 bits")); break; case 2: if ((value > 0 && value > 0xFFFF) || (value < 0 && value < - 0x10000)) - as_warn ("Overflow in expression, truncated to 16 bits"); + as_warn (_("Overflow in expression, truncated to 16 bits")); break; } } - if (exp.X_op != O_constant && octets < 2) + if (expn.X_op != O_constant && octets < 2) { /* Disallow .byte with a non constant expression that will require relocation. */ @@ -1185,25 +1036,25 @@ tic54x_cons (type) return; } - if (exp.X_op != O_constant + if (expn.X_op != O_constant && amode == c_mode && octets == 4) { /* FIXME -- at one point TI tools used to output REL16 relocations, but I don't think the latest tools do at all The current tools output extended relocations regardless of - the addresing mode (I actually think that ".c_mode" is + the addressing mode (I actually think that ".c_mode" is totally ignored in the latest tools). */ amode = far_mode; emitting_long = 1; - emit_expr (&exp, 4); + emit_expr (&expn, 4); emitting_long = 0; amode = c_mode; } else { emitting_long = octets == 4; - emit_expr (&exp, (octets == 1) ? 2 : octets); + emit_expr (&expn, (octets == 1) ? 2 : octets); emitting_long = 0; } } @@ -1234,8 +1085,7 @@ tic54x_cons (type) these, so we ignore the type here. */ void -tic54x_global (type) - int type; +tic54x_global (int type) { char *name; int c; @@ -1248,11 +1098,10 @@ tic54x_global (type) do { - name = input_line_pointer; - c = get_symbol_end (); + c = get_symbol_name (&name); symbolP = symbol_find_or_make (name); + c = restore_line_pointer (c); - *input_line_pointer = c; S_SET_STORAGE_CLASS (symbolP, C_EXT); if (c == ',') { @@ -1269,19 +1118,16 @@ tic54x_global (type) /* Remove the symbol from the local label hash lookup. */ static void -tic54x_remove_local_label (key, value) - const char *key; - PTR value ATTRIBUTE_UNUSED; +tic54x_remove_local_label (const char *key, void *value ATTRIBUTE_UNUSED) { - PTR *elem = hash_delete (local_label_hash[macro_level], key); + void *elem = hash_delete (local_label_hash[macro_level], key, FALSE); free (elem); } /* Reset all local labels. */ static void -tic54x_clear_local_labels (ignored) - int ignored ATTRIBUTE_UNUSED; +tic54x_clear_local_labels (int ignored ATTRIBUTE_UNUSED) { hash_traverse (local_label_hash[macro_level], tic54x_remove_local_label); } @@ -1300,8 +1146,7 @@ tic54x_clear_local_labels (ignored) */ static void -tic54x_sect (arg) - int arg; +tic54x_sect (int arg) { ILLEGAL_WITHIN_STRUCT (); @@ -1327,13 +1172,14 @@ tic54x_sect (arg) else { int c; - name = input_line_pointer; - c = get_symbol_end (); + + c = get_symbol_name (&name); len = strlen(name); name = strcpy (xmalloc (len + 10), name); - *input_line_pointer = c; + (void) restore_line_pointer (c); demand_empty_rest_of_line (); } + /* Make sure all named initialized sections flagged properly. If we encounter instructions, we'll flag it with SEC_CODE as well. */ strcat (name, ",\"w\"\n"); @@ -1362,10 +1208,9 @@ tic54x_sect (arg) cribbed from s_space. */ static void -tic54x_space (arg) - int arg; +tic54x_space (int arg) { - expressionS exp; + expressionS expn; char *p = 0; int octets = 0; long words; @@ -1381,22 +1226,21 @@ tic54x_space (arg) #endif /* Read the bit count. */ - expression (&exp); + expression (&expn); /* Some expressions are unresolvable until later in the assembly pass; postpone until relaxation/fixup. we also have to postpone if a previous partial allocation has not been completed yet. */ - if (exp.X_op != O_constant || frag_bit_offset (frag_now, now_seg) == -1) + if (expn.X_op != O_constant || frag_bit_offset (frag_now, now_seg) == -1) { - struct bit_info *bi = xmalloc (sizeof (struct bit_info)); - char *p; + struct bit_info *bi = XNEW (struct bit_info); bi->seg = now_seg; bi->type = bes; bi->sym = label; p = frag_var (rs_machine_dependent, 65536 * 2, 1, (relax_substateT) 0, - make_expr_symbol (&exp), (offsetT) 0, + make_expr_symbol (&expn), (offsetT) 0, (char *) bi); if (p) *p = 0; @@ -1411,7 +1255,7 @@ tic54x_space (arg) { int spare_bits = bits_per_byte - bit_offset; - if (spare_bits >= exp.X_add_number) + if (spare_bits >= expn.X_add_number) { /* Don't have to do anything; sufficient bits have already been allocated; just point the label to the right place. */ @@ -1421,10 +1265,10 @@ tic54x_space (arg) S_SET_VALUE (label, frag_now_fix () - 1); label = NULL; } - frag_now->tc_frag_data += exp.X_add_number; + frag_now->tc_frag_data += expn.X_add_number; goto getout; } - exp.X_add_number -= spare_bits; + expn.X_add_number -= spare_bits; /* Set the label to point to the first word allocated, which in this case is the previous word, which was only partially filled. */ if (!bes && label != NULL) @@ -1435,9 +1279,9 @@ tic54x_space (arg) } } /* Convert bits to bytes/words and octets, rounding up. */ - words = ((exp.X_add_number + bits_per_byte - 1) / bits_per_byte); + words = ((expn.X_add_number + bits_per_byte - 1) / bits_per_byte); /* How many do we have left over? */ - bit_offset = exp.X_add_number % bits_per_byte; + bit_offset = expn.X_add_number % bits_per_byte; octets = words * OCTETS_PER_BYTE; if (octets < 0) { @@ -1486,7 +1330,7 @@ tic54x_space (arg) /* [symbol] .usect "section-name", size-in-words [, [blocking-flag] [, alignment-flag]] - Unitialized section. + Uninitialized section. Non-zero blocking means that if the section would cross a page (128-word) boundary, it will be page-aligned. Non-zero alignment aligns on a longword boundary. @@ -1494,8 +1338,7 @@ tic54x_space (arg) Has no effect on the current section. */ static void -tic54x_usect (x) - int x ATTRIBUTE_UNUSED; +tic54x_usect (int x ATTRIBUTE_UNUSED) { char c; char *name; @@ -1512,17 +1355,13 @@ tic54x_usect (x) current_seg = now_seg; /* Save current seg. */ current_subseg = now_subseg; /* Save current subseg. */ - if (*input_line_pointer == '"') - input_line_pointer++; - section_name = input_line_pointer; - c = get_symbol_end (); /* Get terminator. */ - input_line_pointer++; /* Skip null symbol terminator. */ - name = xmalloc (input_line_pointer - section_name + 1); - strcpy (name, section_name); - - if (*input_line_pointer == ',') + c = get_symbol_name (§ion_name); /* Get terminator. */ + name = xstrdup (section_name); + c = restore_line_pointer (c); + + if (c == ',') ++input_line_pointer; - else if (c != ',') + else { as_bad (_("Missing size argument")); ignore_rest_of_line (); @@ -1580,10 +1419,10 @@ tic54x_usect (x) *p = 0; if (blocking_flag) - flags |= SEC_BLOCK; + flags |= SEC_TIC54X_BLOCK; if (!bfd_set_section_flags (stdoutput, seg, flags)) - as_warn ("Error setting flags for \"%s\": %s", name, + as_warn (_("Error setting flags for \"%s\": %s"), name, bfd_errmsg (bfd_get_error ())); subseg_set (current_seg, current_subseg); /* Restore current seg. */ @@ -1591,8 +1430,7 @@ tic54x_usect (x) } static enum cpu_version -lookup_version (ver) - const char *ver; +lookup_version (const char *ver) { enum cpu_version version = VNONE; @@ -1613,8 +1451,7 @@ lookup_version (ver) } static void -set_cpu (version) - enum cpu_version version; +set_cpu (enum cpu_version version) { cpu = version; if (version == V545LP || version == V546LP) @@ -1641,8 +1478,7 @@ set_cpu (version) static int cpu_needs_set = 1; static void -tic54x_version (x) - int x ATTRIBUTE_UNUSED; +tic54x_version (int x ATTRIBUTE_UNUSED) { enum cpu_version version = VNONE; enum cpu_version old_version = cpu; @@ -1685,8 +1521,7 @@ tic54x_version (x) /* 'f' = float, 'x' = xfloat, 'd' = double, 'l' = ldouble. */ static void -tic54x_float_cons (type) - int type; +tic54x_float_cons (int type) { if (current_stag != 0) tic54x_struct_field ('f'); @@ -1716,11 +1551,9 @@ tic54x_float_cons (type) and encoded into the correct octets. */ static void -tic54x_stringer (type) - int type; +tic54x_stringer (int type) { unsigned int c; - char *start; int append_zero = type == 'S' || type == 'P'; int packed = type == 'p' || type == 'P'; int last_char = -1; /* Packed strings need two bytes at a time to encode. */ @@ -1750,7 +1583,6 @@ tic54x_stringer (type) } case '\"': ++input_line_pointer; /* -> 1st char of string. */ - start = input_line_pointer; while (is_a_char (c = next_char_of_string ())) { if (!packed) @@ -1804,15 +1636,13 @@ tic54x_stringer (type) } static void -tic54x_p2align (arg) - int arg ATTRIBUTE_UNUSED; +tic54x_p2align (int arg ATTRIBUTE_UNUSED) { as_bad (_("p2align not supported on this target")); } static void -tic54x_align_words (arg) - int arg; +tic54x_align_words (int arg) { /* Only ".align" with no argument is allowed within .struct/.union. */ int count = arg; @@ -1844,10 +1674,9 @@ tic54x_align_words (arg) /* Initialize multiple-bit fields withing a single word of memory. */ static void -tic54x_field (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_field (int ignore ATTRIBUTE_UNUSED) { - expressionS exp; + expressionS expn; int size = 16; char *p; valueT value; @@ -1859,7 +1688,7 @@ tic54x_field (ignore) return; } - input_line_pointer = parse_expression (input_line_pointer, &exp); + input_line_pointer = parse_expression (input_line_pointer, &expn); if (*input_line_pointer == ',') { @@ -1874,7 +1703,7 @@ tic54x_field (ignore) } /* Truncate values to the field width. */ - if (exp.X_op != O_constant) + if (expn.X_op != O_constant) { /* If the expression value is relocatable, the field size *must* be 16. */ @@ -1886,17 +1715,17 @@ tic54x_field (ignore) } frag_now->tc_frag_data = 0; - emit_expr (&exp, 2); + emit_expr (&expn, 2); } else { unsigned long fmask = (size == 32) ? 0xFFFFFFFF : (1ul << size) - 1; - value = exp.X_add_number; - exp.X_add_number &= fmask; - if (value != (valueT) exp.X_add_number) + value = expn.X_add_number; + expn.X_add_number &= fmask; + if (value != (valueT) expn.X_add_number) as_warn (_("field value truncated")); - value = exp.X_add_number; + value = expn.X_add_number; /* Bits are stored MS first. */ while (size >= 16) { @@ -1912,7 +1741,7 @@ tic54x_field (ignore) fragS *alloc_frag = bit_offset_frag (frag_now, now_seg); if (bit_offset == -1) { - struct bit_info *bi = xmalloc (sizeof (struct bit_info)); + struct bit_info *bi = XNEW (struct bit_info); /* We don't know the previous offset at this time, so store the info we need and figure it out later. */ expressionS size_exp; @@ -1968,8 +1797,7 @@ tic54x_field (ignore) available yet. seg_info ()->bss is the next best thing. */ static int -tic54x_initialized_section (seg) - segT seg; +tic54x_initialized_section (segT seg) { return !seg_info (seg)->bss; } @@ -1982,8 +1810,7 @@ tic54x_initialized_section (seg) Name is required for uninitialized sections. */ static void -tic54x_clink (ignored) - int ignored ATTRIBUTE_UNUSED; +tic54x_clink (int ignored ATTRIBUTE_UNUSED) { segT seg = now_seg; @@ -1998,8 +1825,7 @@ tic54x_clink (ignored) ; know (input_line_pointer[-1] == '\"'); input_line_pointer[-1] = 0; - name = xmalloc (input_line_pointer - section_name + 1); - strcpy (name, section_name); + name = xstrdup (section_name); seg = bfd_get_section_by_name (stdoutput, name); if (seg == NULL) @@ -2020,7 +1846,7 @@ tic54x_clink (ignored) } } - seg->flags |= SEC_CLINK; + seg->flags |= SEC_TIC54X_CLINK; demand_empty_rest_of_line (); } @@ -2030,19 +1856,18 @@ tic54x_clink (ignored) set to "." instead. */ static void -tic54x_set_default_include (dot) - int dot; +tic54x_set_default_include (int dot) { - char *dir = "."; + const char *dir = "."; char *tmp = NULL; if (!dot) { - char *curfile; + const char *curfile; unsigned lineno; - as_where (&curfile, &lineno); - dir = strcpy (xmalloc (strlen (curfile) + 1), curfile); + curfile = as_where (&lineno); + dir = xstrdup (curfile); tmp = strrchr (dir, '/'); } if (tmp != NULL) @@ -2053,7 +1878,7 @@ tic54x_set_default_include (dot) len = strlen (dir); if (include_dir_count == 0) { - include_dirs = (char **) xmalloc (sizeof (*include_dirs)); + include_dirs = XNEWVEC (const char *, 1); include_dir_count = 1; } include_dirs[0] = dir; @@ -2076,8 +1901,7 @@ tic54x_set_default_include (dot) Entering/exiting included/copied file clears all local labels. */ static void -tic54x_include (ignored) - int ignored ATTRIBUTE_UNUSED; +tic54x_include (int ignored ATTRIBUTE_UNUSED) { char newblock[] = " .newblock\n"; char *filename; @@ -2100,7 +1924,7 @@ tic54x_include (ignored) ++input_line_pointer; c = *input_line_pointer; *input_line_pointer = '\0'; - filename = strcpy (xmalloc (strlen (filename) + 1), filename); + filename = xstrdup (filename); *input_line_pointer = c; demand_empty_rest_of_line (); } @@ -2120,8 +1944,7 @@ tic54x_include (ignored) } static void -tic54x_message (type) - int type; +tic54x_message (int type) { char *msg; char c; @@ -2138,7 +1961,7 @@ tic54x_message (type) ++input_line_pointer; c = *input_line_pointer; *input_line_pointer = 0; - msg = strcpy (xmalloc (strlen (msg) + 1), msg); + msg = xstrdup (msg); *input_line_pointer = c; } @@ -2167,20 +1990,19 @@ tic54x_message (type) run address (vma). */ static void -tic54x_label (ignored) - int ignored ATTRIBUTE_UNUSED; +tic54x_label (int ignored ATTRIBUTE_UNUSED) { - char *name = input_line_pointer; + char *name; symbolS *symbolP; int c; ILLEGAL_WITHIN_STRUCT (); - c = get_symbol_end (); + c = get_symbol_name (&name); symbolP = colon (name); S_SET_STORAGE_CLASS (symbolP, C_STATLAB); - *input_line_pointer = c; + (void) restore_line_pointer (c); demand_empty_rest_of_line (); } @@ -2189,8 +2011,7 @@ tic54x_label (ignored) absolute local symbols. */ static void -tic54x_mmregs (ignored) - int ignored ATTRIBUTE_UNUSED; +tic54x_mmregs (int ignored ATTRIBUTE_UNUSED) { symbol *sym; @@ -2209,8 +2030,7 @@ tic54x_mmregs (ignored) Count defaults to 1024. */ static void -tic54x_loop (count) - int count; +tic54x_loop (int count) { ILLEGAL_WITHIN_STRUCT (); @@ -2224,8 +2044,7 @@ tic54x_loop (count) /* Normally, endloop gets eaten by the preceding loop. */ static void -tic54x_endloop (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_endloop (int ignore ATTRIBUTE_UNUSED) { as_bad (_("ENDLOOP without corresponding LOOP")); ignore_rest_of_line (); @@ -2234,8 +2053,7 @@ tic54x_endloop (ignore) /* .break [condition]. */ static void -tic54x_break (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_break (int ignore ATTRIBUTE_UNUSED) { int cond = 1; @@ -2250,8 +2068,7 @@ tic54x_break (ignore) } static void -set_address_mode (mode) - int mode; +set_address_mode (int mode) { amode = mode; if (mode == far_mode) @@ -2266,8 +2083,7 @@ set_address_mode (mode) static int address_mode_needs_set = 1; static void -tic54x_address_mode (mode) - int mode; +tic54x_address_mode (int mode) { if (assembly_begun && amode != (unsigned) mode) { @@ -2290,8 +2106,7 @@ tic54x_address_mode (mode) Designate initialized sections for blocking. */ static void -tic54x_sblock (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_sblock (int ignore ATTRIBUTE_UNUSED) { int c = ','; @@ -2310,12 +2125,11 @@ tic54x_sblock (ignore) } else { - char *section_name = input_line_pointer; + char *section_name; - c = get_symbol_end (); - name = xmalloc (strlen (section_name) + 1); - strcpy (name, section_name); - *input_line_pointer = c; + c = get_symbol_name (§ion_name); + name = xstrdup (section_name); + (void) restore_line_pointer (c); } seg = bfd_get_section_by_name (stdoutput, name); @@ -2331,7 +2145,7 @@ tic54x_sblock (ignore) ignore_rest_of_line (); return; } - seg->flags |= SEC_BLOCK; + seg->flags |= SEC_TIC54X_BLOCK; c = *input_line_pointer; if (!is_end_of_line[(int) c]) @@ -2348,8 +2162,7 @@ tic54x_sblock (ignore) symbols assigned with .set/.equ may not be redefined. */ static void -tic54x_set (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_set (int ignore ATTRIBUTE_UNUSED) { symbolS *symbolP; char *name; @@ -2383,8 +2196,7 @@ tic54x_set (ignore) List false conditional blocks. */ static void -tic54x_fclist (show) - int show; +tic54x_fclist (int show) { if (show) listing &= ~LISTING_NOCOND; @@ -2394,8 +2206,7 @@ tic54x_fclist (show) } static void -tic54x_sslist (show) - int show; +tic54x_sslist (int show) { ILLEGAL_WITHIN_STRUCT (); @@ -2406,8 +2217,7 @@ tic54x_sslist (show) Define a substitution string to be local to a macro. */ static void -tic54x_var (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_var (int ignore ATTRIBUTE_UNUSED) { static char empty[] = ""; char *name; @@ -2429,12 +2239,11 @@ tic54x_var (ignore) ignore_rest_of_line (); return; } - name = input_line_pointer; - c = get_symbol_end (); + c = get_symbol_name (&name); /* .var symbols start out with a null string. */ - name = strcpy (xmalloc (strlen (name) + 1), name); + name = xstrdup (name); hash_insert (subsym_hash[macro_level], name, empty); - *input_line_pointer = c; + c = restore_line_pointer (c); if (c == ',') { ++input_line_pointer; @@ -2455,8 +2264,7 @@ tic54x_var (ignore) FIXME need to try the source file directory as well. */ static void -tic54x_mlib (ignore) - int ignore ATTRIBUTE_UNUSED; +tic54x_mlib (int ignore ATTRIBUTE_UNUSED) { char *filename; char *path; @@ -2488,7 +2296,7 @@ tic54x_mlib (ignore) demand_empty_rest_of_line (); tic54x_set_default_include (0); - path = xmalloc ((unsigned long) len + include_dir_maxlen + 5); + path = XNEWVEC (char, (unsigned long) len + include_dir_maxlen + 5); for (i = 0; i < include_dir_count; i++) { @@ -2519,8 +2327,8 @@ tic54x_mlib (ignore) abfd = bfd_openr (path, NULL); if (!abfd) { - as_bad (_("Can't open macro library file '%s' for reading."), path); - as_perror ("%s", path); + as_bad (_("can't open macro library file '%s' for reading: %s"), + path, bfd_errmsg (bfd_get_error ())); ignore_rest_of_line (); return; } @@ -2537,18 +2345,18 @@ tic54x_mlib (ignore) { /* Get a size at least as big as the archive member. */ bfd_size_type size = bfd_get_size (mbfd); - char *buf = xmalloc (size); + char *buf = XNEWVEC (char, size); char *fname = tmpnam (NULL); FILE *ftmp; /* We're not sure how big it is, but it will be smaller than "size". */ - bfd_bread (buf, size, mbfd); + size = bfd_bread (buf, size, mbfd); /* Write to a temporary file, then use s_include to include it a bit of a hack. */ ftmp = fopen (fname, "w+b"); fwrite ((void *) buf, size, 1, ftmp); - if (buf[size - 1] != '\n') + if (size == 0 || buf[size - 1] != '\n') fwrite ("\n", 1, 1, ftmp); fclose (ftmp); free (buf); @@ -2583,9 +2391,6 @@ const pseudo_typeS md_pseudo_table[] = { "emsg" , tic54x_message , 'e' }, { "mmsg" , tic54x_message , 'm' }, { "wmsg" , tic54x_message , 'w' }, -#if 0 - { "end" , s_end , 0 }, -#endif { "far_mode" , tic54x_address_mode , far_mode }, { "fclist" , tic54x_fclist , 1 }, { "fcnolist" , tic54x_fclist , 0 }, @@ -2611,10 +2416,6 @@ const pseudo_typeS md_pseudo_table[] = address. */ { "length" , s_ignore , 0 }, { "width" , s_ignore , 0 }, -#if 0 - { "list" , listing_list , 1 }, - { "nolist" , listing_list , 0 }, -#endif { "long" , tic54x_cons , 'l' }, { "ulong" , tic54x_cons , 'L' }, { "xlong" , tic54x_cons , 'x' }, @@ -2628,9 +2429,6 @@ const pseudo_typeS md_pseudo_table[] = { "newblock" , tic54x_clear_local_labels, 0 }, { "option" , s_ignore , 0 }, { "p2align" , tic54x_p2align , 0 }, -#if 0 - { "page" , listing_eject , 0 }, -#endif { "sblock" , tic54x_sblock , 0 }, { "sect" , tic54x_sect , '*' }, { "set" , tic54x_set , 0 }, @@ -2646,9 +2444,6 @@ const pseudo_typeS md_pseudo_table[] = { "endstruct", tic54x_endstruct , 0 }, { "tab" , s_ignore , 0 }, { "text" , tic54x_sect , 't' }, -#if 0 - { "title" , listing_title , 0 }, -#endif { "union" , tic54x_struct , 1 }, { "endunion" , tic54x_endstruct , 1 }, { "usect" , tic54x_usect , 0 }, @@ -2657,25 +2452,8 @@ const pseudo_typeS md_pseudo_table[] = {0 , 0 , 0 } }; -#if 0 -/* For debugging, strings for each operand type. */ -static const char *optypes[] = -{ - "none", "Xmem", "Ymem", "pmad", "dmad", "Smem", "Lmem", "MMR", "PA", - "Sind", "xpmad", "xpmad+", "MMRX", "MMRY", - "SRC1", "SRC", "RND", "DST", - "ARX", - "SHIFT", "SHFT", - "B", "A", "lk", "TS", "k8", "16", "BITC", "CC", "CC2", "CC3", "123", "031", - "k5", "k8u", "ASM", "T", "DP", "ARP", "k3", "lku", "N", "SBIT", "12", - "k9", "TRN", -}; -#endif - int -md_parse_option (c, arg) - int c; - char *arg; +md_parse_option (int c, const char *arg) { switch (c) { @@ -2704,7 +2482,7 @@ md_parse_option (c, arg) break; case OPTION_STDERR_TO_FILE: { - char *filename = arg; + const char *filename = arg; FILE *fp = fopen (filename, "w+"); if (fp == NULL) @@ -2725,7 +2503,7 @@ md_parse_option (c, arg) deleting the local label hash between macro invocations. */ void -tic54x_macro_start () +tic54x_macro_start (void) { ++macro_level; subsym_hash[macro_level] = hash_new (); @@ -2733,29 +2511,9 @@ tic54x_macro_start () } void -tic54x_macro_info (info) - void *info; +tic54x_macro_info (const macro_entry *macro) { - struct formal_struct - { - struct formal_struct *next; /* Next formal in list */ - sb name; /* Name of the formal */ - sb def; /* The default value */ - sb actual; /* The actual argument (changed on - each expansion) */ - int index; /* The index of the formal - 0 .. formal_count - 1 */ - } *entry; - struct macro_struct - { - sb sub; /* Substitution text. */ - int formal_count; /* Number of formal args. */ - struct formal_struct *formals; /* Pointer to list of - formal_structs. */ - struct hash_control *formal_hash; /* Hash table of formals. */ - } *macro; - - macro = (struct macro_struct *) info; + const formal_entry *entry; /* Put the formal args into the substitution symbol table. */ for (entry = macro->formals; entry; entry = entry->next) @@ -2774,7 +2532,7 @@ tic54x_macro_info (info) /* Get rid of this macro's .var's, arguments, and local labels. */ void -tic54x_macro_end () +tic54x_macro_end (void) { hash_die (subsym_hash[macro_level]); subsym_hash[macro_level] = NULL; @@ -2784,9 +2542,7 @@ tic54x_macro_end () } static int -subsym_symlen (a, ignore) - char *a; - char *ignore ATTRIBUTE_UNUSED; +subsym_symlen (char *a, char *ignore ATTRIBUTE_UNUSED) { return strlen (a); } @@ -2794,20 +2550,16 @@ subsym_symlen (a, ignore) /* Compare symbol A to string B. */ static int -subsym_symcmp (a, b) - char *a; - char *b; +subsym_symcmp (char *a, char *b) { return strcmp (a, b); } -/* Return the index of the first occurence of B in A, or zero if none +/* Return the index of the first occurrence of B in A, or zero if none assumes b is an integer char value as a string. Index is one-based. */ static int -subsym_firstch (a, b) - char *a; - char *b; +subsym_firstch (char *a, char *b) { int val = atoi (b); char *tmp = strchr (a, val); @@ -2818,9 +2570,7 @@ subsym_firstch (a, b) /* Similar to firstch, but returns index of last occurrence of B in A. */ static int -subsym_lastch (a, b) - char *a; - char *b; +subsym_lastch (char *a, char *b) { int val = atoi (b); char *tmp = strrchr (a, val); @@ -2832,9 +2582,7 @@ subsym_lastch (a, b) symbol table). */ static int -subsym_isdefed (a, ignore) - char *a; - char *ignore ATTRIBUTE_UNUSED; +subsym_isdefed (char *a, char *ignore ATTRIBUTE_UNUSED) { symbolS *symbolP = symbol_find (a); @@ -2846,9 +2594,7 @@ subsym_isdefed (a, ignore) symbols, unsubstituted. */ static int -subsym_ismember (sym, list) - char *sym; - char *list; +subsym_ismember (char *sym, char *list) { char *elem, *ptr, *listv; @@ -2863,8 +2609,7 @@ subsym_ismember (sym, list) return 0; } - ptr = elem = xmalloc (strlen (listv) + 1); - strcpy (elem, listv); + ptr = elem = xstrdup (listv); while (*ptr && *ptr != ',') ++ptr; *ptr++ = 0; @@ -2886,15 +2631,13 @@ subsym_ismember (sym, list) 5 if decimal. */ static int -subsym_iscons (a, ignore) - char *a; - char *ignore ATTRIBUTE_UNUSED; +subsym_iscons (char *a, char *ignore ATTRIBUTE_UNUSED) { - expressionS exp; + expressionS expn; - parse_expression (a, &exp); + parse_expression (a, &expn); - if (exp.X_op == O_constant) + if (expn.X_op == O_constant) { int len = strlen (a); @@ -2927,9 +2670,7 @@ subsym_iscons (a, ignore) /* Return 1 if A is a valid symbol name. Expects string input. */ static int -subsym_isname (a, ignore) - char *a; - char *ignore ATTRIBUTE_UNUSED; +subsym_isname (char *a, char *ignore ATTRIBUTE_UNUSED) { if (!is_name_beginner (*a)) return 0; @@ -2947,9 +2688,7 @@ subsym_isname (a, ignore) Note this does not recognize "A" or "B" accumulators. */ static int -subsym_isreg (a, ignore) - char *a; - char *ignore ATTRIBUTE_UNUSED; +subsym_isreg (char *a, char *ignore ATTRIBUTE_UNUSED) { if (hash_find (reg_hash, a)) return 1; @@ -2958,12 +2697,10 @@ subsym_isreg (a, ignore) return 0; } -/* Return the structrure size, given the stag. */ +/* Return the structure size, given the stag. */ static int -subsym_structsz (name, ignore) - char *name; - char *ignore ATTRIBUTE_UNUSED; +subsym_structsz (char *name, char *ignore ATTRIBUTE_UNUSED) { struct stag *stag = (struct stag *) hash_find (stag_hash, name); @@ -2981,145 +2718,110 @@ subsym_structsz (name, ignore) return zero, we punt and return zero. */ static int -subsym_structacc (stag_name, ignore) - char *stag_name ATTRIBUTE_UNUSED; - char *ignore ATTRIBUTE_UNUSED; +subsym_structacc (char *stag_name ATTRIBUTE_UNUSED, + char *ignore ATTRIBUTE_UNUSED) { return 0; } static float -math_ceil (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_ceil (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) ceil (arg1); } static float -math_cvi (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_cvi (float arg1, float ignore ATTRIBUTE_UNUSED) { return (int) arg1; } static float -math_floor (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_floor (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) floor (arg1); } static float -math_fmod (arg1, arg2) - float arg1; - float arg2; +math_fmod (float arg1, float arg2) { return (int) arg1 % (int) arg2; } static float -math_int (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_int (float arg1, float ignore ATTRIBUTE_UNUSED) { return ((float) ((int) arg1)) == arg1; } static float -math_round (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_round (float arg1, float ignore ATTRIBUTE_UNUSED) { return arg1 > 0 ? (int) (arg1 + 0.5) : (int) (arg1 - 0.5); } static float -math_sgn (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_sgn (float arg1, float ignore ATTRIBUTE_UNUSED) { return (arg1 < 0) ? -1 : (arg1 ? 1 : 0); } static float -math_trunc (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_trunc (float arg1, float ignore ATTRIBUTE_UNUSED) { return (int) arg1; } static float -math_acos (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_acos (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) acos (arg1); } static float -math_asin (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_asin (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) asin (arg1); } static float -math_atan (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_atan (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) atan (arg1); } static float -math_atan2 (arg1, arg2) - float arg1; - float arg2; +math_atan2 (float arg1, float arg2) { return (float) atan2 (arg1, arg2); } static float -math_cosh (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_cosh (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) cosh (arg1); } static float -math_cos (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_cos (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) cos (arg1); } static float -math_cvf (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_cvf (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) arg1; } static float -math_exp (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_exp (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) exp (arg1); } static float -math_fabs (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_fabs (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) fabs (arg1); } @@ -3127,89 +2829,67 @@ math_fabs (arg1, ignore) /* expr1 * 2^expr2. */ static float -math_ldexp (arg1, arg2) - float arg1; - float arg2; +math_ldexp (float arg1, float arg2) { return arg1 * (float) pow (2.0, arg2); } static float -math_log10 (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_log10 (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) log10 (arg1); } static float -math_log (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_log (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) log (arg1); } static float -math_max (arg1, arg2) - float arg1; - float arg2; +math_max (float arg1, float arg2) { return (arg1 > arg2) ? arg1 : arg2; } static float -math_min (arg1, arg2) - float arg1; - float arg2; +math_min (float arg1, float arg2) { return (arg1 < arg2) ? arg1 : arg2; } static float -math_pow (arg1, arg2) - float arg1; - float arg2; +math_pow (float arg1, float arg2) { return (float) pow (arg1, arg2); } static float -math_sin (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_sin (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) sin (arg1); } static float -math_sinh (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_sinh (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) sinh (arg1); } static float -math_sqrt (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_sqrt (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) sqrt (arg1); } static float -math_tan (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_tan (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) tan (arg1); } static float -math_tanh (arg1, ignore) - float arg1; - float ignore ATTRIBUTE_UNUSED; +math_tanh (float arg1, float ignore ATTRIBUTE_UNUSED) { return (float) tanh (arg1); } @@ -3217,8 +2897,8 @@ math_tanh (arg1, ignore) /* Built-in substitution symbol functions and math functions. */ typedef struct { - char *name; - int (*proc) PARAMS ((char *, char *)); + const char *name; + int (*proc) (char *, char *); int nargs; } subsym_proc_entry; @@ -3241,8 +2921,8 @@ static const subsym_proc_entry subsym_procs[] = typedef struct { - char *name; - float (*proc) PARAMS ((float, float)); + const char *name; + float (*proc) (float, float); int nargs; int int_return; } math_proc_entry; @@ -3284,9 +2964,9 @@ static const math_proc_entry math_procs[] = }; void -md_begin () +md_begin (void) { - template *tm; + insn_template *tm; symbol *sym; const subsym_proc_entry *subsym_proc; const math_proc_entry *math_proc; @@ -3315,7 +2995,7 @@ md_begin () } op_hash = hash_new (); - for (tm = (template *) tic54x_optab; tm->name; tm++) + for (tm = (insn_template *) tic54x_optab; tm->name; tm++) { if (hash_find (op_hash, tm->name)) continue; @@ -3325,7 +3005,7 @@ md_begin () tm->name, hash_err); } parop_hash = hash_new (); - for (tm = (template *) tic54x_paroptab; tm->name; tm++) + for (tm = (insn_template *) tic54x_paroptab; tm->name; tm++) { if (hash_find (parop_hash, tm->name)) continue; @@ -3393,8 +3073,7 @@ md_begin () } static int -is_accumulator (operand) - struct opstruct *operand; +is_accumulator (struct opstruct *operand) { return strcasecmp (operand->buf, "a") == 0 || strcasecmp (operand->buf, "b") == 0; @@ -3405,9 +3084,7 @@ is_accumulator (operand) the next array. */ static int -get_operands (operands, line) - struct opstruct operands[]; - char *line; +get_operands (struct opstruct operands[], char *line) { char *lptr = line; int numexp = 0; @@ -3428,7 +3105,7 @@ get_operands (operands, line) { if (paren_not_balanced) { - as_bad ("Unbalanced parenthesis in operand %d", numexp); + as_bad (_("Unbalanced parenthesis in operand %d"), numexp); return -1; } else @@ -3459,7 +3136,7 @@ get_operands (operands, line) { if (expecting_operand || *lptr == ',') { - as_bad ("Expecting operand after ','"); + as_bad (_("Expecting operand after ','")); return -1; } } @@ -3467,7 +3144,7 @@ get_operands (operands, line) { if (*++lptr == '\0') { - as_bad ("Expecting operand after ','"); + as_bad (_("Expecting operand after ','")); return -1; } expecting_operand = 1; @@ -3478,7 +3155,7 @@ get_operands (operands, line) ; if (!is_end_of_line[(int) *lptr]) { - as_bad ("Extra junk on line"); + as_bad (_("Extra junk on line")); return -1; } @@ -3536,8 +3213,7 @@ get_operands (operands, line) /* Predicates for different operand types. */ static int -is_immediate (operand) - struct opstruct *operand; +is_immediate (struct opstruct *operand) { return *operand->buf == '#'; } @@ -3546,8 +3222,7 @@ is_immediate (operand) and must *not* have the '#' prefix. */ static int -is_absolute (operand) - struct opstruct *operand; +is_absolute (struct opstruct *operand) { return operand->exp.X_op == O_constant && !is_immediate (operand); } @@ -3555,8 +3230,7 @@ is_absolute (operand) /* Is this an indirect operand? */ static int -is_indirect (operand) - struct opstruct *operand; +is_indirect (struct opstruct *operand) { return operand->buf[0] == '*'; } @@ -3564,8 +3238,7 @@ is_indirect (operand) /* Is this a valid dual-memory operand? */ static int -is_dual (operand) - struct opstruct *operand; +is_dual (struct opstruct *operand) { if (is_indirect (operand) && strncasecmp (operand->buf, "*ar", 3) == 0) { @@ -3585,8 +3258,7 @@ is_dual (operand) } static int -is_mmreg (operand) - struct opstruct *operand; +is_mmreg (struct opstruct *operand) { return (is_absolute (operand) || is_immediate (operand) @@ -3594,9 +3266,7 @@ is_mmreg (operand) } static int -is_type (operand, type) - struct opstruct *operand; - enum optype type; +is_type (struct opstruct *operand, enum optype type) { switch (type) { @@ -3700,13 +3370,12 @@ is_type (operand, type) } static int -operands_match (insn, operands, opcount, refoptype, minops, maxops) - tic54x_insn *insn; - struct opstruct *operands; - int opcount; - const enum optype *refoptype; - int minops; - int maxops; +operands_match (tic54x_insn *insn, + struct opstruct *operands, + int opcount, + const enum optype *refoptype, + int minops, + int maxops) { int op = 0, refop = 0; @@ -3769,10 +3438,7 @@ operands_match (insn, operands, opcount, refoptype, minops, maxops) 2 for the upper 7 bits of a 23-bit address (LDX). */ static int -encode_dmad (insn, operand, xpc_code) - tic54x_insn *insn; - struct opstruct *operand; - int xpc_code; +encode_dmad (tic54x_insn *insn, struct opstruct *operand, int xpc_code) { int op = 1 + insn->is_lkaddr; @@ -3833,9 +3499,7 @@ encode_dmad (insn, operand, xpc_code) /* 7-bit direct address encoding. */ static int -encode_address (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_address (tic54x_insn *insn, struct opstruct *operand) { /* Assumes that dma addresses are *always* in word 0 of the opcode. */ insn->opcode[0].addr_expr = operand->exp; @@ -3856,9 +3520,7 @@ encode_address (insn, operand) } static int -encode_indirect (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_indirect (tic54x_insn *insn, struct opstruct *operand) { int arf; int mod; @@ -3930,13 +3592,12 @@ encode_indirect (insn, operand) } static int -encode_integer (insn, operand, which, min, max, mask) - tic54x_insn *insn; - struct opstruct *operand; - int which; - int min; - int max; - unsigned short mask; +encode_integer (tic54x_insn *insn, + struct opstruct *operand, + int which, + int min, + int max, + unsigned short mask) { long parse, integer; @@ -3991,9 +3652,7 @@ encode_integer (insn, operand, which, min, max, mask) } static int -encode_condition (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_condition (tic54x_insn *insn, struct opstruct *operand) { symbol *cc = (symbol *) hash_find (cc_hash, operand->buf); if (!cc) @@ -4053,9 +3712,7 @@ encode_condition (insn, operand) } static int -encode_cc3 (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_cc3 (tic54x_insn *insn, struct opstruct *operand) { symbol *cc3 = (symbol *) hash_find (cc3_hash, operand->buf); int value = cc3 ? cc3->value : operand->exp.X_add_number << 8; @@ -4070,9 +3727,7 @@ encode_cc3 (insn, operand) } static int -encode_arx (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_arx (tic54x_insn *insn, struct opstruct *operand) { int arf = strlen (operand->buf) >= 3 ? operand->buf[2] - '0' : -1; @@ -4086,9 +3741,7 @@ encode_arx (insn, operand) } static int -encode_cc2 (insn, operand) - tic54x_insn *insn; - struct opstruct *operand; +encode_cc2 (tic54x_insn *insn, struct opstruct *operand) { symbol *cc2 = (symbol *) hash_find (cc2_hash, operand->buf); @@ -4102,10 +3755,7 @@ encode_cc2 (insn, operand) } static int -encode_operand (insn, type, operand) - tic54x_insn *insn; - enum optype type; - struct opstruct *operand; +encode_operand (tic54x_insn *insn, enum optype type, struct opstruct *operand) { int ext = (insn->tm->flags & FL_EXT) != 0; @@ -4144,7 +3794,7 @@ encode_operand (insn, type, operand) } return 1; case OP_RND: - /* Make sure this agrees with with the OP_DST operand. */ + /* Make sure this agrees with the OP_DST operand. */ if (!((TOUPPER (operand->buf[0]) == 'B') ^ ((insn->opcode[0].word & (1 << 8)) != 0))) { @@ -4328,8 +3978,7 @@ encode_operand (insn, type, operand) } static void -emit_insn (insn) - tic54x_insn *insn; +emit_insn (tic54x_insn *insn) { int i; flagword oldflags = bfd_get_section_flags (stdoutput, now_seg); @@ -4354,7 +4003,7 @@ emit_insn (insn) if (insn->opcode[i].unresolved) fix_new_exp (frag_now, p - frag_now->fr_literal, insn->opcode[i].r_nchars, &insn->opcode[i].addr_expr, - false, insn->opcode[i].r_type); + FALSE, insn->opcode[i].r_type); } } @@ -4362,8 +4011,7 @@ emit_insn (insn) return the total number of words used by the instruction. */ static int -build_insn (insn) - tic54x_insn *insn; +build_insn (tic54x_insn *insn) { int i; @@ -4413,8 +4061,7 @@ build_insn (insn) } static int -optimize_insn (insn) - tic54x_insn *insn; +optimize_insn (tic54x_insn *insn) { /* Optimize some instructions, helping out the brain-dead programmer. */ #define is_zero(op) ((op).exp.X_op == O_constant && (op).exp.X_add_number == 0) @@ -4507,11 +4154,9 @@ optimize_insn (insn) /* Find a matching template if possible, and get the operand strings. */ static int -tic54x_parse_insn (insn, line) - tic54x_insn *insn; - char *line; +tic54x_parse_insn (tic54x_insn *insn, char *line) { - insn->tm = (template *) hash_find (op_hash, insn->mnemonic); + insn->tm = (insn_template *) hash_find (op_hash, insn->mnemonic); if (!insn->tm) { as_bad (_("Unrecognized instruction \"%s\""), insn->mnemonic); @@ -4534,8 +4179,8 @@ tic54x_parse_insn (insn, line) /* SUCCESS! now try some optimizations. */ if (optimize_insn (insn)) { - insn->tm = (template *) hash_find (op_hash, - insn->mnemonic); + insn->tm = (insn_template *) hash_find (op_hash, + insn->mnemonic); continue; } @@ -4556,8 +4201,7 @@ static int parallel_on_next_line_hint = 0; Look for a subsequent line starting with "||". */ static int -next_line_shows_parallel (next_line) - char *next_line; +next_line_shows_parallel (char *next_line) { /* Look for the second half. */ while (ISSPACE (*next_line)) @@ -4568,11 +4212,9 @@ next_line_shows_parallel (next_line) } static int -tic54x_parse_parallel_insn_firstline (insn, line) - tic54x_insn *insn; - char *line; +tic54x_parse_parallel_insn_firstline (tic54x_insn *insn, char *line) { - insn->tm = (template *) hash_find (parop_hash, insn->mnemonic); + insn->tm = (insn_template *) hash_find (parop_hash, insn->mnemonic); if (!insn->tm) { as_bad (_("Unrecognized parallel instruction \"%s\""), @@ -4601,9 +4243,7 @@ tic54x_parse_parallel_insn_firstline (insn, line) /* Parse the second line of a two-line parallel instruction. */ static int -tic54x_parse_parallel_insn_lastline (insn, line) - tic54x_insn *insn; - char *line; +tic54x_parse_parallel_insn_lastline (tic54x_insn *insn, char *line) { int valid_mnemonic = 0; @@ -4641,11 +4281,7 @@ tic54x_parse_parallel_insn_lastline (insn, line) replacement on the value. */ static char * -subsym_get_arg (line, terminators, str, nosub) - char *line; - char *terminators; - char **str; - int nosub; +subsym_get_arg (char *line, const char *terminators, char **str, int nosub) { char *ptr = line; char *endp; @@ -4677,7 +4313,7 @@ subsym_get_arg (line, terminators, str, nosub) } else { - char *term = terminators; + const char *term = terminators; char *value = NULL; while (*ptr && *ptr != *term) @@ -4708,9 +4344,7 @@ subsym_get_arg (line, terminators, str, nosub) that's compatible w/TI's assembler. */ static void -subsym_create_or_replace (name, value) - char *name; - char *value; +subsym_create_or_replace (char *name, char *value) { int i; @@ -4729,13 +4363,11 @@ subsym_create_or_replace (name, value) } /* Look up the substitution string replacement for the given symbol. - Start with the innermost macro substituion table given and work + Start with the innermost macro substitution table given and work outwards. */ static char * -subsym_lookup (name, nest_level) - char *name; - int nest_level; +subsym_lookup (char *name, int nest_level) { char *value = hash_find (subsym_hash[nest_level], name); @@ -4753,9 +4385,7 @@ subsym_lookup (name, nest_level) If FORCED is set, look for forced substitutions of the form ':SYMBOL:'. */ static char * -subsym_substitute (line, forced) - char * line; - int forced; +subsym_substitute (char *line, int forced) { /* For each apparent symbol, see if it's a substitution symbol, and if so, replace it in the input. */ @@ -4772,8 +4402,7 @@ subsym_substitute (line, forced) char *tmp; /* Work with a copy of the input line. */ - replacement = xmalloc (strlen (line) + 1); - strcpy (replacement, line); + replacement = xstrdup (line); ptr = head = replacement; @@ -4851,8 +4480,8 @@ subsym_substitute (line, forced) if (forced) ++ptr; - name = input_line_pointer = ptr; - c = get_symbol_end (); + input_line_pointer = ptr; + c = get_symbol_name (&name); /* '?' is not normally part of a symbol, but it IS part of a local label. */ if (c == '?') @@ -4883,7 +4512,7 @@ subsym_substitute (line, forced) if (value == NULL) { char digit[11]; - char *namecopy = strcpy (xmalloc (strlen (name) + 1), name); + char *namecopy = xstrdup (name); value = strcpy (xmalloc (strlen (name) + sizeof (digit) + 1), name); @@ -4917,10 +4546,10 @@ subsym_substitute (line, forced) ++ptr; if (math_entry != NULL) { - float arg1, arg2 = 0; + float farg1, farg2 = 0; volatile float fresult; - arg1 = (float) strtod (ptr, &ptr); + farg1 = (float) strtod (ptr, &ptr); if (math_entry->nargs == 2) { if (*ptr++ != ',') @@ -4928,10 +4557,10 @@ subsym_substitute (line, forced) as_bad (_("Expecting second argument")); break; } - arg2 = (float) strtod (ptr, &ptr); + farg2 = (float) strtod (ptr, &ptr); } - fresult = (*math_entry->proc) (arg1, arg2); - value = xmalloc (128); + fresult = (*math_entry->proc) (farg1, farg2); + value = XNEWVEC (char, 128); if (math_entry->int_return) sprintf (value, "%d", (int) fresult); else @@ -4992,7 +4621,7 @@ subsym_substitute (line, forced) break; } val = (*entry->proc) (arg1, arg2); - value = xmalloc (64); + value = XNEWVEC (char, 64); sprintf (value, "%d", val); } /* Fix things up to replace the entire expression, not just the @@ -5008,13 +4637,13 @@ subsym_substitute (line, forced) substitutions are performed, or a substitution that has been previously made is encountered again. - put the symbol into the recursion hash table so we only + Put the symbol into the recursion hash table so we only try to replace a symbol once. */ if (recurse) { hash_insert (subsym_recurse_hash, name, name); value = subsym_substitute (value, macro_level > 0); - hash_delete (subsym_recurse_hash, name); + hash_delete (subsym_recurse_hash, name, FALSE); } /* Temporarily zero-terminate where the symbol started. */ @@ -5025,11 +4654,10 @@ subsym_substitute (line, forced) { /* Subscripted substitution symbol -- use just the indicated portion of the string; the description - kinda indicates that forced substituion is not + kinda indicates that forced substitution is not supposed to be recursive, but I'm not sure. */ unsigned beg, len = 1; /* default to a single char */ - char *newval = strcpy (xmalloc (strlen (value) + 1), - value); + char *newval = xstrdup (value); savedp = input_line_pointer; input_line_pointer = tail + 1; @@ -5037,7 +4665,7 @@ subsym_substitute (line, forced) if (beg < 1) { as_bad (_("Invalid subscript (use 1 to %d)"), - strlen (value)); + (int) strlen (value)); break; } if (*input_line_pointer == ',') @@ -5047,7 +4675,7 @@ subsym_substitute (line, forced) if (beg + len > strlen (value)) { as_bad (_("Invalid length (use 0 to %d"), - strlen (value) - beg); + (int) strlen (value) - beg); break; } } @@ -5080,24 +4708,6 @@ subsym_substitute (line, forced) break; } ++tail; -#if 0 - /* Try to replace required whitespace - eliminated by the preprocessor; technically, a forced - substitution could come anywhere, even mid-symbol, - e.g. if x is "0", 'sym:x:end' should result in 'sym0end', - but 'sym:x: end' should result in 'sym0 end'. - FIXME -- this should really be fixed in the preprocessor, - but would require several new states; - KEEP_WHITE_AROUND_COLON does part of the job, but isn't - complete. */ - if ((is_part_of_name (tail[1]) - && tail[1] != '.' - && tail[1] != '$') - || tail[1] == '\0' || tail[1] == ',' || tail[1] == '"') - ++tail; - else - *tail = ' '; -#endif } else /* Restore the character after the symbol end. */ @@ -5132,7 +4742,7 @@ subsym_substitute (line, forced) returns the new buffer limit. */ void -tic54x_start_line_hook () +tic54x_start_line_hook (void) { char *line, *endp; char *replacement = NULL; @@ -5146,7 +4756,7 @@ tic54x_start_line_hook () line[endp - input_line_pointer] = 0; /* Scan ahead for parallel insns. */ - parallel_on_next_line_hint = next_line_shows_parallel (endp + 1); + parallel_on_next_line_hint = next_line_shows_parallel (endp); /* If within a macro, first process forced replacements. */ if (macro_level > 0) @@ -5204,8 +4814,7 @@ tic54x_start_line_hook () machine dependent instruction. This function is supposed to emit the frags/bytes it assembles to. */ void -md_assemble (line) - char *line; +md_assemble (char *line) { static int repeat_slot = 0; static int delay_slots = 0; /* How many delay slots left to fill? */ @@ -5216,7 +4825,7 @@ md_assemble (line) int c; input_line_pointer = line; - c = get_symbol_end (); + c = get_symbol_name (&line); if (cpu == VNONE) cpu = V542; @@ -5371,15 +4980,14 @@ md_assemble (line) a ".file" symbol. */ void -tic54x_adjust_symtab () +tic54x_adjust_symtab (void) { if (symbol_rootP == NULL || S_GET_STORAGE_CLASS (symbol_rootP) != C_FILE) { - char *filename; unsigned lineno; - as_where (&filename, &lineno); - c_dot_file_symbol (filename); + const char * filename = as_where (&lineno); + c_dot_file_symbol (filename, 0); } } @@ -5399,14 +5007,8 @@ tic54x_unrecognized_line (int c) FIXME -- obviously this isn't done yet. These locals still show up in the symbol table. */ void -tic54x_define_label (sym) - symbolS *sym; +tic54x_define_label (symbolS *sym) { -#if 0 - static int local_label_count = 0; - const char *name = S_GET_NAME (sym); -#endif - /* Just in case we need this later; note that this is not necessarily the same thing as line_label... When aligning or assigning labels to fields, sometimes the label is @@ -5419,8 +5021,7 @@ tic54x_define_label (sym) /* Try to parse something that normal parsing failed at. */ symbolS * -tic54x_undefined_symbol (name) - char *name; +tic54x_undefined_symbol (char *name) { symbol *sym; @@ -5452,62 +5053,29 @@ tic54x_undefined_symbol (name) it. */ int -tic54x_parse_name (name, exp) - char *name ATTRIBUTE_UNUSED; - expressionS *exp ATTRIBUTE_UNUSED; +tic54x_parse_name (char *name ATTRIBUTE_UNUSED, + expressionS *expn ATTRIBUTE_UNUSED) { -#if 0 - symbol *sym = (symbol *) hash_find (mmreg_hash, name); - - /* If it's a MMREG, replace it with its constant value. */ - if (sym) - { - exp->X_op = O_constant; - exp->X_add_number = sym->value; - return 1; - } -#endif return 0; } -char * -md_atof (type, literalP, sizeP) - int type; - char *literalP; - int *sizeP; +const char * +md_atof (int type, char *literalP, int *sizeP) { -#define MAX_LITTLENUMS 2 - LITTLENUM_TYPE words[MAX_LITTLENUMS]; - LITTLENUM_TYPE *word; - /* Only one precision on the c54x. */ - int prec = 2; - char *t = atof_ieee (input_line_pointer, type, words); - if (t) - input_line_pointer = t; - *sizeP = 4; - /* Target data is little-endian, but floats are stored big-"word"ian. ugh. */ - for (word = words; prec--;) - { - md_number_to_chars (literalP, (long) (*word++), sizeof (LITTLENUM_TYPE)); - literalP += sizeof (LITTLENUM_TYPE); - } - - return 0; + return ieee_md_atof (type, literalP, sizeP, TRUE); } arelent * -tc_gen_reloc (section, fixP) - asection *section; - fixS *fixP; +tc_gen_reloc (asection *section, fixS *fixP) { arelent *rel; bfd_reloc_code_real_type code = fixP->fx_r_type; asymbol *sym = symbol_get_bfdsym (fixP->fx_addsy); - rel = (arelent *) xmalloc (sizeof (arelent)); - rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + rel = XNEW (arelent); + rel->sym_ptr_ptr = XNEW (asymbol *); *rel->sym_ptr_ptr = sym; /* We assume that all rel->address are host byte offsets. */ rel->address = fixP->fx_frag->fr_address + fixP->fx_where; @@ -5531,14 +5099,9 @@ tc_gen_reloc (section, fixP) /* Handle cons expressions. */ void -tic54x_cons_fix_new (frag, where, octets, exp) - fragS *frag; - int where; - int octets; - expressionS *exp; +tic54x_cons_fix_new (fragS *frag, int where, int octets, expressionS *expn, + bfd_reloc_code_real_type r) { - bfd_reloc_code_real_type r; - switch (octets) { default: @@ -5558,7 +5121,7 @@ tic54x_cons_fix_new (frag, where, octets, exp) r = BFD_RELOC_32; break; } - fix_new_exp (frag, where, octets, exp, 0, r); + fix_new_exp (frag, where, octets, expn, 0, r); } /* Attempt to simplify or even eliminate a fixup. @@ -5567,10 +5130,7 @@ tic54x_cons_fix_new (frag, where, octets, exp) If fixp->fx_addsy is non-NULL, we'll have to generate a reloc entry. */ void -md_apply_fix3 (fixP, valP, seg) - fixS *fixP; - valueT * valP; - segT seg ATTRIBUTE_UNUSED; +md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; valueT val = * valP; @@ -5621,39 +5181,22 @@ md_apply_fix3 (fixP, valP, seg) don't need to do anything here, since BFD does the proper encoding. */ valueT -md_section_align (segment, section_size) - segT segment ATTRIBUTE_UNUSED; - valueT section_size; +md_section_align (segT segment ATTRIBUTE_UNUSED, valueT section_size) { return section_size; } long -md_pcrel_from (fixP) - fixS *fixP ATTRIBUTE_UNUSED; +md_pcrel_from (fixS *fixP ATTRIBUTE_UNUSED) { return 0; } -#if defined OBJ_COFF - -short -tc_coff_fix2rtype (fixP) - fixS *fixP; -{ - return (fixP->fx_r_type); -} - -#endif /* OBJ_COFF */ - /* Mostly little-endian, but longwords (4 octets) get MS word stored first. */ void -tic54x_number_to_chars (buf, val, n) - char *buf; - valueT val; - int n; +tic54x_number_to_chars (char *buf, valueT val, int n) { if (n != 4) number_to_chars_littleendian (buf, val, n); @@ -5665,9 +5208,8 @@ tic54x_number_to_chars (buf, val, n) } int -tic54x_estimate_size_before_relax (frag, seg) - fragS *frag ATTRIBUTE_UNUSED; - segT seg ATTRIBUTE_UNUSED; +tic54x_estimate_size_before_relax (fragS *frag ATTRIBUTE_UNUSED, + segT seg ATTRIBUTE_UNUSED) { return 0; } @@ -5676,9 +5218,7 @@ tic54x_estimate_size_before_relax (frag, seg) to symbols being in different frags. return number of octets added. */ int -tic54x_relax_frag (frag, stretch) - fragS *frag; - long stretch ATTRIBUTE_UNUSED; +tic54x_relax_frag (fragS *frag, long stretch ATTRIBUTE_UNUSED) { symbolS *sym = frag->fr_symbol; int growth = 0; @@ -5777,10 +5317,9 @@ tic54x_relax_frag (frag, stretch) } void -tic54x_convert_frag (abfd, seg, frag) - bfd *abfd ATTRIBUTE_UNUSED; - segT seg ATTRIBUTE_UNUSED; - fragS *frag; +tic54x_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, + segT seg ATTRIBUTE_UNUSED, + fragS *frag) { /* Offset is in bytes. */ frag->fr_offset = (frag->fr_next->fr_address @@ -5800,24 +5339,21 @@ tic54x_convert_frag (abfd, seg, frag) syntax puts the symbol *before* the pseudo (which is kinda like MRI syntax, I guess, except I've never seen a definition of MRI syntax). - C is the character that used to be at *REST, which points to the end of the - label. - Don't allow labels to start with '.' */ int -tic54x_start_label (c, rest) - int c; - char *rest; +tic54x_start_label (int nul_char, int next_char) { + char *rest; + /* If within .struct/.union, no auto line labels, please. */ if (current_stag != NULL) return 0; /* Disallow labels starting with "." */ - if (c != ':') + if (next_char != ':') { - char *label = rest; + char *label = input_line_pointer; while (!is_end_of_line[(int) label[-1]]) --label; @@ -5828,22 +5364,22 @@ tic54x_start_label (c, rest) } } - if (is_end_of_line[(int) c]) + if (is_end_of_line[(int) next_char]) return 1; - if (ISSPACE (c)) - while (ISSPACE (c = *++rest)) - ; - if (c == '.') - { - /* Don't let colon () define a label for any of these... */ - return (strncasecmp (rest, ".tag", 4) != 0 || !ISSPACE (rest[4])) - && (strncasecmp (rest, ".struct", 7) != 0 || !ISSPACE (rest[7])) - && (strncasecmp (rest, ".union", 6) != 0 || !ISSPACE (rest[6])) - && (strncasecmp (rest, ".macro", 6) != 0 || !ISSPACE (rest[6])) - && (strncasecmp (rest, ".set", 4) != 0 || !ISSPACE (rest[4])) - && (strncasecmp (rest, ".equ", 4) != 0 || !ISSPACE (rest[4])); - } + rest = input_line_pointer; + if (nul_char == '"') + ++rest; + while (ISSPACE (next_char)) + next_char = *++rest; + if (next_char != '.') + return 1; - return 1; + /* Don't let colon () define a label for any of these... */ + return ((strncasecmp (rest, ".tag", 4) != 0 || !ISSPACE (rest[4])) + && (strncasecmp (rest, ".struct", 7) != 0 || !ISSPACE (rest[7])) + && (strncasecmp (rest, ".union", 6) != 0 || !ISSPACE (rest[6])) + && (strncasecmp (rest, ".macro", 6) != 0 || !ISSPACE (rest[6])) + && (strncasecmp (rest, ".set", 4) != 0 || !ISSPACE (rest[4])) + && (strncasecmp (rest, ".equ", 4) != 0 || !ISSPACE (rest[4]))); }