diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 14 | ||||
| -rw-r--r-- | gas/NEWS | 3 | ||||
| -rw-r--r-- | gas/config/obj-coff.c | 4 | ||||
| -rw-r--r-- | gas/config/obj-coff.h | 5 | ||||
| -rw-r--r-- | gas/config/tc-tic4x.c | 2627 | ||||
| -rw-r--r-- | gas/config/tc-tic4x.h | 98 | ||||
| -rwxr-xr-x | gas/configure | 339 | ||||
| -rw-r--r-- | gas/configure.in | 1 |
8 files changed, 2920 insertions, 171 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 17acb07..e8bf9fe 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,17 @@ +2002-08-28 Svein E. Seldal <Svein.Seldal@solidas.com> + + * configure.in: Add tic4x-coff* and c4x-coff*-coff-coff targets. + * configure: Regenerate. + * NEWS: Mention new port. + +2002-08-28 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * config/obj-coff.c: Add sdef definition. + * config/obj-coff.h: Add tic4x include file and set + target format. + * config/tc-tic4x.c: New file. + * config/tc-tic4x.h: New file. + 2002-08-28 Alan Modra <amodra@bigpond.net.au> * write.c (BFD_FAST_SECTION_FILL): Remove unused macro. @@ -1,5 +1,8 @@ -*- text -*- +* Support for Texas Instruments TMS320C4x series of microcontrollers + contributed by Michael Hayes and Svein E. Seldal. + * Support for the Ubicom IP2xxx microcontroller added. Changes in 2.13: diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c index eb592aa..56b55d7 100644 --- a/gas/config/obj-coff.c +++ b/gas/config/obj-coff.c @@ -4623,8 +4623,8 @@ const pseudo_typeS coff_pseudo_table[] = #endif {"version", s_ignore, 0}, {"ABORT", s_abort, 0}, -#ifdef TC_M88K - /* The m88k uses sdef instead of def. */ +#if defined( TC_M88K ) || defined ( TC_TIC4X ) + /* The m88k and tic4x uses sdef instead of def. */ {"sdef", obj_coff_def, 0}, #endif {NULL, NULL, 0} /* end sentinel */ diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h index 56389c9..ed1fda9 100644 --- a/gas/config/obj-coff.h +++ b/gas/config/obj-coff.h @@ -157,6 +157,11 @@ #define TARGET_FORMAT "coff-tic30" #endif +#ifdef TC_TIC4X +#include "coff/tic4x.h" +#define TARGET_FORMAT "coff2-c4x" +#endif + #ifdef TC_TIC54X #include "coff/tic54x.h" #define TARGET_FORMAT "coff1-c54x" diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c new file mode 100644 index 0000000..dbd71d0 --- /dev/null +++ b/gas/config/tc-tic4x.c @@ -0,0 +1,2627 @@ +/* tc-c4x.c -- Assemble for the Texas Instruments TMS320C[34]x. + Copyright (C) 1997,1998, 2002 Free Software Foundation. + + Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz) + + 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) + 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, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + +/* Things not currently implemented: + > .usect if has symbol on previous line + + > .sym, .eos, .stag, .etag, .member + + > Evaluation of constant floating point expressions (expr.c needs work!) + + > Warnings issued if parallel load of same register + + Note that this is primarily designed to handle the code generated + by GCC. Anything else is a bonus! */ + +#include <stdio.h> +#include <ctype.h> + +#include "as.h" +#include "opcode/tic4x.h" +#include "subsegs.h" +#include "obstack.h" +#include "symbols.h" +#include "listing.h" + +/* OK, we accept a syntax similar to the other well known C30 + assembly tools. With C4X_ALT_SYNTAX defined we are more + flexible, allowing a more Unix-like syntax: `%' in front of + register names, `#' in front of immediate constants, and + not requiring `@' in front of direct addresses. */ + +#define C4X_ALT_SYNTAX + +/* Equal to MAX_PRECISION in atof-ieee.c. */ +#define MAX_LITTLENUMS 6 /* (12 bytes) */ + +/* Handle of the inst mnemonic hash table. */ +static struct hash_control *c4x_op_hash = NULL; + +/* Handle asg pseudo. */ +static struct hash_control *c4x_asg_hash = NULL; + +static unsigned int c4x_cpu = 0; /* Default to TMS320C40. */ +static unsigned int c4x_big_model = 0; /* Default to small memory model. */ +static unsigned int c4x_reg_args = 0; /* Default to args passed on stack. */ + +typedef enum + { + M_UNKNOWN, M_IMMED, M_DIRECT, M_REGISTER, M_INDIRECT, + M_IMMED_F, M_PARALLEL, M_HI + } +c4x_addr_mode_t; + +typedef struct c4x_operand + { + c4x_addr_mode_t mode; /* Addressing mode. */ + expressionS expr; /* Expression. */ + int disp; /* Displacement for indirect addressing. */ + int aregno; /* Aux. register number. */ + LITTLENUM_TYPE fwords[MAX_LITTLENUMS]; /* Float immed. number. */ + } +c4x_operand_t; + +typedef struct c4x_insn + { + char name[C4X_NAME_MAX]; /* Mnemonic of instruction. */ + unsigned int in_use; /* True if in_use. */ + unsigned int parallel; /* True if parallel instruction. */ + unsigned int nchars; /* This is always 4 for the C30. */ + unsigned long opcode; /* Opcode number. */ + expressionS exp; /* Expression required for relocation. */ + int reloc; /* Relocation type required. */ + int pcrel; /* True if relocation PC relative. */ + char *pname; /* Name of instruction in parallel. */ + unsigned int num_operands; /* Number of operands in total. */ + c4x_inst_t *inst; /* Pointer to first template. */ + c4x_operand_t operands[C4X_OPERANDS_MAX]; + } +c4x_insn_t; + +static c4x_insn_t the_insn; /* Info about our instruction. */ +static c4x_insn_t *insn = &the_insn; + +static void c4x_asg PARAMS ((int)); +static void c4x_bss PARAMS ((int)); +static void c4x_globl PARAMS ((int)); +static void c4x_eval PARAMS ((int)); +static void c4x_cons PARAMS ((int)); +static void c4x_set PARAMS ((int)); +static void c4x_newblock PARAMS ((int)); +static void c4x_pseudo_ignore PARAMS ((int)); +static void c4x_sect PARAMS ((int)); +static void c4x_usect PARAMS ((int)); +static void c4x_version PARAMS ((int)); + +const pseudo_typeS + md_pseudo_table[] = +{ + {"align", s_align_bytes, 32}, + {"ascii", c4x_cons, 1}, + {"asciz", c4x_pseudo_ignore, 0}, + {"asg", c4x_asg, 0}, + {"asect", c4x_pseudo_ignore, 0}, /* Absolute named section. */ + {"block", s_space, 0}, + {"byte", c4x_cons, 1}, + {"bss", c4x_bss, 0}, + {"comm", c4x_bss, 0}, + {"def", c4x_globl, 0}, + {"endfunc", c4x_pseudo_ignore, 0}, + {"eos", c4x_pseudo_ignore, 0}, + {"etag", c4x_pseudo_ignore, 0}, + {"equ", c4x_set, 0}, + {"eval", c4x_eval, 0}, + {"exitm", s_mexit, 0}, + {"func", c4x_pseudo_ignore, 0}, + {"global", c4x_globl, 0}, + {"globl", c4x_globl, 0}, + {"hword", c4x_cons, 2}, + {"ieee", float_cons, 'i'}, + {"int", c4x_cons, 4}, /* .int allocates 4 bytes. */ + {"length", c4x_pseudo_ignore, 0}, + {"ldouble", float_cons, 'l'}, + {"member", c4x_pseudo_ignore, 0}, + {"newblock", c4x_newblock, 0}, + {"ref", s_ignore, 0}, /* All undefined treated as external. */ + {"set", c4x_set, 0}, + {"sect", c4x_sect, 1}, /* Define named section. */ + {"space", s_space, 4}, + {"stag", c4x_pseudo_ignore, 0}, + {"string", c4x_pseudo_ignore, 0}, + {"sym", c4x_pseudo_ignore, 0}, + {"usect", c4x_usect, 0}, /* Reserve space in uninit. named sect. */ + {"version", c4x_version, 0}, + {"width", c4x_pseudo_ignore, 0}, + {"word", c4x_cons, 4}, /* .word allocates 4 bytes. */ + {"xdef", c4x_globl, 0}, + {NULL, 0, 0}, +}; + +int md_short_jump_size = 4; +int md_long_jump_size = 4; +const int md_reloc_size = RELSZ; /* Coff headers. */ + +/* This array holds the chars that always start a comment. If the + pre-processor is disabled, these aren't very useful. */ +#ifdef C4X_ALT_SYNTAX +const char comment_chars[] = ";!"; +#else +const char comment_chars[] = ";"; +#endif + +/* This array holds the chars that only start a comment at the beginning of + a line. If the line seems to have the form '# 123 filename' + .line and .file directives will appear in the pre-processed output. + Note that input_file.c hand checks for '#' at the beginning of the + first line of the input file. This is because the compiler outputs + #NO_APP at the beginning of its output. + Also note that comments like this one will always work. */ +const char line_comment_chars[] = "#*"; + +/* We needed an unused char for line separation to work around the + lack of macros, using sed and such. */ +const char line_separator_chars[] = "&"; + +/* Chars that can be used to separate mant from exp in floating point nums. */ +const char EXP_CHARS[] = "eE"; + +/* Chars that mean this number is a floating point constant. */ +/* As in 0f12.456 */ +/* or 0d1.2345e12 */ +const char FLT_CHARS[] = "fFilsS"; + +/* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be + changed in read.c. Ideally it shouldn't have to know about it at + all, but nothing is ideal around here. */ + +/* Flonums returned here. */ +extern FLONUM_TYPE generic_floating_point_number; + +/* Precision in LittleNums. */ +#define MAX_PRECISION (2) +#define S_PRECISION (1) /* Short float constants 16-bit. */ +#define F_PRECISION (2) /* Float and double types 32-bit. */ +#define GUARD (2) + +/* Turn generic_floating_point_number into a real short/float/double. */ +int +c4x_gen_to_words (FLONUM_TYPE flonum, LITTLENUM_TYPE *words, int precision) +{ + int return_value = 0; + LITTLENUM_TYPE *p; /* Littlenum pointer. */ + int mantissa_bits; /* Bits in mantissa field. */ + int exponent_bits; /* Bits in exponent field. */ + int exponent; + unsigned int sone; /* Scaled one. */ + unsigned int sfract; /* Scaled fraction. */ + unsigned int smant; /* Scaled mantissa. */ + unsigned int tmp; + int shift; /* Shift count. */ + + /* Here is how a generic floating point number is stored using + flonums (an extension of bignums) where p is a pointer to an + array of LITTLENUMs. + + For example 2e-3 is stored with exp = -4 and + bits[0] = 0x0000 + bits[1] = 0x0000 + bits[2] = 0x4fde + bits[3] = 0x978d + bits[4] = 0x126e + bits[5] = 0x0083 + with low = &bits[2], high = &bits[5], and leader = &bits[5]. + + This number can be written as + 0x0083126e978d4fde.00000000 * 65536**-4 or + 0x0.0083126e978d4fde * 65536**0 or + 0x0.83126e978d4fde * 2**-8 = 2e-3 + + Note that low points to the 65536**0 littlenum (bits[2]) and + leader points to the most significant non-zero littlenum + (bits[5]). + + TMS320C3X floating point numbers are a bit of a strange beast. + The 32-bit flavour has the 8 MSBs representing the exponent in + twos complement format (-128 to +127). There is then a sign bit + followed by 23 bits of mantissa. The mantissa is expressed in + twos complement format with the binary point after the most + significant non sign bit. The bit after the binary point is + suppressed since it is the complement of the sign bit. The + effective mantissa is thus 24 bits. Zero is represented by an + exponent of -128. + + The 16-bit flavour has the 4 MSBs representing the exponent in + twos complement format (-8 to +7). There is then a sign bit + followed by 11 bits of mantissa. The mantissa is expressed in + twos complement format with the binary point after the most + significant non sign bit. The bit after the binary point is + suppressed since it is the complement of the sign bit. The + effective mantissa is thus 12 bits. Zero is represented by an + exponent of -8. For example, + + number norm mant m x e s i fraction f + +0.500 => 1.00000000000 -1 -1 0 1 .00000000000 (1 + 0) * 2^(-1) + +0.999 => 1.11111111111 -1 -1 0 1 .11111111111 (1 + 0.99) * 2^(-1) + +1.000 => 1.00000000000 0 0 0 1 .00000000000 (1 + 0) * 2^(0) + +1.500 => 1.10000000000 0 0 0 1 .10000000000 (1 + 0.5) * 2^(0) + +1.999 => 1.11111111111 0 0 0 1 .11111111111 (1 + 0.9) * 2^(0) + +2.000 => 1.00000000000 1 1 0 1 .00000000000 (1 + 0) * 2^(1) + +4.000 => 1.00000000000 2 2 0 1 .00000000000 (1 + 0) * 2^(2) + -0.500 => 1.00000000000 -1 -1 1 0 .10000000000 (-2 + 0) * 2^(-2) + -1.000 => 1.00000000000 0 -1 1 0 .00000000000 (-2 + 0) * 2^(-1) + -1.500 => 1.10000000000 0 0 1 0 .10000000000 (-2 + 0.5) * 2^(0) + -1.999 => 1.11111111111 0 0 1 0 .00000000001 (-2 + 0.11) * 2^(0) + -2.000 => 1.00000000000 1 1 1 0 .00000000000 (-2 + 0) * 2^(0) + -4.000 => 1.00000000000 2 1 1 0 .00000000000 (-2 + 0) * 2^(1) + + where e is the exponent, s is the sign bit, i is the implied bit, + and f is the fraction stored in the mantissa field. + + num = (1 + f) * 2^x = m * 2^e if s = 0 + num = (-2 + f) * 2^x = -m * 2^e if s = 1 + where 0 <= f < 1.0 and 1.0 <= m < 2.0 + + The fraction (f) and exponent (e) fields for the TMS320C3X format + can be derived from the normalised mantissa (m) and exponent (x) using: + + f = m - 1, e = x if s = 0 + f = 2 - m, e = x if s = 1 and m != 1.0 + f = 0, e = x - 1 if s = 1 and m = 1.0 + f = 0, e = -8 if m = 0 + + + OK, the other issue we have to consider is rounding since the + mantissa has a much higher potential precision than what we can + represent. To do this we add half the smallest storable fraction. + We then have to renormalise the number to allow for overflow. + + To convert a generic flonum into a TMS320C3X floating point + number, here's what we try to do.... + + The first thing is to generate a normalised mantissa (m) where + 1.0 <= m < 2 and to convert the exponent from base 16 to base 2. + We desire the binary point to be placed after the most significant + non zero bit. This process is done in two steps: firstly, the + littlenum with the most significant non zero bit is located (this + is done for us since leader points to this littlenum) and the + binary point (which is currently after the LSB of the littlenum + pointed to by low) is moved to before the MSB of the littlenum + pointed to by leader. This requires the exponent to be adjusted + by leader - low + 1. In the earlier example, the new exponent is + thus -4 + (5 - 2 + 1) = 0 (base 65536). We now need to convert + the exponent to base 2 by multiplying the exponent by 16 (log2 + 65536). The exponent base 2 is thus also zero. + + The second step is to hunt for the most significant non zero bit + in the leader littlenum. We do this by left shifting a copy of + the leader littlenum until bit 16 is set (0x10000) and counting + the number of shifts, S, required. The number of shifts then has to + be added to correct the exponent (base 2). For our example, this + will require 9 shifts and thus our normalised exponent (base 2) is + 0 + 9 = 9. Note that the worst case scenario is when the leader + littlenum is 1, thus requiring 16 shifts. + + We now have to left shift the other littlenums by the same amount, + propagating the shifted bits into the more significant littlenums. + To save a lot of unecessary shifting we only have to consider + two or three littlenums, since the greatest number of mantissa + bits required is 24 + 1 rounding bit. While two littlenums + provide 32 bits of precision, the most significant littlenum + may only contain a single significant bit and thus an extra + littlenum is required. + + Denoting the number of bits in the fraction field as F, we require + G = F + 2 bits (one extra bit is for rounding, the other gets + suppressed). Say we required S shifts to find the most + significant bit in the leader littlenum, the number of left shifts + required to move this bit into bit position G - 1 is L = G + S - 17. + Note that this shift count may be negative for the short floating + point flavour (where F = 11 and thus G = 13 and potentially S < 3). + If L > 0 we have to shunt the next littlenum into position. Bit + 15 (the MSB) of the next littlenum needs to get moved into position + L - 1 (If L > 15 we need all the bits of this littlenum and + some more from the next one.). We subtract 16 from L and use this + as the left shift count; the resultant value we or with the + previous result. If L > 0, we repeat this operation. */ + + if (precision != S_PRECISION) + words[1] = 0x0000; + + /* 0.0e0 seen. */ + if (flonum.low > flonum.leader) + { + words[0] = 0x8000; + return return_value; + } + + /* NaN: We can't do much... */ + if (flonum.sign == 0) + { + as_bad ("Nan, using zero."); + words[0] = 0x8000; + return return_value; + } + else if (flonum.sign == 'P') + { + /* +INF: Replace with maximum float. */ + if (precision == S_PRECISION) + words[0] = 0x77ff; + else + { + words[0] = 0x7f7f; + words[1] = 0xffff; + } + return return_value; + } + else if (flonum.sign == 'N') + { + /* -INF: Replace with maximum float. */ + if (precision == S_PRECISION) + words[0] = 0x7800; + else + words[0] = 0x7f80; + return return_value; + } + + exponent = (flonum.exponent + flonum.leader - flonum.low + 1) * 16; + + if (!(tmp = *flonum.leader)) + abort (); /* Hmmm. */ + shift = 0; /* Find position of first sig. bit. */ + while (tmp >>= 1) + shift++; + exponent -= (16 - shift); /* Adjust exponent. */ + + if (precision == S_PRECISION) /* Allow 1 rounding bit. */ + { + exponent_bits = 4; + mantissa_bits = 12; /* Include suppr. bit but not rounding bit. */ + } + else + { + exponent_bits = 8; + mantissa_bits = 24; + } + + shift = mantissa_bits - shift; + + smant = 0; + for (p = flonum.leader; p >= flonum.low && shift > -16; p--) + { + tmp = shift >= 0 ? *p << shift : *p >> -shift; + smant |= tmp; + shift -= 16; + } + + /* OK, we've got our scaled mantissa so let's round it up + and drop the rounding bit. */ + smant++; + smant >>= 1; + + /* The number may be unnormalised so renormalise it... */ + if (smant >> mantissa_bits) + { + smant >>= 1; + exponent++; + } + + /* The binary point is now between bit positions 11 and 10 or 23 and 22, + i.e., between mantissa_bits - 1 and mantissa_bits - 2 and the + bit at mantissa_bits - 1 should be set. */ + if (!(smant >> (mantissa_bits - 1))) + abort (); /* Ooops. */ + + sone = (1 << (mantissa_bits - 1)); + if (flonum.sign == '+') + sfract = smant - sone; /* smant - 1.0. */ + else + { + /* This seems to work. */ + if (smant == sone) + { + exponent--; + sfract = 0; + } + else + sfract = (sone << 1) - smant; /* 2.0 - smant. */ + sfract |= sone; /* Insert sign bit. */ + } + + if (abs (exponent) >= (1 << (exponent_bits - 1))) + as_bad ("Cannot represent exponent in %d bits", exponent_bits); + + /* Force exponent to fit in desired field width. */ + exponent &= (1 << (exponent_bits)) - 1; + sfract |= exponent << mantissa_bits; + + if (precision == S_PRECISION) + words[0] = sfract; + else + { + words[0] = sfract >> 16; + words[1] = sfract & 0xffff; + } + + return return_value; +} + +/* Returns pointer past text consumed. */ +char * +c4x_atof (char *str, char what_kind, LITTLENUM_TYPE *words) +{ + /* Extra bits for zeroed low-order bits. The 1st MAX_PRECISION are + zeroed, the last contain flonum bits. */ + static LITTLENUM_TYPE bits[MAX_PRECISION + MAX_PRECISION + GUARD]; + char *return_value; + /* Number of 16-bit words in the format. */ + int precision; + FLONUM_TYPE save_gen_flonum; + + /* We have to save the generic_floating_point_number because it + contains storage allocation about the array of LITTLENUMs where + the value is actually stored. We will allocate our own array of + littlenums below, but have to restore the global one on exit. */ + save_gen_flonum = generic_floating_point_number; + + return_value = str; + generic_floating_point_number.low = bits + MAX_PRECISION; + generic_floating_point_number.high = NULL; + generic_floating_point_number.leader = NULL; + generic_floating_point_number.exponent = 0; + generic_floating_point_number.sign = '\0'; + + /* Use more LittleNums than seems necessary: the highest flonum may + have 15 leading 0 bits, so could be useless. */ + + memset (bits, '\0', sizeof (LITTLENUM_TYPE) * MAX_PRECISION); + + switch (what_kind) + { + case 's': + case 'S': + precision = S_PRECISION; + break; + + case 'd': + case 'D': + case 'f': + case 'F': + precision = F_PRECISION; + break; + + default: + as_bad ("Invalid floating point number"); + return (NULL); + } + + generic_floating_point_number.high + = generic_floating_point_number.low + precision - 1 + GUARD; + + if (atof_generic (&return_value, ".", EXP_CHARS, + &generic_floating_point_number)) + { + as_bad ("Invalid floating point number"); + return (NULL); + } + + c4x_gen_to_words (generic_floating_point_number, + words, precision); + + /* Restore the generic_floating_point_number's storage alloc (and + everything else). */ + generic_floating_point_number = save_gen_flonum; + + return return_value; +} + +static void +c4x_insert_reg (char *regname, int regnum) +{ + char buf[32]; + int i; + + symbol_table_insert (symbol_new (regname, reg_section, (valueT) regnum, + &zero_address_frag)); + for (i = 0; regname[i]; i++) + buf[i] = islower (regname[i]) ? toupper (regname[i]) : regname[i]; + buf[i] = '\0'; + + symbol_table_insert (symbol_new (buf, reg_section, (valueT) regnum, + &zero_address_frag)); +} + +static void +c4x_insert_sym (char *symname, int value) +{ + symbolS *symbolP; + + symbolP = symbol_new (symname, absolute_section, + (valueT) value, &zero_address_frag); + SF_SET_LOCAL (symbolP); + symbol_table_insert (symbolP); +} + +static char * +c4x_expression (char *str, expressionS *exp) +{ + char *s; + char *t; + + t = input_line_pointer; /* Save line pointer. */ + input_line_pointer = str; + expression (exp); + s = input_line_pointer; + input_line_pointer = t; /* Restore line pointer. */ + return s; /* Return pointer to where parsing stopped. */ +} + +static char * +c4x_expression_abs (char *str, int *value) +{ + char *s; + char *t; + + t = input_line_pointer; /* Save line pointer. */ + input_line_pointer = str; + *value = get_absolute_expression (); + s = input_line_pointer; + input_line_pointer = t; /* Restore line pointer. */ + return s; +} + +static void +c4x_emit_char (char c) +{ + expressionS exp; + + exp.X_op = O_constant; + exp.X_add_number = c; + emit_expr (&exp, 4); +} + +static void +c4x_seg_alloc (char *name, segT seg, int size, symbolS *symbolP) +{ + /* Note that the size is in words + so we multiply it by 4 to get the number of bytes to allocate. */ + + /* If we have symbol: .usect ".fred", size etc., + the symbol needs to point to the first location reserved + by the pseudo op. */ + + if (size) + { + char *p; + + p = frag_var (rs_fill, 1, 1, (relax_substateT) 0, + (symbolS *) symbolP, + size * OCTETS_PER_BYTE, (char *) 0); + *p = 0; + } +} + +/* .asg ["]character-string["], symbol */ +static void +c4x_asg (int x) +{ + char c; + char *name; + char *str; + char *tmp; + + SKIP_WHITESPACE (); + str = input_line_pointer; + + /* Skip string expression. */ + while (*input_line_pointer != ',' && *input_line_pointer) + input_line_pointer++; + if (*input_line_pointer != ',') + { + as_bad ("Comma expected\n"); + return; + } + *input_line_pointer++ = '\0'; + name = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + tmp = xmalloc (strlen (str) + 1); + strcpy (tmp, str); + str = tmp; + tmp = xmalloc (strlen (name) + 1); + strcpy (tmp, name); + name = tmp; + if (hash_find (c4x_asg_hash, name)) + hash_replace (c4x_asg_hash, name, (PTR) str); + else + hash_insert (c4x_asg_hash, name, (PTR) str); + *input_line_pointer = c; + demand_empty_rest_of_line (); +} + +/* .bss symbol, size */ +static void +c4x_bss (int x) +{ + char c; + char *name; + char *p; + int size; + segT current_seg; + subsegT current_subseg; + symbolS *symbolP; + + current_seg = now_seg; /* Save current seg. */ + current_subseg = now_subseg; /* Save current subseg. */ + + SKIP_WHITESPACE (); + name = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + if (c != ',') + { + as_bad (".bss size argument missing\n"); + return; + } + + input_line_pointer = + c4x_expression_abs (++input_line_pointer, &size); + if (size < 0) + { + as_bad (".bss size %d < 0!", size); + return; + } + subseg_set (bss_section, 0); + symbolP = symbol_find_or_make (name); + + if (S_GET_SEGMENT (symbolP) == bss_section) + symbol_get_frag (symbolP)->fr_symbol = 0; + + symbol_set_frag (symbolP, frag_now); + + p = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, + size * OCTETS_PER_BYTE, (char *) 0); + *p = 0; /* Fill char. */ + + S_SET_SEGMENT (symbolP, bss_section); + + /* The symbol may already have been created with a preceding + ".globl" directive -- be careful not to step on storage class + in that case. Otherwise, set it to static. */ + if (S_GET_STORAGE_CLASS (symbolP) != C_EXT) + S_SET_STORAGE_CLASS (symbolP, C_STAT); + + subseg_set (current_seg, current_subseg); /* Restore current seg. */ + demand_empty_rest_of_line (); +} + +void +c4x_globl (int ignore) +{ + char *name; + int c; + symbolS *symbolP; + + do + { + name = input_line_pointer; + c = get_symbol_end (); + symbolP = symbol_find_or_make (name); + *input_line_pointer = c; + SKIP_WHITESPACE (); + S_SET_STORAGE_CLASS (symbolP, C_EXT); + if (c == ',') + { + input_line_pointer++; + SKIP_WHITESPACE (); + if (*input_line_pointer == '\n') + c = '\n'; + } + } + while (c == ','); + + demand_empty_rest_of_line (); +} + +/* Handle .byte, .word. .int, .long */ +static void +c4x_cons (int bytes) +{ + register unsigned int c; + do + { + SKIP_WHITESPACE (); + if (*input_line_pointer == '"') + { + input_line_pointer++; + while (is_a_char (c = next_char_of_string ())) + c4x_emit_char (c); + know (input_line_pointer[-1] == '\"'); + } + else + { + expressionS exp; + + input_line_pointer = c4x_expression (input_line_pointer, &exp); + if (exp.X_op == O_constant) + { + switch (bytes) + { + case 1: + exp.X_add_number &= 255; + break; + case 2: + exp.X_add_number &= 65535; + break; + } + } + /* Perhaps we should disallow .byte and .hword with + a non constant expression that will require relocation. */ + emit_expr (&exp, 4); + } + } + while (*input_line_pointer++ == ','); + + input_line_pointer--; /* Put terminator back into stream. */ + demand_empty_rest_of_line (); +} + +/* .eval expression, symbol */ +static void +c4x_eval (int x) +{ + char c; + int value; + char *name; + + SKIP_WHITESPACE (); + input_line_pointer = + c4x_expression_abs (input_line_pointer, &value); + if (*input_line_pointer++ != ',') + { + as_bad ("Symbol missing\n"); + return; + } + name = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + demand_empty_rest_of_line (); + c4x_insert_sym (name, value); +} + +/* Reset local labels. */ +static void +c4x_newblock (int x) +{ + dollar_label_clear (); +} + +/* .sect "section-name" [, value] */ +/* .sect ["]section-name[:subsection-name]["] [, value] */ +static void +c4x_sect (int x) +{ + char c; + char *section_name; + char *subsection_name; + char *name; + segT seg; + int num; + + SKIP_WHITESPACE (); + 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); + + /* TI C from version 5.0 allows a section name to contain a + subsection name as well. The subsection name is separated by a + ':' from the section name. Currently we scan the subsection + name and discard it. + Volker Kuhlmann <v.kuhlmann@elec.canterbury.ac.nz>. */ + if (c == ':') + { + subsection_name = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + input_line_pointer++; /* Skip null symbol terminator. */ + as_warn (".sect: subsection name ignored"); + } + + /* We might still have a '"' to discard, but the character after a + symbol name will be overwritten with a \0 by get_symbol_end() + [VK]. */ + + if (c == ',') + input_line_pointer = + c4x_expression_abs (input_line_pointer, &num); + else if (*input_line_pointer == ',') + { + input_line_pointer = + c4x_expression_abs (++input_line_pointer, &num); + } + else + num = 0; + + seg = subseg_new (name, num); + if (line_label != NULL) + { + S_SET_SEGMENT (line_label, seg); + symbol_set_frag (line_label, frag_now); + } + + if (bfd_get_section_flags (stdoutput, seg) == SEC_NO_FLAGS) + { + if (!bfd_set_section_flags (stdoutput, seg, SEC_DATA)) + as_warn ("Error setting flags for \"%s\": %s", name, + bfd_errmsg (bfd_get_error ())); + } + + /* If the last character overwritten by get_symbol_end() was an + end-of-line, we must restore it or the end of the line will not be + recognised and scanning extends into the next line, stopping with + an error (blame Volker Kuhlmann <v.kuhlmann@elec.canterbury.ac.nz> + if this is not true). */ + if (is_end_of_line[(unsigned char) c]) + *(--input_line_pointer) = c; + + demand_empty_rest_of_line (); +} + +/* symbol[:] .set value or .set symbol, value */ +static void +c4x_set (int x) +{ + symbolS *symbolP; + + SKIP_WHITESPACE (); + if ((symbolP = line_label) == NULL) + { + char c; + char *name; + + name = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + if (c != ',') + { + as_bad (".set syntax invalid\n"); + ignore_rest_of_line (); + return; + } + symbolP = symbol_find_or_make (name); + } + else + symbol_table_insert (symbolP); + + pseudo_set (symbolP); + demand_empty_rest_of_line (); +} + +/* [symbol] .usect ["]section-name["], size-in-words [, alignment-flag] */ +static void +c4x_usect (int x) +{ + char c; + char *name; + char *section_name; + segT seg; + int size, alignment_flag; + segT current_seg; + subsegT current_subseg; + + current_seg = now_seg; /* save current seg. */ + current_subseg = now_subseg; /* save current subseg. */ + + SKIP_WHITESPACE (); + 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 (c == ',') + input_line_pointer = + c4x_expression_abs (input_line_pointer, &size); + else if (*input_line_pointer == ',') + { + input_line_pointer = + c4x_expression_abs (++input_line_pointer, &size); + } + else + size = 0; + + /* Read a possibly present third argument (alignment flag) [VK]. */ + if (*input_line_pointer == ',') + { + input_line_pointer = + c4x_expression_abs (++input_line_pointer, &alignment_flag); + } + else + alignment_flag = 0; + if (alignment_flag) + as_warn (".usect: non-zero alignment flag ignored"); + + seg = subseg_new (name, 0); + if (line_label != NULL) + { + S_SET_SEGMENT (line_label, seg); + symbol_set_frag (line_label, frag_now); + S_SET_VALUE (line_label, frag_now_fix ()); + } + seg_info (seg)->bss = 1; /* Uninitialised data. */ + if (!bfd_set_section_flags (stdoutput, seg, SEC_ALLOC)) + as_warn ("Error setting flags for \"%s\": %s", name, + bfd_errmsg (bfd_get_error ())); + c4x_seg_alloc (name, seg, size, line_label); + + if (S_GET_STORAGE_CLASS (line_label) != C_EXT) + S_SET_STORAGE_CLASS (line_label, C_STAT); + + subseg_set (current_seg, current_subseg); /* Restore current seg. */ + demand_empty_rest_of_line (); +} + +/* .version cpu-version. */ +static void +c4x_version (int x) +{ + unsigned int temp; + + input_line_pointer = + c4x_expression_abs (input_line_pointer, &temp); + if (!IS_CPU_C3X (temp) && !IS_CPU_C4X (temp)) + as_bad ("This assembler does not support processor generation %d\n", + temp); + + if (c4x_cpu && temp != c4x_cpu) + as_warn ("Changing processor generation on fly not supported...\n"); + c4x_cpu = temp; + demand_empty_rest_of_line (); +} + +static void +c4x_pseudo_ignore (int x) +{ + /* We could print warning message here... */ + + /* Ignore everything until end of line. */ + while (!is_end_of_line[(unsigned char) *input_line_pointer++]); +} + +static void +c4x_init_regtable (void) +{ + unsigned int i; + + for (i = 0; i < c3x_num_registers; i++) + c4x_insert_reg (c3x_registers[i].name, + c3x_registers[i].regno); + + if (IS_CPU_C4X (c4x_cpu)) + { + /* Add additional C4x registers, overriding some C3x ones. */ + for (i = 0; i < c4x_num_registers; i++) + c4x_insert_reg (c4x_registers[i].name, + c4x_registers[i].regno); + } +} + +static void +c4x_init_symbols (void) +{ + /* The TI tools accept case insensitive versions of these symbols, + we don't ! + + For TI C/Asm 5.0 + + .TMS320xx 30,31,32,40,or 44 set according to -v flag + .C3X or .C3x 1 or 0 1 if -v30,-v31,or -v32 + .C30 1 or 0 1 if -v30 + .C31 1 or 0 1 if -v31 + .C32 1 or 0 1 if -v32 + .C4X or .C4x 1 or 0 1 if -v40, or -v44 + .C40 1 or 0 1 if -v40 + .C44 1 or 0 1 if -v44 + + .REGPARM 1 or 0 1 if -mr option used + .BIGMODEL 1 or 0 1 if -mb option used + + These symbols are currently supported but will be removed in a + later version: + .TMS320C30 1 or 0 1 if -v30,-v31,or -v32 + .TMS320C31 1 or 0 1 if -v31 + .TMS320C32 1 or 0 1 if -v32 + .TMS320C40 1 or 0 1 if -v40, or -v44 + .TMS320C44 1 or 0 1 if -v44 + + Source: TI: TMS320C3x/C4x Assembly Language Tools User's Guide, + 1997, SPRU035C, p. 3-17/3-18. */ + c4x_insert_sym (".REGPARM", c4x_reg_args); + c4x_insert_sym (".MEMPARM", !c4x_reg_args); + c4x_insert_sym (".BIGMODEL", c4x_big_model); + c4x_insert_sym (".C30INTERRUPT", 0); + c4x_insert_sym (".TMS320xx", c4x_cpu == 0 ? 40 : c4x_cpu); + c4x_insert_sym (".C3X", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32); + c4x_insert_sym (".C3x", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32); + c4x_insert_sym (".C4X", c4x_cpu == 0 || c4x_cpu == 40 || c4x_cpu == 44); + c4x_insert_sym (".C4x", c4x_cpu == 0 || c4x_cpu == 40 || c4x_cpu == 44); + /* Do we need to have the following symbols also in lower case? */ + c4x_insert_sym (".TMS320C30", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32); + c4x_insert_sym (".tms320C30", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32); + c4x_insert_sym (".TMS320C31", c4x_cpu == 31); + c4x_insert_sym (".tms320C31", c4x_cpu == 31); + c4x_insert_sym (".TMS320C32", c4x_cpu == 32); + c4x_insert_sym (".tms320C32", c4x_cpu == 32); + c4x_insert_sym (".TMS320C40", c4x_cpu == 40 || c4x_cpu == 44 || c4x_cpu == 0); + c4x_insert_sym (".tms320C40", c4x_cpu == 40 || c4x_cpu == 44 || c4x_cpu == 0); + c4x_insert_sym (".TMS320C44", c4x_cpu == 44); + c4x_insert_sym (".tms320C44", c4x_cpu == 44); + c4x_insert_sym (".TMX320C40", 0); /* C40 first pass silicon ? */ + c4x_insert_sym (".tmx320C40", 0); +} + +/* Insert a new instruction template into hash table. */ +static int +c4x_inst_insert (c4x_inst_t *inst) +{ + static char prev_name[16]; + const char *retval = NULL; + + /* Only insert the first name if have several similar entries. */ + if (!strcmp (inst->name, prev_name) || inst->name[0] == '\0') + return 1; + + retval = hash_insert (c4x_op_hash, inst->name, (PTR) inst); + if (retval != NULL) + fprintf (stderr, "internal error: can't hash `%s': %s\n", + inst->name, retval); + else + strcpy (prev_name, inst->name); + return retval == NULL; +} + +/* Make a new instruction template. */ +static c4x_inst_t * +c4x_inst_make (char *name, unsigned long opcode, char *args) +{ + static c4x_inst_t *insts = NULL; + static char *names = NULL; + static int index = 0; + + if (insts == NULL) + { + /* Allocate memory to store name strings. */ + names = (char *) xmalloc (sizeof (char) * 8192); + /* Allocate memory for additional insts. */ + insts = (c4x_inst_t *) + xmalloc (sizeof (c4x_inst_t) * 1024); + } + insts[index].name = names; + insts[index].opcode = opcode; + insts[index].opmask = 0xffffffff; + insts[index].args = args; + index++; + + do + *names++ = *name++; + while (*name); + *names++ = '\0'; + + return &insts[index - 1]; +} + +/* Add instruction template, creating dynamic templates as required. */ +static int +c4x_inst_add (c4x_inst_t *insts) +{ + char *s = insts->name; + char *d; + unsigned int i; + int ok = 1; + char name[16]; + + d = name; + + while (1) + { + switch (*s) + { + case 'B': + case 'C': + /* Dynamically create all the conditional insts. */ + for (i = 0; i < num_conds; i++) + { + c4x_inst_t *inst; + int k = 0; + char *c = c4x_conds[i].name; + char *e = d; + + while (*c) + *e++ = *c++; + c = s + 1; + while (*c) + *e++ = *c++; + *e = '\0'; + + /* If instruction found then have already processed it. */ + if (hash_find (c4x_op_hash, name)) + return 1; + + do + { + inst = c4x_inst_make (name, insts[k].opcode + + (c4x_conds[i].cond << + (*s == 'B' ? 16 : 23)), + insts[k].args); + if (k == 0) /* Save strcmp() with following func. */ + ok &= c4x_inst_insert (inst); + k++; + } + while (!strcmp (insts->name, + insts[k].name)); + } + return ok; + break; + + case '\0': + return c4x_inst_insert (insts); + break; + + default: + *d++ = *s++; + break; + } + } +} + +/* This function is called once, at assembler startup time. It should + set up all the tables, etc., that the MD part of the assembler will + need. */ +void +md_begin (void) +{ + int ok = 1; + unsigned int i; + + /* Create hash table for mnemonics. */ + c4x_op_hash = hash_new (); + + /* Create hash table for asg pseudo. */ + c4x_asg_hash = hash_new (); + + /* Add mnemonics to hash table, expanding conditional mnemonics on fly. */ + for (i = 0; i < c3x_num_insts; i++) + ok &= c4x_inst_add ((void *) &c3x_insts[i]); + + if (IS_CPU_C4X (c4x_cpu)) + { + for (i = 0; i < c4x_num_insts; i++) + ok &= c4x_inst_add ((void *) &c4x_insts[i]); + } + + /* Create dummy inst to avoid errors accessing end of table. */ + c4x_inst_make ("", 0, ""); + + if (!ok) + as_fatal ("Broken assembler. No assembly attempted."); + + /* Add registers to symbol table. */ + c4x_init_regtable (); + + /* Add predefined symbols to symbol table. */ + c4x_init_symbols (); +} + +void +c4x_end (void) +{ + bfd_set_arch_mach (stdoutput, bfd_arch_tic4x, + IS_CPU_C4X (c4x_cpu) ? bfd_mach_c4x : bfd_mach_c3x); +} + +static int +c4x_indirect_parse (c4x_operand_t *operand, + const c4x_indirect_t *indirect) +{ + char *n = indirect->name; + char *s = input_line_pointer; + char *b; + symbolS *symbolP; + char name[32]; + + operand->disp = 0; + for (; *n; n++) + { + switch (*n) + { + case 'a': /* Need to match aux register. */ + b = name; +#ifdef C4X_ALT_SYNTAX + if (*s == '%') + s++; +#endif + while (isalnum (*s)) + *b++ = *s++; + *b++ = '\0'; + if (!(symbolP = symbol_find (name))) + return 0; + + if (S_GET_SEGMENT (symbolP) != reg_section) + return 0; + + operand->aregno = S_GET_VALUE (symbolP); + if (operand->aregno >= REG_AR0 && operand->aregno <= REG_AR7) + break; + + as_bad ("Auxiliary register AR0--AR7 required for indirect"); + return -1; + + case 'd': /* Need to match constant for disp. */ +#ifdef C4X_ALT_SYNTAX + if (*s == '%') /* expr() will die if we don't skip this. */ + s++; +#endif + s = c4x_expression (s, &operand->expr); + if (operand->expr.X_op != O_constant) + return 0; + operand->disp = operand->expr.X_add_number; + if (operand->disp < 0 || operand->disp > 255) + { + as_bad ("Bad displacement %d (require 0--255)\n", + operand->disp); + return -1; + } + break; + + case 'y': /* Need to match IR0. */ + case 'z': /* Need to match IR1. */ +#ifdef C4X_ALT_SYNTAX + if (*s == '%') + s++; +#endif + s = c4x_expression (s, &operand->expr); + if (operand->expr.X_op != O_register) + return 0; + if (operand->expr.X_add_number != REG_IR0 + && operand->expr.X_add_number != REG_IR1) + { + as_bad ("Index register IR0,IR1 required for displacement"); + return -1; + } + + if (*n == 'y' && operand->expr.X_add_number == REG_IR0) + break; + if (*n == 'z' && operand->expr.X_add_number == REG_IR1) + break; + return 0; + + case '(': + if (*s != '(') /* No displacement, assume to be 1. */ + { + operand->disp = 1; + while (*n != ')') + n++; + } + else + s++; + break; + + default: + if (tolower (*s) != *n) + return 0; + s++; + } + } + if (*s != ' ' && *s != ',' && *s != '\0') + return 0; + input_line_pointer = s; + return 1; +} + +char * +c4x_operand_parse (char *s, c4x_operand_t *operand) +{ + unsigned int i; + char c; + int ret; + expressionS *exp = &operand->expr; + char *save = input_line_pointer; + char *str; + char *new; + struct hash_entry *entry = NULL; + + input_line_pointer = s; + SKIP_WHITESPACE (); + + str = input_line_pointer; + c = get_symbol_end (); /* Get terminator. */ + new = input_line_pointer; + if (strlen (str) && (entry = hash_find (c4x_asg_hash, str)) != NULL) + { + *input_line_pointer = c; + input_line_pointer = (char *) entry; + } + else + { + *input_line_pointer = c; + input_line_pointer = str; + } + + operand->mode = M_UNKNOWN; + switch (*input_line_pointer) + { +#ifdef C4X_ALT_SYNTAX + case '%': + input_line_pointer = c4x_expression (++input_line_pointer, exp); + if (exp->X_op != O_register) + as_bad ("Expecting a register name"); + operand->mode = M_REGISTER; + break; + + case '^': + /* Denotes high 16 bits. */ + input_line_pointer = c4x_expression (++input_line_pointer, exp); + if (exp->X_op == O_constant) + operand->mode = M_IMMED; + else if (exp->X_op == O_big) + { + if (exp->X_add_number) + as_bad ("Number too large"); /* bignum required */ + else + { + c4x_gen_to_words (generic_floating_point_number, + operand->fwords, S_PRECISION); + operand->mode = M_IMMED_F; + } + } + /* Allow ori ^foo, ar0 to be equivalent to ldi .hi.foo, ar0 */ + /* WARNING : The TI C40 assembler cannot do this. */ + else if (exp->X_op == O_symbol) + { + operand->mode = M_HI; + break; + } + + case '#': + input_line_pointer = c4x_expression (++input_line_pointer, exp); + if (exp->X_op == O_constant) + operand->mode = M_IMMED; + else if (exp->X_op == O_big) + { + if (exp->X_add_number > 0) + as_bad ("Number too large"); /* bignum required. */ + else + { + c4x_gen_to_words (generic_floating_point_number, + operand->fwords, S_PRECISION); + operand->mode = M_IMMED_F; + } + } + /* Allow ori foo, ar0 to be equivalent to ldi .lo.foo, ar0 */ + /* WARNING : The TI C40 assembler cannot do this. */ + else if (exp->X_op == O_symbol) + { + operand->mode = M_IMMED; + break; + } + + else + as_bad ("Expecting a constant value"); + break; + case '\\': +#endif + case '@': + input_line_pointer = c4x_expression (++input_line_pointer, exp); + if (exp->X_op != O_constant && exp->X_op != O_symbol) + as_bad ("Bad direct addressing construct %s", s); + if (exp->X_op == O_constant) + { + if (exp->X_add_number < 0) + as_bad ("Direct value of %ld is not suitable", + (long) exp->X_add_number); + } + operand->mode = M_DIRECT; + break; + + case '*': + ret = -1; + for (i = 0; i < num_indirects; i++) + if ((ret = c4x_indirect_parse (operand, &c4x_indirects[i]))) + break; + if (ret < 0) + break; + if (i < num_indirects) + { + operand->mode = M_INDIRECT; + /* Indirect addressing mode number. */ + operand->expr.X_add_number = c4x_indirects[i].modn; + /* Convert *+ARn(0) to *ARn etc. Maybe we should + squeal about silly ones? */ + if (operand->expr.X_add_number < 0x08 && !operand->disp) + operand->expr.X_add_number = 0x18; + } + else + as_bad ("Unknown indirect addressing mode"); + break; + + default: + operand->mode = M_IMMED; /* Assume immediate. */ + str = input_line_pointer; + input_line_pointer = c4x_expression (input_line_pointer, exp); + if (exp->X_op == O_register) + { + know (exp->X_add_symbol == 0); + know (exp->X_op_symbol == 0); + operand->mode = M_REGISTER; + break; + } + else if (exp->X_op == O_big) + { + if (exp->X_add_number > 0) + as_bad ("Number too large"); /* bignum required. */ + else + { + c4x_gen_to_words (generic_floating_point_number, + operand->fwords, S_PRECISION); + operand->mode = M_IMMED_F; + } + break; + } +#ifdef C4X_ALT_SYNTAX + /* Allow ldi foo, ar0 to be equivalent to ldi @foo, ar0. */ + else if (exp->X_op == O_symbol) + { + operand->mode = M_DIRECT; + break; + } +#endif + } + if (entry == NULL) + new = input_line_pointer; + input_line_pointer = save; + return new; +} + +static int +c4x_operands_match (c4x_inst_t *inst, c4x_insn_t *insn) +{ + const char *args = inst->args; + unsigned long opcode = inst->opcode; + int num_operands = insn->num_operands; + c4x_operand_t *operand = insn->operands; + expressionS *exp = &operand->expr; + int ret = 1; + int reg; + + /* Build the opcode, checking as we go to make sure that the + operands match. + + If an operand matches, we modify insn or opcode appropriately, + and do a "continue". If an operand fails to match, we "break". */ + + insn->nchars = 4; /* Instructions always 4 bytes. */ + insn->reloc = NO_RELOC; + insn->pcrel = 0; + + if (*args == '\0') + { + insn->opcode = opcode; + return num_operands == 0; + } + + for (;; ++args) + { + switch (*args) + { + + case '\0': /* End of args. */ + if (num_operands == 1) + { + insn->opcode = opcode; + return ret; + } + break; /* Too many operands. */ + + case '#': /* This is only used for ldp. */ + if (operand->mode != M_DIRECT && operand->mode != M_IMMED) + break; + /* While this looks like a direct addressing mode, we actually + use an immediate mode form of ldiu or ldpk instruction. */ + if (exp->X_op == O_constant) + { + /* Maybe for C3x we should check for 8 bit number. */ + INSERTS (opcode, exp->X_add_number, 15, 0); + continue; + } + else if (exp->X_op == O_symbol) + { + insn->reloc = BFD_RELOC_HI16; + insn->exp = *exp; + continue; + } + break; /* Not direct (dp) addressing. */ + + case '@': /* direct. */ + if (operand->mode != M_DIRECT) + break; + if (exp->X_op == O_constant) + { + /* Store only the 16 LSBs of the number. */ + INSERTS (opcode, exp->X_add_number, 15, 0); + continue; + } + else if (exp->X_op == O_symbol) + { + insn->reloc = BFD_RELOC_LO16; + insn->exp = *exp; + continue; + } + break; /* Not direct addressing. */ + + case 'A': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_AR0 && reg <= REG_AR7) + INSERTU (opcode, reg - REG_AR0, 24, 22); + else + { + as_bad ("Destination register must be ARn"); + ret = -1; + } + continue; + + case 'B': /* Unsigned integer immediate. */ + /* Allow br label or br @label. */ + if (operand->mode != M_IMMED && operand->mode != M_DIRECT) + break; + if (exp->X_op == O_constant) + { + if (exp->X_add_number < (1 << 24)) + { + INSERTU (opcode, exp->X_add_number, 23, 0); + continue; + } + else + { + as_bad ("Immediate value of %ld is too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + if (IS_CPU_C4X (c4x_cpu)) + { + insn->reloc = BFD_RELOC_24_PCREL; + insn->pcrel = 1; + } + else + { + insn->reloc = BFD_RELOC_24; + insn->pcrel = 0; + } + insn->exp = *exp; + continue; + + case 'C': + if (!IS_CPU_C4X (c4x_cpu)) + break; + if (operand->mode != M_INDIRECT) + break; + if (operand->expr.X_add_number != 0 + && operand->expr.X_add_number != 0x18) + { + as_bad ("Invalid indirect addressing mode"); + ret = -1; + continue; + } + INSERTU (opcode, operand->aregno - REG_AR0, 2, 0); + INSERTU (opcode, operand->disp, 7, 3); + continue; + + case 'E': + if (!(operand->mode == M_REGISTER)) + break; + INSERTU (opcode, exp->X_add_number, 7, 0); + continue; + + case 'F': + if (operand->mode != M_IMMED_F + && !(operand->mode == M_IMMED && exp->X_op == O_constant)) + break; + + if (operand->mode != M_IMMED_F) + { + /* OK, we 've got something like cmpf 0, r0 + Why can't they stick in a bloody decimal point ?! */ + char string[16]; + + /* Create floating point number string. */ + sprintf (string, "%d.0", (int) exp->X_add_number); + c4x_atof (string, 's', operand->fwords); + } + + INSERTU (opcode, operand->fwords[0], 15, 0); + continue; + + case 'G': + if (operand->mode != M_REGISTER) + break; + INSERTU (opcode, exp->X_add_number, 15, 8); + continue; + + case 'H': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_R0 && reg <= REG_R7) + INSERTU (opcode, reg - REG_R0, 18, 16); + else + { + as_bad ("Register must be R0--R7"); + ret = -1; + } + continue; + + case 'I': + if (operand->mode != M_INDIRECT) + break; + if (operand->disp != 0 && operand->disp != 1) + { + if (IS_CPU_C4X (c4x_cpu)) + break; + as_bad ("Invalid indirect addressing mode displacement %d", + operand->disp); + ret = -1; + continue; + } + INSERTU (opcode, operand->aregno - REG_AR0, 2, 0); + INSERTU (opcode, operand->expr.X_add_number, 7, 3); + continue; + + case 'J': + if (operand->mode != M_INDIRECT) + break; + if (operand->disp != 0 && operand->disp != 1) + { + if (IS_CPU_C4X (c4x_cpu)) + break; + as_bad ("Invalid indirect addressing mode displacement %d", + operand->disp); + ret = -1; + continue; + } + INSERTU (opcode, operand->aregno - REG_AR0, 10, 8); + INSERTU (opcode, operand->expr.X_add_number, 15, 11); + continue; + + case 'K': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_R0 && reg <= REG_R7) + INSERTU (opcode, reg - REG_R0, 21, 19); + else + { + as_bad ("Register must be R0--R7"); + ret = -1; + } + continue; + + case 'L': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_R0 && reg <= REG_R7) + INSERTU (opcode, reg - REG_R0, 24, 22); + else + { + as_bad ("Register must be R0--R7"); + ret = -1; + } + continue; + + case 'M': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg == REG_R2 || reg == REG_R3) + INSERTU (opcode, reg - REG_R2, 22, 22); + else + { + as_bad ("Destination register must be R2 or R3"); + ret = -1; + } + continue; + + case 'N': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg == REG_R0 || reg == REG_R1) + INSERTU (opcode, reg - REG_R0, 23, 23); + else + { + as_bad ("Destination register must be R0 or R1"); + ret = -1; + } + continue; + + case 'O': + if (!IS_CPU_C4X (c4x_cpu)) + break; + if (operand->mode != M_INDIRECT) + break; + /* Require either *+ARn(disp) or *ARn. */ + if (operand->expr.X_add_number != 0 + && operand->expr.X_add_number != 0x18) + { + as_bad ("Invalid indirect addressing mode"); + ret = -1; + continue; + } + INSERTU (opcode, operand->aregno - REG_AR0, 10, 8); + INSERTU (opcode, operand->disp, 15, 11); + continue; + + case 'P': /* PC relative displacement. */ + /* Allow br label or br @label. */ + if (operand->mode != M_IMMED && operand->mode != M_DIRECT) + break; + if (exp->X_op == O_constant) + { + if (exp->X_add_number >= -32768 && exp->X_add_number <= 32767) + { + INSERTS (opcode, exp->X_add_number, 15, 0); + continue; + } + else + { + as_bad ("Displacement value of %ld is too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + insn->reloc = BFD_RELOC_16_PCREL; + insn->pcrel = 1; + insn->exp = *exp; + continue; + + case 'Q': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + INSERTU (opcode, reg, 15, 0); + continue; + + case 'R': + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + INSERTU (opcode, reg, 20, 16); + continue; + + case 'S': /* Short immediate int. */ + if (operand->mode != M_IMMED && operand->mode != M_HI) + break; + if (exp->X_op == O_big) + { + as_bad ("Floating point number not valid in expression"); + ret = -1; + continue; + } + if (exp->X_op == O_constant) + { + if (exp->X_add_number >= -32768 && exp->X_add_number <= 65535) + { + INSERTS (opcode, exp->X_add_number, 15, 0); + continue; + } + else + { + as_bad ("Signed immediate value %ld too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + else if (exp->X_op == O_symbol) + { + if (operand->mode == M_HI) + { + insn->reloc = BFD_RELOC_HI16; + } + else + { + insn->reloc = BFD_RELOC_LO16; + } + insn->exp = *exp; + continue; + } + /* Handle cases like ldi foo - $, ar0 where foo + is a forward reference. Perhaps we should check + for X_op == O_symbol and disallow things like + ldi foo, ar0. */ + insn->reloc = BFD_RELOC_16; + insn->exp = *exp; + continue; + + case 'T': /* 5-bit immediate value for c4x stik. */ + if (!IS_CPU_C4X (c4x_cpu)) + break; + if (operand->mode != M_IMMED) + break; + if (exp->X_op == O_constant) + { + if (exp->X_add_number < 16 && exp->X_add_number >= -16) + { + INSERTS (opcode, exp->X_add_number, 20, 16); + continue; + } + else + { + as_bad ("Immediate value of %ld is too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + break; /* No relocations allowed. */ + + case 'U': /* Unsigned integer immediate. */ + if (operand->mode != M_IMMED && operand->mode != M_HI) + break; + if (exp->X_op == O_constant) + { + if (exp->X_add_number < (1 << 16) && exp->X_add_number >= 0) + { + INSERTU (opcode, exp->X_add_number, 15, 0); + continue; + } + else + { + as_bad ("Unsigned immediate value %ld too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + else if (exp->X_op == O_symbol) + { + if (operand->mode == M_HI) + insn->reloc = BFD_RELOC_HI16; + else + insn->reloc = BFD_RELOC_LO16; + + insn->exp = *exp; + continue; + } + insn->reloc = BFD_RELOC_16; + insn->exp = *exp; + continue; + + case 'V': /* Trap numbers (immediate field). */ + if (operand->mode != M_IMMED) + break; + if (exp->X_op == O_constant) + { + if (exp->X_add_number < 512 && IS_CPU_C4X (c4x_cpu)) + { + INSERTU (opcode, exp->X_add_number, 8, 0); + continue; + } + else if (exp->X_add_number < 32 && IS_CPU_C3X (c4x_cpu)) + { + INSERTU (opcode, exp->X_add_number | 0x20, 4, 0); + continue; + } + else + { + as_bad ("Immediate value of %ld is too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + break; /* No relocations allowed. */ + + case 'W': /* Short immediate int (0--7). */ + if (!IS_CPU_C4X (c4x_cpu)) + break; + if (operand->mode != M_IMMED) + break; + if (exp->X_op == O_big) + { + as_bad ("Floating point number not valid in expression"); + ret = -1; + continue; + } + if (exp->X_op == O_constant) + { + if (exp->X_add_number >= -256 && exp->X_add_number <= 127) + { + INSERTS (opcode, exp->X_add_number, 7, 0); + continue; + } + else + { + as_bad ("Immediate value %ld too large", + (long) exp->X_add_number); + ret = -1; + continue; + } + } + insn->reloc = BFD_RELOC_16; + insn->exp = *exp; + continue; + + case 'X': /* Expansion register for c4x. */ + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_IVTP && reg <= REG_TVTP) + INSERTU (opcode, reg - REG_IVTP, 4, 0); + else + { + as_bad ("Register must be ivtp or tvtp"); + ret = -1; + } + continue; + + case 'Y': /* Address register for c4x lda. */ + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_AR0 && reg <= REG_SP) + INSERTU (opcode, reg, 20, 16); + else + { + as_bad ("Register must be address register"); + ret = -1; + } + continue; + + case 'Z': /* Expansion register for c4x. */ + if (operand->mode != M_REGISTER) + break; + reg = exp->X_add_number; + if (reg >= REG_IVTP && reg <= REG_TVTP) + INSERTU (opcode, reg - REG_IVTP, 20, 16); + else + { + as_bad ("Register must be ivtp or tvtp"); + ret = -1; + } + continue; + + case '*': + if (operand->mode != M_INDIRECT) + break; + INSERTS (opcode, operand->disp, 7, 0); + INSERTU (opcode, operand->aregno - REG_AR0, 10, 8); + INSERTU (opcode, operand->expr.X_add_number, 15, 11); + continue; + + case '|': /* treat as `,' if have ldi_ldi form. */ + if (insn->parallel) + { + if (--num_operands < 0) + break; /* Too few operands. */ + operand++; + if (operand->mode != M_PARALLEL) + break; + } + /* Fall through. */ + + case ',': /* Another operand. */ + if (--num_operands < 0) + break; /* Too few operands. */ + operand++; + exp = &operand->expr; + continue; + + case ';': /* Another optional operand. */ + if (num_operands == 1 || operand[1].mode == M_PARALLEL) + continue; + if (--num_operands < 0) + break; /* Too few operands. */ + operand++; + exp = &operand->expr; + continue; + + default: + BAD_CASE (*args); + } + return 0; + } +} + +void +c4x_insn_output (c4x_insn_t *insn) +{ + char *dst; + + /* Grab another fragment for opcode. */ + dst = frag_more (insn->nchars); + + /* Put out opcode word as a series of bytes in little endian order. */ + md_number_to_chars (dst, insn->opcode, insn->nchars); + + /* Put out the symbol-dependent stuff. */ + if (insn->reloc != NO_RELOC) + { + /* Where is the offset into the fragment for this instruction. */ + fix_new_exp (frag_now, + dst - frag_now->fr_literal, /* where */ + insn->nchars, /* size */ + &insn->exp, + insn->pcrel, + insn->reloc); + } +} + +/* Parse the operands. */ +int +c4x_operands_parse (char *s, c4x_operand_t *operands, int num_operands) +{ + if (!*s) + return num_operands; + + do + s = c4x_operand_parse (s, &operands[num_operands++]); + while (num_operands < C4X_OPERANDS_MAX && *s++ == ','); + + if (num_operands > C4X_OPERANDS_MAX) + { + as_bad ("Too many operands scanned"); + return -1; + } + return num_operands; +} + +/* Assemble a single instruction. Its label has already been handled + by the generic front end. We just parse mnemonic and operands, and + produce the bytes of data and relocation. */ +void +md_assemble (char *str) +{ + int ok = 0; + char *s; + int i; + int parsed = 0; + c4x_inst_t *inst; /* Instruction template. */ + + if (str && insn->parallel) + { + int star; + + /* Find mnemonic (second part of parallel instruction). */ + s = str; + /* Skip past instruction mnemonic. */ + while (*s && *s != ' ' && *s != '*') + s++; + star = *s == '*'; + if (*s) /* Null terminate for hash_find. */ + *s++ = '\0'; /* and skip past null. */ + strcat (insn->name, "_"); + strncat (insn->name, str, C4X_NAME_MAX - strlen (insn->name)); + + /* Kludge to overcome problems with scrubber removing + space between mnemonic and indirect operand (starting with *) + on second line of parallel instruction. */ + if (star) + *--s = '*'; + + insn->operands[insn->num_operands++].mode = M_PARALLEL; + + if ((i = c4x_operands_parse + (s, insn->operands, insn->num_operands)) < 0) + { + insn->parallel = 0; + insn->in_use = 0; + return; + } + insn->num_operands = i; + parsed = 1; + } + + if (insn->in_use) + { + if ((insn->inst = (struct c4x_inst *) + hash_find (c4x_op_hash, insn->name)) == NULL) + { + as_bad ("Unknown opcode `%s'.", insn->name); + insn->parallel = 0; + insn->in_use = 0; + return; + } + + /* FIXME: The list of templates should be scanned + for the candidates with the desired number of operands. + We shouldn't issue error messages until we have + whittled the list of candidate templates to the most + likely one... We could cache a parsed form of the templates + to reduce the time required to match a template. */ + + inst = insn->inst; + + do + ok = c4x_operands_match (inst, insn); + while (!ok && !strcmp (inst->name, inst[1].name) && inst++); + + if (ok > 0) + c4x_insn_output (insn); + else if (!ok) + as_bad ("Invalid operands for %s", insn->name); + else + as_bad ("Invalid instruction %s", insn->name); + } + + if (str && !parsed) + { + /* Find mnemonic. */ + s = str; + while (*s && *s != ' ') /* Skip past instruction mnemonic. */ + s++; + if (*s) /* Null terminate for hash_find. */ + *s++ = '\0'; /* and skip past null. */ + strncpy (insn->name, str, C4X_NAME_MAX - 3); + + if ((i = c4x_operands_parse (s, insn->operands, 0)) < 0) + { + insn->inst = NULL; /* Flag that error occured. */ + insn->parallel = 0; + insn->in_use = 0; + return; + } + insn->num_operands = i; + insn->in_use = 1; + } + else + insn->in_use = 0; + insn->parallel = 0; +} + +void +c4x_cleanup (void) +{ + if (insn->in_use) + md_assemble (NULL); +} + +/* Turn a string in input_line_pointer into a floating point constant + of type type, and store the appropriate bytes in *litP. The number + of LITTLENUMS emitted is stored in *sizeP. An error message is + returned, or NULL on OK. */ + +char * +md_atof (int type, char *litP, int *sizeP) +{ + int prec; + int ieee; + LITTLENUM_TYPE words[MAX_LITTLENUMS]; + LITTLENUM_TYPE *wordP; + unsigned char *t; + + switch (type) + { + case 's': /* .single */ + case 'S': + ieee = 0; + prec = 1; + break; + + case 'd': /* .double */ + case 'D': + case 'f': /* .float or .single */ + case 'F': + ieee = 0; + prec = 2; /* 1 32-bit word */ + break; + + case 'i': /* .ieee */ + prec = 2; + ieee = 1; + break; + + case 'l': /* .ldouble */ + prec = 4; /* 2 32-bit words */ + ieee = 1; + break; + + default: + *sizeP = 0; + return "Bad call to md_atof()"; + } + + if (ieee) + t = atof_ieee (input_line_pointer, type, words); + else + t = c4x_atof (input_line_pointer, type, words); + if (t) + input_line_pointer = t; + *sizeP = prec * sizeof (LITTLENUM_TYPE); + t = litP; + /* This loops outputs the LITTLENUMs in REVERSE order; in accord with + little endian byte order. */ + for (wordP = words + prec - 1; prec--;) + { + md_number_to_chars (litP, (valueT) (*wordP--), + sizeof (LITTLENUM_TYPE)); + litP += sizeof (LITTLENUM_TYPE); + } + return 0; +} + +void +md_apply_fix3 (fixS *fixP, valueT *value, segT seg ATTRIBUTE_UNUSED) +{ + char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; + valueT val = *value; + + switch (fixP->fx_r_type) + { + case BFD_RELOC_HI16: + val >>= 16; + break; + + case BFD_RELOC_LO16: + val &= 0xffff; + break; + default: + break; + } + + switch (fixP->fx_r_type) + { + case BFD_RELOC_32: + buf[3] = val >> 24; + case BFD_RELOC_24: + case BFD_RELOC_24_PCREL: + buf[2] = val >> 16; + case BFD_RELOC_16: + case BFD_RELOC_16_PCREL: + case BFD_RELOC_LO16: + case BFD_RELOC_HI16: + buf[1] = val >> 8; + buf[0] = val; + break; + + case NO_RELOC: + default: + as_bad ("Bad relocation type: 0x%02x", fixP->fx_r_type); + break; + } + + if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) fixP->fx_done = 1; +} + +/* Should never be called for c4x. */ +void +md_convert_frag (bfd *headers, segT sec, fragS *fragP) +{ + as_fatal ("md_convert_frag"); +} + +/* Should never be called for c4x. */ +void +md_create_short_jump (char *ptr, addressT from_addr, addressT to_addr, + fragS *frag, symbolS *to_symbol) +{ + as_fatal ("md_create_short_jmp\n"); +} + +/* Should never be called for c4x. */ +void +md_create_long_jump (char *ptr, addressT from_addr, addressT to_addr, + fragS *frag, symbolS *to_symbol) +{ + as_fatal ("md_create_long_jump\n"); +} + +/* Should never be called for c4x. */ +int +md_estimate_size_before_relax (register fragS *fragP, segT segtype) +{ + as_fatal ("md_estimate_size_before_relax\n"); + return 0; +} + +CONST char *md_shortopts = "bm:prs"; +struct option md_longopts[] = +{ + {NULL, no_argument, NULL, 0} +}; + +size_t md_longopts_size = sizeof (md_longopts); + +int +md_parse_option (int c, char *arg) +{ + switch (c) + { + case 'b': /* big model */ + c4x_big_model = 1; + break; + case 'm': /* -m[c][34]x */ + if (tolower (*arg) == 'c') + arg++; + c4x_cpu = atoi (arg); + if (!IS_CPU_C3X (c4x_cpu) && !IS_CPU_C4X (c4x_cpu)) + as_warn ("Unsupported processor generation %d\n", c4x_cpu); + break; + case 'p': /* push args */ + c4x_reg_args = 0; + break; + case 'r': /* register args */ + c4x_reg_args = 1; + break; + case 's': /* small model */ + c4x_big_model = 0; + break; + default: + return 0; + } + + return 1; +} + +void +md_show_usage (FILE *stream) +{ + fputs ("\ +C[34]x options:\n\ +-m30 | -m31 | -m32 | -m40 | -m44\n\ + specify variant of architecture\n\ +-b big memory model\n\ +-p pass arguments on stack\n\ +-r pass arguments in registers (default)\n\ +-s small memory model (default)\n", + stream); +} + +/* This is called when a line is unrecognized. This is used to handle + definitions of TI C3x tools style local labels $n where n is a single + decimal digit. */ +int +c4x_unrecognized_line (int c) +{ + int lab; + char *s; + + if (c != '$' || !isdigit (input_line_pointer[0])) + return 0; + + s = input_line_pointer; + + /* Let's allow multiple digit local labels. */ + lab = 0; + while (isdigit (*s)) + { + lab = lab * 10 + *s - '0'; + s++; + } + + if (dollar_label_defined (lab)) + { + as_bad ("Label \"$%d\" redefined", lab); + return 0; + } + + define_dollar_label (lab); + colon (dollar_label_name (lab, 0)); + input_line_pointer = s + 1; + + return 1; +} + +/* Handle local labels peculiar to us referred to in an expression. */ +symbolS * +md_undefined_symbol (char *name) +{ + /* Look for local labels of the form $n. */ + if (name[0] == '$' && isdigit (name[1])) + { + symbolS *symbolP; + char *s = name + 1; + int lab = 0; + + while (isdigit ((unsigned char) *s)) + { + lab = lab * 10 + *s - '0'; + s++; + } + if (dollar_label_defined (lab)) + { + name = dollar_label_name (lab, 0); + symbolP = symbol_find (name); + } + else + { + name = dollar_label_name (lab, 1); + symbolP = symbol_find_or_make (name); + } + + return symbolP; + } + return NULL; +} + +/* Parse an operand that is machine-specific. */ +void +md_operand (expressionS *expressionP) +{ +} + +/* Round up a section size to the appropriate boundary---do we need this? */ +valueT +md_section_align (segT segment, valueT size) +{ + return size; /* Byte (i.e., 32-bit) alignment is fine? */ +} + +static int +c4x_pc_offset (unsigned int op) +{ + /* Determine the PC offset for a C[34]x instruction. + This could be simplified using some boolean algebra + but at the expense of readability. */ + switch (op >> 24) + { + case 0x60: /* br */ + case 0x62: /* call (C4x) */ + case 0x64: /* rptb (C4x) */ + return 1; + case 0x61: /* brd */ + case 0x63: /* laj */ + case 0x65: /* rptbd (C4x) */ + return 3; + case 0x66: /* swi */ + case 0x67: + return 0; + default: + break; + } + + switch ((op & 0xffe00000) >> 20) + { + case 0x6a0: /* bB */ + case 0x720: /* callB */ + case 0x740: /* trapB */ + return 1; + + case 0x6a2: /* bBd */ + case 0x6a6: /* bBat */ + case 0x6aa: /* bBaf */ + case 0x722: /* lajB */ + case 0x748: /* latB */ + case 0x798: /* rptbd */ + return 3; + + default: + break; + } + + switch ((op & 0xfe200000) >> 20) + { + case 0x6e0: /* dbB */ + return 1; + + case 0x6e2: /* dbBd */ + return 3; + + default: + break; + } + + return 0; +} + +/* Exactly what point is a PC-relative offset relative TO? + With the C3x we have the following: + DBcond, Bcond disp + PC + 1 => PC + DBcondD, BcondD disp + PC + 3 => PC + */ +long +md_pcrel_from (fixS *fixP) +{ + unsigned char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; + unsigned int op; + + op = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + + return ((fixP->fx_where + fixP->fx_frag->fr_address) >> 2) + + c4x_pc_offset (op); +} + +/* This is probably not necessary, if we have played our cards right, + since everything should be already aligned on a 4-byte boundary. */ +int +c4x_do_align (int alignment, const char *fill, int len, int max) +{ + char *p; + + p = frag_var (rs_align, 1, 1, (relax_substateT) 0, + (symbolS *) 0, (long) 2, (char *) 0); + + /* We could use frag_align_pattern (n, nop_pattern, sizeof (nop_pattern)); + to fill with our 32-bit nop opcode. */ + return 1; +} + +/* Look for and remove parallel instruction operator ||. */ +void +c4x_start_line (void) +{ + char *s = input_line_pointer; + + SKIP_WHITESPACE (); + + /* If parallel instruction prefix found at start of line, skip it. */ + if (*input_line_pointer == '|' && input_line_pointer[1] == '|') + { + if (insn->in_use) + { + insn->parallel = 1; + input_line_pointer += 2; + /* So line counters get bumped. */ + input_line_pointer[-1] = '\n'; + } + } + else + { + if (insn->in_use) + md_assemble (NULL); + input_line_pointer = s; + } +} + +arelent * +tc_gen_reloc (asection *seg, fixS *fixP) +{ + arelent *reloc; + + reloc = (arelent *) xmalloc (sizeof (arelent)); + + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy); + reloc->address = fixP->fx_frag->fr_address + fixP->fx_where; + reloc->address /= OCTETS_PER_BYTE; + reloc->howto = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type); + if (reloc->howto == (reloc_howto_type *) NULL) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + "reloc %d not supported by object file format", + (int) fixP->fx_r_type); + return NULL; + } + + if (fixP->fx_r_type == BFD_RELOC_HI16) + reloc->addend = fixP->fx_offset; + else + reloc->addend = fixP->fx_addnumber; + + return reloc; +} + diff --git a/gas/config/tc-tic4x.h b/gas/config/tc-tic4x.h new file mode 100644 index 0000000..185886a --- /dev/null +++ b/gas/config/tc-tic4x.h @@ -0,0 +1,98 @@ +/* tc-tic4x.h -- Assemble for the Texas TMS320C[34]X. + Copyright (C) 1997, 2002 Free Software Foundation. + + Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz) + + 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) + 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#define TC_TIC4X +#define C4X + +#ifndef BFD_ASSEMBLER +#error TMS320C4x requires BFD_ASSEMBLER +#endif + +#define TARGET_ARCH bfd_arch_tic4x + +#define WORKING_DOT_WORD + +/* There are a number of different formats used for local labels. gas + expects local labels either of the form `10$:' or `n:', where n is + a single digit. When LOCAL_LABEL_DOLLARS is defined labels of the + form `10$:' are expected. When LOCAL_LABEL_FB is defined labels of + the form `n:' are expected. The latter are expected to be referred + to using `nf' for a forward reference of `nb' for a backward + reference. + + The local labels expected by the TI tools are of the form `$n:', + where the colon is optional. Now the $ character is considered to + be valid symbol name character, so gas doesn't recognise our local + symbols by default. Defining LEX_DOLLAR to be 1 means that gas + won't allow labels starting with $ and thus the hook + tc_unrecognized_line() will be called from read.c. We can thus + parse lines starting with $n as having local labels. + + The other problem is the forward reference of local labels. If a + symbol is undefined, symbol_make() calls the md_undefined_symbol() + hook where we create a local label if recognised. */ + +/* Don't stick labels starting with 'L' into symbol table of COFF file. */ +#define LOCAL_LABEL(name) ((name)[0] == '$' || (name)[0] == 'L') + +#define TARGET_BYTES_BIG_ENDIAN 0 +#define OCTETS_PER_BYTE_POWER 2 + +#define TARGET_ARCH bfd_arch_tic4x +#define BFD_ARCH TARGET_ARCH + +#define TC_COUNT_RELOC(x) (x->fx_addsy) +#define TC_CONS_RELOC RELOC_32 +#define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype (fixP) +#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep (frag) +#define NEED_FX_R_TYPE + +#define reloc_type int + +#define NO_RELOC 0 + +/* Labels are not required to have a colon for a suffix. */ +#define LABELS_WITHOUT_COLONS 1 + +/* Use $ as the section program counter (SPC). */ +#define DOLLAR_DOT + +/* Accept numbers with a suffix, e.g. 0ffffh, 1010b. */ +#define NUMBERS_WITH_SUFFIX 1 + +extern int c4x_unrecognized_line PARAMS ((int)); +#define tc_unrecognized_line(c) c4x_unrecognized_line (c) + +#define md_number_to_chars number_to_chars_littleendian + +extern int c4x_do_align PARAMS ((int, const char *, int, int)); +#define md_do_align(n,fill,len,max,l) if (c4x_do_align (n,fill,len,max)) goto l + +/* Start of line hook to remove parallel instruction operator || */ +extern void c4x_start_line PARAMS ((void)); +#define md_start_line_hook() c4x_start_line() + +extern void c4x_cleanup PARAMS ((void)); +#define md_cleanup() c4x_cleanup() + +extern void c4x_end PARAMS ((void)); +#define md_end() c4x_end() + diff --git a/gas/configure b/gas/configure index aa0f453..9296291 100755 --- a/gas/configure +++ b/gas/configure @@ -2617,6 +2617,7 @@ EOF tic30-*-*aout*) fmt=aout bfd_gas=yes ;; tic30-*-*coff*) fmt=coff bfd_gas=yes ;; + tic4x-*-* | c4x-*-*) fmt=coff bfd_gas=yes ;; tic54x-*-* | c54x*-*-*) fmt=coff bfd_gas=yes need_libm=yes;; tic80-*-*) fmt=coff ;; @@ -3173,7 +3174,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3177: checking for $ac_word" >&5 +echo "configure:3178: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3203,7 +3204,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3207: checking for $ac_word" >&5 +echo "configure:3208: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3254,7 +3255,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3258: checking for $ac_word" >&5 +echo "configure:3259: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3286,7 +3287,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:3290: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:3291: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3297,12 +3298,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 3301 "configure" +#line 3302 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -3328,12 +3329,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:3332: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:3333: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:3337: checking whether we are using GNU C" >&5 +echo "configure:3338: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3342,7 +3343,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -3361,7 +3362,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:3365: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:3366: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3398,7 +3399,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3402: checking for $ac_word" >&5 +echo "configure:3403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3429,7 +3430,7 @@ done test -n "$YACC" || YACC="yacc" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3433: checking how to run the C preprocessor" >&5 +echo "configure:3434: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3444,13 +3445,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 3448 "configure" +#line 3449 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3461,13 +3462,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 3465 "configure" +#line 3466 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3478,13 +3479,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 3482 "configure" +#line 3483 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3514,7 +3515,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3518: checking for $ac_word" >&5 +echo "configure:3519: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3547,7 +3548,7 @@ test -n "$LEX" || LEX="$missing_dir/missing flex" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_word" >&5 +echo "configure:3552: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3581,7 +3582,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:3585: checking for yywrap in -l$ac_lib" >&5 +echo "configure:3586: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3589,7 +3590,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3593 "configure" +#line 3594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3600,7 +3601,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3623,7 +3624,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:3627: checking lex output file root" >&5 +echo "configure:3628: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3644,7 +3645,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:3648: checking whether yytext is a pointer" >&5 +echo "configure:3649: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3656,14 +3657,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <<EOF -#line 3660 "configure" +#line 3661 "configure" #include "confdefs.h" `cat $LEX_OUTPUT_ROOT.c` int main() { ; return 0; } EOF -if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -3689,7 +3690,7 @@ ALL_LINGUAS="fr tr es" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3693: checking for $ac_word" >&5 +echo "configure:3694: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3717,12 +3718,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3721: checking for ANSI C header files" >&5 +echo "configure:3722: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3726 "configure" +#line 3727 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3730,7 +3731,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3747,7 +3748,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3751 "configure" +#line 3752 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3765,7 +3766,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3769 "configure" +#line 3770 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3786,7 +3787,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3790 "configure" +#line 3791 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3797,7 +3798,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3821,12 +3822,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3825: checking for working const" >&5 +echo "configure:3826: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3830 "configure" +#line 3831 "configure" #include "confdefs.h" int main() { @@ -3875,7 +3876,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3896,21 +3897,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3900: checking for inline" >&5 +echo "configure:3901: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 3907 "configure" +#line 3908 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3936,12 +3937,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3940: checking for off_t" >&5 +echo "configure:3941: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3945 "configure" +#line 3946 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3969,12 +3970,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3973: checking for size_t" >&5 +echo "configure:3974: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3978 "configure" +#line 3979 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4004,19 +4005,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4008: checking for working alloca.h" >&5 +echo "configure:4009: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4013 "configure" +#line 4014 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4037,12 +4038,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4041: checking for alloca" >&5 +echo "configure:4042: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4046 "configure" +#line 4047 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -4070,7 +4071,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:4074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4102,12 +4103,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4106: checking whether alloca needs Cray hooks" >&5 +echo "configure:4107: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4111 "configure" +#line 4112 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -4132,12 +4133,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4136: checking for $ac_func" >&5 +echo "configure:4137: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4141 "configure" +#line 4142 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4160,7 +4161,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4187,7 +4188,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4191: checking stack direction for C alloca" >&5 +echo "configure:4192: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4195,7 +4196,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 4199 "configure" +#line 4200 "configure" #include "confdefs.h" find_stack_direction () { @@ -4214,7 +4215,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4239,17 +4240,17 @@ for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4243: checking for $ac_hdr" >&5 +echo "configure:4244: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4248 "configure" +#line 4249 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4278,12 +4279,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4282: checking for $ac_func" >&5 +echo "configure:4283: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4287 "configure" +#line 4288 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4306,7 +4307,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4331,7 +4332,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4335: checking for working mmap" >&5 +echo "configure:4336: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4339,7 +4340,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 4343 "configure" +#line 4344 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -4492,7 +4493,7 @@ main() } EOF -if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4520,17 +4521,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4524: checking for $ac_hdr" >&5 +echo "configure:4525: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4529 "configure" +#line 4530 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4560,12 +4561,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4564: checking for $ac_func" >&5 +echo "configure:4565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4569 "configure" +#line 4570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4588,7 +4589,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4617,12 +4618,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4621: checking for $ac_func" >&5 +echo "configure:4622: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4626 "configure" +#line 4627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4645,7 +4646,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4679,19 +4680,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4683: checking for LC_MESSAGES" >&5 +echo "configure:4684: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4688 "configure" +#line 4689 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -4712,7 +4713,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:4716: checking whether NLS is requested" >&5 +echo "configure:4717: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -4732,7 +4733,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:4736: checking whether included gettext is requested" >&5 +echo "configure:4737: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -4751,17 +4752,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4755: checking for libintl.h" >&5 +echo "configure:4756: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4760 "configure" +#line 4761 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4778,19 +4779,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:4782: checking for gettext in libc" >&5 +echo "configure:4783: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4787 "configure" +#line 4788 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -4806,7 +4807,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4810: checking for bindtextdomain in -lintl" >&5 +echo "configure:4811: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4814,7 +4815,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4818 "configure" +#line 4819 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4825,7 +4826,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4841,19 +4842,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:4845: checking for gettext in libintl" >&5 +echo "configure:4846: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4850 "configure" +#line 4851 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -4881,7 +4882,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4885: checking for $ac_word" >&5 +echo "configure:4886: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4915,12 +4916,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4919: checking for $ac_func" >&5 +echo "configure:4920: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4924 "configure" +#line 4925 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4943,7 +4944,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4970,7 +4971,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4974: checking for $ac_word" >&5 +echo "configure:4975: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5006,7 +5007,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5010: checking for $ac_word" >&5 +echo "configure:5011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5038,7 +5039,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 5042 "configure" +#line 5043 "configure" #include "confdefs.h" int main() { @@ -5046,7 +5047,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -5078,7 +5079,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5082: checking for $ac_word" >&5 +echo "configure:5083: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5112,7 +5113,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5116: checking for $ac_word" >&5 +echo "configure:5117: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5148,7 +5149,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5152: checking for $ac_word" >&5 +echo "configure:5153: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5238,7 +5239,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:5242: checking for catalogs to be installed" >&5 +echo "configure:5243: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -5266,17 +5267,17 @@ echo "configure:5242: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:5270: checking for linux/version.h" >&5 +echo "configure:5271: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5275 "configure" +#line 5276 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5339,7 +5340,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:5343: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:5344: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -5364,7 +5365,7 @@ fi echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:5368: checking for executable suffix" >&5 +echo "configure:5369: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5374,7 +5375,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:5378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:5379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -5399,17 +5400,17 @@ for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h e do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5403: checking for $ac_hdr" >&5 +echo "configure:5404: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5408 "configure" +#line 5409 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5439,7 +5440,7 @@ done # Put this here so that autoconf's "cross-compiling" message doesn't confuse # people who are not cross-compiling but are compiling cross-assemblers. echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6 -echo "configure:5443: checking whether compiling a cross-assembler" >&5 +echo "configure:5444: checking whether compiling a cross-assembler" >&5 if test "${host}" = "${target}"; then cross_gas=no else @@ -5454,19 +5455,19 @@ echo "$ac_t""$cross_gas" 1>&6 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5458: checking for working alloca.h" >&5 +echo "configure:5459: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5463 "configure" +#line 5464 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5487,12 +5488,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5491: checking for alloca" >&5 +echo "configure:5492: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5496 "configure" +#line 5497 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -5520,7 +5521,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5552,12 +5553,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5556: checking whether alloca needs Cray hooks" >&5 +echo "configure:5557: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5561 "configure" +#line 5562 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5582,12 +5583,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5586: checking for $ac_func" >&5 +echo "configure:5587: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5591 "configure" +#line 5592 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5610,7 +5611,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5637,7 +5638,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5641: checking stack direction for C alloca" >&5 +echo "configure:5642: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5645,7 +5646,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 5649 "configure" +#line 5650 "configure" #include "confdefs.h" find_stack_direction () { @@ -5664,7 +5665,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:5668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5686,21 +5687,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5690: checking for inline" >&5 +echo "configure:5691: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5697 "configure" +#line 5698 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5730,12 +5731,12 @@ esac for ac_func in unlink remove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5734: checking for $ac_func" >&5 +echo "configure:5735: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5739 "configure" +#line 5740 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5758,7 +5759,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5787,12 +5788,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5791: checking for $ac_func" >&5 +echo "configure:5792: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5796 "configure" +#line 5797 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5815,7 +5816,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5850,7 +5851,7 @@ case $host in ;; *-ncr-sysv4.3*) echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6 -echo "configure:5854: checking for _mwvalidcheckl in -lmw" >&5 +echo "configure:5855: checking for _mwvalidcheckl in -lmw" >&5 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5858,7 +5859,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmw $LIBS" cat > conftest.$ac_ext <<EOF -#line 5862 "configure" +#line 5863 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5869,7 +5870,7 @@ int main() { _mwvalidcheckl() ; return 0; } EOF -if { (eval echo configure:5873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5890,7 +5891,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:5894: checking for main in -lm" >&5 +echo "configure:5895: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5898,14 +5899,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 5902 "configure" +#line 5903 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5928,7 +5929,7 @@ fi ;; *) echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:5932: checking for main in -lm" >&5 +echo "configure:5933: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5936,14 +5937,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 5940 "configure" +#line 5941 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5974,12 +5975,12 @@ esac # enough, but on some of those systems, the assert macro relies on requoting # working properly! echo $ac_n "checking for working assert macro""... $ac_c" 1>&6 -echo "configure:5978: checking for working assert macro" >&5 +echo "configure:5979: checking for working assert macro" >&5 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5983 "configure" +#line 5984 "configure" #include "confdefs.h" #include <assert.h> #include <stdio.h> @@ -5995,7 +5996,7 @@ assert (a == b ; return 0; } EOF -if { (eval echo configure:5999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_assert_ok=yes else @@ -6036,12 +6037,12 @@ gas_test_headers=" " echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6 -echo "configure:6040: checking whether declaration is required for strstr" >&5 +echo "configure:6041: checking whether declaration is required for strstr" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6045 "configure" +#line 6046 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -6052,7 +6053,7 @@ x = (f) strstr; ; return 0; } EOF -if { (eval echo configure:6056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_strstr=no else @@ -6073,12 +6074,12 @@ fi echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6 -echo "configure:6077: checking whether declaration is required for malloc" >&5 +echo "configure:6078: checking whether declaration is required for malloc" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6082 "configure" +#line 6083 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -6089,7 +6090,7 @@ x = (f) malloc; ; return 0; } EOF -if { (eval echo configure:6093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_malloc=no else @@ -6110,12 +6111,12 @@ fi echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6 -echo "configure:6114: checking whether declaration is required for free" >&5 +echo "configure:6115: checking whether declaration is required for free" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6119 "configure" +#line 6120 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -6126,7 +6127,7 @@ x = (f) free; ; return 0; } EOF -if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_free=no else @@ -6147,12 +6148,12 @@ fi echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6 -echo "configure:6151: checking whether declaration is required for sbrk" >&5 +echo "configure:6152: checking whether declaration is required for sbrk" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6156 "configure" +#line 6157 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -6163,7 +6164,7 @@ x = (f) sbrk; ; return 0; } EOF -if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_sbrk=no else @@ -6184,12 +6185,12 @@ fi echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6 -echo "configure:6188: checking whether declaration is required for environ" >&5 +echo "configure:6189: checking whether declaration is required for environ" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_environ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6193 "configure" +#line 6194 "configure" #include "confdefs.h" $gas_test_headers int main() { @@ -6200,7 +6201,7 @@ x = (f) environ; ; return 0; } EOF -if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_environ=no else @@ -6224,12 +6225,12 @@ fi # for it? echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6 -echo "configure:6228: checking whether declaration is required for errno" >&5 +echo "configure:6229: checking whether declaration is required for errno" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6233 "configure" +#line 6234 "configure" #include "confdefs.h" #ifdef HAVE_ERRNO_H @@ -6244,7 +6245,7 @@ x = (f) errno; ; return 0; } EOF -if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_errno=no else diff --git a/gas/configure.in b/gas/configure.in index 7e7016d..7098fec 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -461,6 +461,7 @@ changequote([,])dnl tic30-*-*aout*) fmt=aout bfd_gas=yes ;; tic30-*-*coff*) fmt=coff bfd_gas=yes ;; + tic4x-*-* | c4x-*-*) fmt=coff bfd_gas=yes ;; tic54x-*-* | c54x*-*-*) fmt=coff bfd_gas=yes need_libm=yes;; tic80-*-*) fmt=coff ;; |