X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-sparc.c;h=beb0e9de765b790ff97f8aca7ed24eb49ab4372d;hb=54b9ebdd559d20b573ecd72505a68704cd7fab9d;hp=24803009b0b32b26e902b9c3600400df6101f48f;hpb=fd0e2cf2d56e6adabdc0000f6afbb037c954812d;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c index 24803009b0..beb0e9de76 100644 --- a/gas/config/tc-sparc.c +++ b/gas/config/tc-sparc.c @@ -1,5 +1,5 @@ /* tc-sparc.c -- Assemble for the SPARC - Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1989, 90-96, 1997 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -13,43 +13,96 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#define cypress 1234 + 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. */ #include #include #include "as.h" +#include "subsegs.h" -/* careful, this file includes data *declarations* */ #include "opcode/sparc.h" -static void sparc_ip PARAMS ((char *)); +static struct sparc_arch *lookup_arch PARAMS ((char *)); +static void init_default_arch PARAMS ((void)); +static void sparc_ip PARAMS ((char *, const struct sparc_opcode **)); +static int in_signed_range PARAMS ((bfd_signed_vma, bfd_signed_vma)); +static int in_unsigned_range PARAMS ((bfd_vma, bfd_vma)); +static int in_bitfield_range PARAMS ((bfd_signed_vma, bfd_signed_vma)); +static int sparc_ffs PARAMS ((unsigned int)); +static bfd_vma BSR PARAMS ((bfd_vma, int)); +static int cmp_reg_entry PARAMS ((const PTR, const PTR)); +static int parse_keyword_arg PARAMS ((int (*) (const char *), char **, int *)); +static int parse_const_expr_arg PARAMS ((char **, int *)); +static int get_expression PARAMS ((char *str)); + +/* Default architecture. */ +/* ??? The default value should be V8, but sparclite support was added + by making it the default. GCC now passes -Asparclite, so maybe sometime in + the future we can set this to V8. */ +#ifndef DEFAULT_ARCH +#define DEFAULT_ARCH "sparclite" +#endif +static char *default_arch = DEFAULT_ARCH; + +/* Non-zero if the initial values of `max_architecture' and `sparc_arch_size' + have been set. */ +static int default_init_p; + +/* Current architecture. We don't bump up unless necessary. */ +static enum sparc_opcode_arch_val current_architecture = SPARC_OPCODE_ARCH_V6; + +/* The maximum architecture level we can bump up to. + In a 32 bit environment, don't allow bumping up to v9 by default. + The native assembler works this way. The user is required to pass + an explicit argument before we'll create v9 object files. However, if + we don't see any v9 insns, a v8plus object file is not created. */ +static enum sparc_opcode_arch_val max_architecture; + +/* Either 32 or 64, selects file format. */ +static int sparc_arch_size; -static enum sparc_architecture current_architecture = v6; static int architecture_requested; static int warn_on_bump; +/* If warn_on_bump and the needed architecture is higher than this + architecture, issue a warning. */ +static enum sparc_opcode_arch_val warn_after_architecture; + +/* Non-zero if we are generating PIC code. */ +int sparc_pic_code; + +/* Non-zero if we should give an error when misaligned data is seen. */ +static int enforce_aligned_data; + extern int target_big_endian; -const relax_typeS md_relax_table[1]; +/* V9 has big and little endian data, but instructions are always big endian. + The sparclet has bi-endian support but both data and insns have the same + endianness. Global `target_big_endian' is used for data. The following + macro is used for instructions. */ +#define INSN_BIG_ENDIAN (target_big_endian \ + || SPARC_OPCODE_ARCH_V9_P (max_architecture)) /* handle of the OPCODE hash table */ -static struct hash_control *op_hash = NULL; +static struct hash_control *op_hash; static void s_data1 PARAMS ((void)); static void s_seg PARAMS ((int)); static void s_proc PARAMS ((int)); static void s_reserve PARAMS ((int)); static void s_common PARAMS ((int)); +static void s_empty PARAMS ((int)); +static void s_uacons PARAMS ((int)); const pseudo_typeS md_pseudo_table[] = { {"align", s_align_bytes, 0}, /* Defaulting is invalid (0) */ {"common", s_common, 0}, + {"empty", s_empty, 0}, {"global", s_globl, 0}, {"half", cons, 2}, {"optim", s_ignore, 0}, @@ -58,26 +111,21 @@ const pseudo_typeS md_pseudo_table[] = {"seg", s_seg, 0}, {"skip", s_space, 0}, {"word", cons, 4}, -/* start-sanitize-v9 */ -#ifndef NO_V9 {"xword", cons, 8}, -#ifdef OBJ_ELF - {"uaxword", cons, 8}, -#endif -#endif -/* end-sanitize-v9 */ + {"uahalf", s_uacons, 2}, + {"uaword", s_uacons, 4}, + {"uaxword", s_uacons, 8}, #ifdef OBJ_ELF /* these are specific to sparc/svr4 */ {"pushsection", obj_elf_section, 0}, {"popsection", obj_elf_previous, 0}, - {"uaword", cons, 4}, - {"uahalf", cons, 2}, + {"2byte", s_uacons, 2}, + {"4byte", s_uacons, 4}, + {"8byte", s_uacons, 8}, #endif {NULL, 0, 0}, }; -const int md_short_jump_size = 4; -const int md_long_jump_size = 4; const int md_reloc_size = 12; /* Size of relocation record */ /* This array holds the chars that always start a comment. If the @@ -124,370 +172,326 @@ struct sparc_it struct sparc_it the_insn, set_insn; -#if 0 -static void print_insn PARAMS ((struct sparc_it *insn)); +static void output_insn + PARAMS ((const struct sparc_opcode *, struct sparc_it *)); + +/* Table of arguments to -A. + The sparc_opcode_arch table in sparc-opc.c is insufficient and incorrect + for this use. That table is for opcodes only. This table is for opcodes + and file formats. */ + +static struct sparc_arch { + char *name; + char *opcode_arch; + int arch_size; +} sparc_arch_table[] = { + { "v6", "v6", 32 }, + { "v7", "v7", 32 }, + { "v8", "v8", 32 }, + { "sparclet", "sparclet", 32 }, + { "sparclite", "sparclite", 32 }, + { "v8plus", "v9", 32 }, + { "v8plusa", "v9a", 32 }, +#ifdef BFD64 + { "v9", "v9", 64 }, + { "v9a", "v9a", 64 }, #endif -static int getExpression PARAMS ((char *str)); + { NULL, NULL, 0 } +}; -static char *expr_end; -static int special_case; +static struct sparc_arch * +lookup_arch (name) + char *name; +{ + struct sparc_arch *sa; -/* - * Instructions that require wierd handling because they're longer than - * 4 bytes. - */ -#define SPECIAL_CASE_SET 1 -#define SPECIAL_CASE_FDIV 2 + for (sa = &sparc_arch_table[0]; sa->name != NULL; sa++) + if (strcmp (sa->name, name) == 0) + break; + if (sa->name == NULL) + return NULL; + return sa; +} -/* - * sort of like s_lcomm - * - */ -#ifndef OBJ_ELF -static int max_alignment = 15; -#endif +/* Initialize the default opcode arch and word size from the default + architecture name. */ static void -s_reserve (ignore) - int ignore; +init_default_arch () { - char *name; - char *p; - char c; - int align; - int size; - int temp; - symbolS *symbolP; + struct sparc_arch *sa = lookup_arch (default_arch); - name = input_line_pointer; - c = get_symbol_end (); - p = input_line_pointer; - *p = c; - SKIP_WHITESPACE (); + if (sa == NULL) + as_fatal ("Invalid default architecture, broken assembler."); - if (*input_line_pointer != ',') - { - as_bad ("Expected comma after name"); - ignore_rest_of_line (); - return; - } + max_architecture = sparc_opcode_lookup_arch (sa->opcode_arch); + if (max_architecture == SPARC_OPCODE_ARCH_BAD) + as_fatal ("Bad opcode table, broken assembler."); + sparc_arch_size = sa->arch_size; + default_init_p = 1; +} - ++input_line_pointer; +/* Called by TARGET_FORMAT. */ - if ((size = get_absolute_expression ()) < 0) - { - as_bad ("BSS length (%d.) <0! Ignored.", size); - ignore_rest_of_line (); - return; - } /* bad length */ +const char * +sparc_target_format () +{ + /* We don't get a chance to initialize anything before we're called, + so handle that now. */ + if (! default_init_p) + init_default_arch (); - *p = 0; - symbolP = symbol_find_or_make (name); - *p = c; +#ifdef OBJ_AOUT +#ifdef TE_NetBSD + return "a.out-sparc-netbsd"; +#else +#ifdef TE_SPARCAOUT + return target_big_endian ? "a.out-sunos-big" : "a.out-sparc-little"; +#else + return "a.out-sunos-big"; +#endif +#endif +#endif - if (strncmp (input_line_pointer, ",\"bss\"", 6) != 0 - && strncmp (input_line_pointer, ",\".bss\"", 7) != 0) - { - as_bad ("bad .reserve segment: `%s'", input_line_pointer); - return; - } +#ifdef OBJ_BOUT + return "b.out.big"; +#endif - if (input_line_pointer[2] == '.') - input_line_pointer += 7; - else - input_line_pointer += 6; - SKIP_WHITESPACE (); +#ifdef OBJ_COFF +#ifdef TE_LYNX + return "coff-sparc-lynx"; +#else + return "coff-sparc"; +#endif +#endif - if (*input_line_pointer == ',') - { - ++input_line_pointer; +#ifdef OBJ_ELF + return sparc_arch_size == 64 ? "elf64-sparc" : "elf32-sparc"; +#endif - SKIP_WHITESPACE (); - if (*input_line_pointer == '\n') - { - as_bad ("Missing alignment"); - return; - } + abort (); +} + +/* + * md_parse_option + * Invocation line includes a switch not recognized by the base assembler. + * See if it's a processor-specific option. These are: + * + * -bump + * Warn on architecture bumps. See also -A. + * + * -Av6, -Av7, -Av8, -Asparclite, -Asparclet + * Standard 32 bit architectures. + * -Av8plus, -Av8plusa + * Sparc64 in a 32 bit world. + * -Av9, -Av9a + * Sparc64 in a 64 bit world. + * -xarch=v8plus, -xarch=v8plusa + * Same as -Av8plus{,a}, for compatibility with Sun's assembler. + * + * Select the architecture and possibly the file format. + * Instructions or features not supported by the selected + * architecture cause fatal errors. + * + * The default is to start at v6, and bump the architecture up + * whenever an instruction is seen at a higher level. In 32 bit + * environments, v9 is not bumped up to, the user must pass + * -Av8plus{,a}. + * + * If -bump is specified, a warning is printing when bumping to + * higher levels. + * + * If an architecture is specified, all instructions must match + * that architecture. Any higher level instructions are flagged + * as errors. Note that in the 32 bit environment specifying + * -Av8plus does not automatically create a v8plus object file, a + * v9 insn must be seen. + * + * If both an architecture and -bump are specified, the + * architecture starts at the specified level, but bumps are + * warnings. Note that we can't set `current_architecture' to + * the requested level in this case: in the 32 bit environment, + * we still must avoid creating v8plus object files unless v9 + * insns are seen. + * + * Note: + * Bumping between incompatible architectures is always an + * error. For example, from sparclite to v9. + */ - align = get_absolute_expression (); -#ifndef OBJ_ELF - if (align > max_alignment) - { - align = max_alignment; - as_warn ("Alignment too large: %d. assumed.", align); - } +#ifdef OBJ_ELF +CONST char *md_shortopts = "A:K:VQ:sq"; +#else +#ifdef OBJ_AOUT +CONST char *md_shortopts = "A:k"; +#else +CONST char *md_shortopts = "A:"; #endif - if (align < 0) +#endif +struct option md_longopts[] = { +#define OPTION_BUMP (OPTION_MD_BASE) + {"bump", no_argument, NULL, OPTION_BUMP}, +#define OPTION_SPARC (OPTION_MD_BASE + 1) + {"sparc", no_argument, NULL, OPTION_SPARC}, +#define OPTION_XARCH (OPTION_MD_BASE + 2) + {"xarch", required_argument, NULL, OPTION_XARCH}, +#ifdef SPARC_BIENDIAN +#define OPTION_LITTLE_ENDIAN (OPTION_MD_BASE + 3) + {"EL", no_argument, NULL, OPTION_LITTLE_ENDIAN}, +#define OPTION_BIG_ENDIAN (OPTION_MD_BASE + 4) + {"EB", no_argument, NULL, OPTION_BIG_ENDIAN}, +#endif +#define OPTION_ENFORCE_ALIGNED_DATA (OPTION_MD_BASE + 5) + {"enforce-aligned-data", no_argument, NULL, OPTION_ENFORCE_ALIGNED_DATA}, + {NULL, no_argument, NULL, 0} +}; +size_t md_longopts_size = sizeof(md_longopts); + +int +md_parse_option (c, arg) + int c; + char *arg; +{ + /* We don't get a chance to initialize anything before we're called, + so handle that now. */ + if (! default_init_p) + init_default_arch (); + + switch (c) + { + case OPTION_BUMP: + warn_on_bump = 1; + warn_after_architecture = SPARC_OPCODE_ARCH_V6; + break; + + case OPTION_XARCH: + /* This is for compatibility with Sun's assembler. */ + if (strcmp (arg, "v8plus") != 0 + && strcmp (arg, "v8plusa") != 0) { - align = 0; - as_warn ("Alignment negative. 0 assumed."); + as_bad ("invalid architecture -xarch=%s", arg); + return 0; } - record_alignment (bss_section, align); + /* fall through */ - /* convert to a power of 2 alignment */ - for (temp = 0; (align & 1) == 0; align >>= 1, ++temp);; + case 'A': + { + struct sparc_arch *sa; + enum sparc_opcode_arch_val opcode_arch; - if (align != 1) - { - as_bad ("Alignment not a power of 2"); - ignore_rest_of_line (); - return; - } /* not a power of two */ + sa = lookup_arch (arg); + if (sa == NULL) + { + as_bad ("invalid architecture -A%s", arg); + return 0; + } - align = temp; - } /* if has optional alignment */ - else - align = 0; + opcode_arch = sparc_opcode_lookup_arch (sa->opcode_arch); + if (opcode_arch == SPARC_OPCODE_ARCH_BAD) + as_fatal ("Bad opcode table, broken assembler."); + + max_architecture = opcode_arch; + sparc_arch_size = sa->arch_size; + architecture_requested = 1; + } + break; + + case OPTION_SPARC: + /* Ignore -sparc, used by SunOS make default .s.o rule. */ + break; + + case OPTION_ENFORCE_ALIGNED_DATA: + enforce_aligned_data = 1; + break; + +#ifdef SPARC_BIENDIAN + case OPTION_LITTLE_ENDIAN: + target_big_endian = 0; + break; + case OPTION_BIG_ENDIAN: + target_big_endian = 1; + break; +#endif - if ((S_GET_SEGMENT (symbolP) == bss_section - || !S_IS_DEFINED (symbolP)) #ifdef OBJ_AOUT - && S_GET_OTHER (symbolP) == 0 - && S_GET_DESC (symbolP) == 0 + case 'k': + sparc_pic_code = 1; + break; #endif - ) - { - if (! need_pass_2) - { - char *pfrag; - segT current_seg = now_seg; - subsegT current_subseg = now_subseg; - subseg_set (bss_section, 1); /* switch to bss */ +#ifdef OBJ_ELF + case 'V': + print_version_id (); + break; - if (align) - frag_align (align, 0); /* do alignment */ + case 'Q': + /* Qy - do emit .comment + Qn - do not emit .comment */ + break; - /* detach from old frag */ - if (S_GET_SEGMENT(symbolP) == bss_section) - symbolP->sy_frag->fr_symbol = NULL; + case 's': + /* use .stab instead of .stab.excl */ + break; - symbolP->sy_frag = frag_now; - pfrag = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP, - size, (char *)0); - *pfrag = 0; + case 'q': + /* quick -- native assembler does fewer checks */ + break; - S_SET_SEGMENT (symbolP, bss_section); + case 'K': + if (strcmp (arg, "PIC") != 0) + as_warn ("Unrecognized option following -K"); + else + sparc_pic_code = 1; + break; +#endif - subseg_set (current_seg, current_subseg); - } + default: + return 0; } - else - { - as_warn("Ignoring attempt to re-define symbol %s.", name); - } /* if not redefining */ - demand_empty_rest_of_line (); + return 1; } -static void -s_common (ignore) - int ignore; +void +md_show_usage (stream) + FILE *stream; { - char *name; - char c; - char *p; - int temp, size; - symbolS *symbolP; + const struct sparc_arch *arch; - name = input_line_pointer; - c = get_symbol_end (); - /* just after name is now '\0' */ - p = input_line_pointer; - *p = c; - SKIP_WHITESPACE (); - if (*input_line_pointer != ',') - { - as_bad ("Expected comma after symbol-name"); - ignore_rest_of_line (); - return; - } - input_line_pointer++; /* skip ',' */ - if ((temp = get_absolute_expression ()) < 0) - { - as_bad (".COMMon length (%d.) <0! Ignored.", temp); - ignore_rest_of_line (); - return; - } - size = temp; - *p = 0; - symbolP = symbol_find_or_make (name); - *p = c; - if (S_IS_DEFINED (symbolP)) - { - as_bad ("Ignoring attempt to re-define symbol"); - ignore_rest_of_line (); - return; - } - if (S_GET_VALUE (symbolP) != 0) + fprintf(stream, "SPARC options:\n"); + for (arch = &sparc_arch_table[0]; arch->name; arch++) { - if (S_GET_VALUE (symbolP) != size) - { - as_warn ("Length of .comm \"%s\" is already %ld. Not changed to %d.", - S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size); - } + if (arch != &sparc_arch_table[0]) + fprintf (stream, " | "); + fprintf (stream, "-A%s", arch->name); } - else - { -#ifndef OBJ_ELF - S_SET_VALUE (symbolP, (valueT) size); - S_SET_EXTERNAL (symbolP); -#endif - } - know (symbolP->sy_frag == &zero_address_frag); - if (*input_line_pointer != ',') - { - as_bad ("Expected comma after common length"); - ignore_rest_of_line (); - return; - } - input_line_pointer++; - SKIP_WHITESPACE (); - if (*input_line_pointer != '"') - { - temp = get_absolute_expression (); -#ifndef OBJ_ELF - if (temp > max_alignment) - { - temp = max_alignment; - as_warn ("Common alignment too large: %d. assumed", temp); - } + fprintf (stream, "\n-xarch=v8plus | -xarch=v8plusa\n"); + fprintf (stream, "\ + specify variant of SPARC architecture\n\ +-bump warn when assembler switches architectures\n\ +-sparc ignored\n\ +--enforce-aligned-data force .long, etc., to be aligned correctly\n"); +#ifdef OBJ_AOUT + fprintf (stream, "\ +-k generate PIC\n"); #endif - if (temp < 0) - { - temp = 0; - as_warn ("Common alignment negative; 0 assumed"); - } #ifdef OBJ_ELF - if (symbolP->local) - { - segT old_sec; - int old_subsec; - char *p; - int align; - - allocate_bss: - old_sec = now_seg; - old_subsec = now_subseg; - align = temp; - record_alignment (bss_section, align); - subseg_set (bss_section, 0); - if (align) - frag_align (align, 0); - if (S_GET_SEGMENT (symbolP) == bss_section) - symbolP->sy_frag->fr_symbol = 0; - symbolP->sy_frag = frag_now; - p = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, size, - (char *) 0); - *p = 0; - S_SET_SEGMENT (symbolP, bss_section); - S_CLEAR_EXTERNAL (symbolP); - subseg_set (old_sec, old_subsec); - } - else + fprintf (stream, "\ +-KPIC generate PIC\n\ +-V print assembler version number\n\ +-q ignored\n\ +-Qy, -Qn ignored\n\ +-s ignored\n"); +#endif +#ifdef SPARC_BIENDIAN + fprintf (stream, "\ +-EL generate code for a little endian machine\n\ +-EB generate code for a big endian machine\n"); #endif - { - allocate_common: - S_SET_VALUE (symbolP, (valueT) size); - S_SET_EXTERNAL (symbolP); - /* should be common, but this is how gas does it for now */ - S_SET_SEGMENT (symbolP, &bfd_und_section); - } - } - else - { - input_line_pointer++; - /* @@ Some use the dot, some don't. Can we get some consistency?? */ - if (*input_line_pointer == '.') - input_line_pointer++; - /* @@ Some say data, some say bss. */ - if (strncmp (input_line_pointer, "bss\"", 4) - && strncmp (input_line_pointer, "data\"", 5)) - { - while (*--input_line_pointer != '"') - ; - input_line_pointer--; - goto bad_common_segment; - } - while (*input_line_pointer++ != '"') - ; - goto allocate_common; - } - demand_empty_rest_of_line (); - return; - - { - bad_common_segment: - p = input_line_pointer; - while (*p && *p != '\n') - p++; - c = *p; - *p = '\0'; - as_bad ("bad .common segment %s", input_line_pointer + 1); - *p = c; - input_line_pointer = p; - ignore_rest_of_line (); - return; - } -} - -static void -s_seg (ignore) - int ignore; -{ - - if (strncmp (input_line_pointer, "\"text\"", 6) == 0) - { - input_line_pointer += 6; - s_text (0); - return; - } - if (strncmp (input_line_pointer, "\"data\"", 6) == 0) - { - input_line_pointer += 6; - s_data (0); - return; - } - if (strncmp (input_line_pointer, "\"data1\"", 7) == 0) - { - input_line_pointer += 7; - s_data1 (); - return; - } - if (strncmp (input_line_pointer, "\"bss\"", 5) == 0) - { - input_line_pointer += 5; - /* We only support 2 segments -- text and data -- for now, so - things in the "bss segment" will have to go into data for now. - You can still allocate SEG_BSS stuff with .lcomm or .reserve. */ - subseg_set (data_section, 255); /* FIXME-SOMEDAY */ - return; - } - as_bad ("Unknown segment type"); - demand_empty_rest_of_line (); -} - -static void -s_data1 () -{ - subseg_set (data_section, 1); - demand_empty_rest_of_line (); -} - -static void -s_proc (ignore) - int ignore; -{ - while (!is_end_of_line[(unsigned char) *input_line_pointer]) - { - ++input_line_pointer; - } - ++input_line_pointer; } - -/* start-sanitize-v9 */ -#ifndef NO_V9 + +/* sparc64 priviledged registers */ struct priv_reg_entry { @@ -517,38 +521,20 @@ struct priv_reg_entry priv_reg_table[] = {"", -1}, /* end marker */ }; -struct membar_masks -{ - char *name; - unsigned int len; - unsigned int mask; -}; - -#define MEMBAR_MASKS_SIZE 7 - -struct membar_masks membar_masks[MEMBAR_MASKS_SIZE] = -{ - {"Sync", 4, 0x40}, - {"MemIssue", 8, 0x20}, - {"Lookaside", 9, 0x10}, - {"StoreStore", 10, 0x08}, - {"LoadStore", 9, 0x04}, - {"StoreLoad", 9, 0x02}, - {"LoadLoad", 8, 0x01}, -}; - static int -cmp_reg_entry (p, q) - struct priv_reg_entry *p, *q; +cmp_reg_entry (parg, qarg) + const PTR parg; + const PTR qarg; { + const struct priv_reg_entry *p = (const struct priv_reg_entry *) parg; + const struct priv_reg_entry *q = (const struct priv_reg_entry *) qarg; + return strcmp (q->name, p->name); } - -#endif -/* end-sanitize-v9 */ - + /* 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 () { @@ -556,12 +542,18 @@ md_begin () int lose = 0; register unsigned int i = 0; + /* We don't get a chance to initialize anything before md_parse_option + is called, and it may not be called, so handle default initialization + now if not already done. */ + if (! default_init_p) + init_default_arch (); + op_hash = hash_new (); - while (i < NUMOPCODES) + while (i < sparc_num_opcodes) { const char *name = sparc_opcodes[i].name; - retval = hash_insert (op_hash, name, &sparc_opcodes[i]); + retval = hash_insert (op_hash, name, (PTR) &sparc_opcodes[i]); if (retval != NULL) { fprintf (stderr, "internal error: can't hash `%s': %s\n", @@ -578,7 +570,7 @@ md_begin () } ++i; } - while (i < NUMOPCODES + while (i < sparc_num_opcodes && !strcmp (sparc_opcodes[i].name, name)); } @@ -594,124 +586,444 @@ md_begin () for (i = 'A'; i <= 'F'; ++i) toHex[i] = i + 10 - 'A'; - /* start-sanitize-v9 */ -#ifndef NO_V9 -#ifdef sparcv9 - current_architecture = v9; -#endif - qsort (priv_reg_table, sizeof (priv_reg_table) / sizeof (priv_reg_table[0]), sizeof (priv_reg_table[0]), cmp_reg_entry); -#endif - /* end-sanitize-v9 */ - target_big_endian = 1; + /* If -bump, record the architecture level at which we start issuing + warnings. The behaviour is different depending upon whether an + architecture was explicitly specified. If it wasn't, we issue warnings + for all upwards bumps. If it was, we don't start issuing warnings until + we need to bump beyond the requested architecture or when we bump between + conflicting architectures. */ + + if (warn_on_bump + && architecture_requested) + { + /* `max_architecture' records the requested architecture. + Issue warnings if we go above it. */ + warn_after_architecture = max_architecture; + + /* Find the highest architecture level that doesn't conflict with + the requested one. */ + for (max_architecture = SPARC_OPCODE_ARCH_MAX; + max_architecture > warn_after_architecture; + --max_architecture) + if (! SPARC_OPCODE_CONFLICT_P (max_architecture, + warn_after_architecture)) + break; + } } +/* Called after all assembly has been done. */ + void -md_assemble (str) - char *str; +sparc_md_end () { - char *toP; - int rsd; - - know (str); - sparc_ip (str); - - /* See if "set" operand is absolute and small; skip sethi if so. */ - if (special_case == SPECIAL_CASE_SET - && the_insn.exp.X_op == O_constant) + if (sparc_arch_size == 64) + { + if (current_architecture == SPARC_OPCODE_ARCH_V9A) + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc_v9a); + else + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc_v9); + } + else { - if (the_insn.exp.X_add_number >= -(1 << 12) - && the_insn.exp.X_add_number < (1 << 12)) + if (current_architecture == SPARC_OPCODE_ARCH_V9) + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc_v8plus); + else if (current_architecture == SPARC_OPCODE_ARCH_V9A) + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc_v8plusa); + else if (current_architecture == SPARC_OPCODE_ARCH_SPARCLET) + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc_sparclet); + else { - the_insn.opcode = 0x80102000 /* or %g0,imm,... */ - | (the_insn.opcode & 0x3E000000) /* dest reg */ - | (the_insn.exp.X_add_number & 0x1FFF); /* imm */ - special_case = 0; /* No longer special */ - the_insn.reloc = BFD_RELOC_NONE; /* No longer relocated */ + /* The sparclite is treated like a normal sparc. Perhaps it shouldn't + be but for now it is (since that's the way it's always been + treated). */ + bfd_set_arch_mach (stdoutput, bfd_arch_sparc, bfd_mach_sparc); } } +} + +/* Return non-zero if VAL is in the range -(MAX+1) to MAX. */ - toP = frag_more (4); - /* put out the opcode */ - md_number_to_chars (toP, (valueT) the_insn.opcode, 4); +static INLINE int +in_signed_range (val, max) + bfd_signed_vma val, max; +{ + if (max <= 0) + abort (); + if (val > max) + return 0; + if (val < ~max) + return 0; + return 1; +} - /* put out the symbol-dependent stuff */ - if (the_insn.reloc != BFD_RELOC_NONE) +/* Return non-zero if VAL is in the range 0 to MAX. */ + +static INLINE int +in_unsigned_range (val, max) + bfd_vma val, max; +{ + if (val > max) + return 0; + return 1; +} + +/* Return non-zero if VAL is in the range -(MAX/2+1) to MAX. + (e.g. -15 to +31). */ + +static INLINE int +in_bitfield_range (val, max) + bfd_signed_vma val, max; +{ + if (max <= 0) + abort (); + if (val > max) + return 0; + if (val < ~(max >> 1)) + return 0; + return 1; +} + +static int +sparc_ffs (mask) + unsigned int mask; +{ + int i; + + if (mask == 0) + return -1; + + for (i = 0; (mask & 1) == 0; ++i) + mask >>= 1; + return i; +} + +/* Implement big shift right. */ +static bfd_vma +BSR (val, amount) + bfd_vma val; + int amount; +{ + if (sizeof (bfd_vma) <= 4 && amount >= 32) + as_fatal ("Support for 64-bit arithmetic not compiled in."); + return val >> amount; +} + +/* For communication between sparc_ip and get_expression. */ +static char *expr_end; + +/* For communication between md_assemble and sparc_ip. */ +static int special_case; + +/* Values for `special_case'. + Instructions that require wierd handling because they're longer than + 4 bytes. */ +#define SPECIAL_CASE_NONE 0 +#define SPECIAL_CASE_SET 1 +#define SPECIAL_CASE_SETSW 2 +#define SPECIAL_CASE_SETX 3 +/* FIXME: sparc-opc.c doesn't have necessary "S" trigger to enable this. */ +#define SPECIAL_CASE_FDIV 4 + +/* Bit masks of various insns. */ +#define NOP_INSN 0x01000000 +#define OR_INSN 0x80100000 +#define FMOVS_INSN 0x81A00020 +#define SETHI_INSN 0x01000000 +#define SLLX_INSN 0x81281000 +#define SRA_INSN 0x81380000 + +/* The last instruction to be assembled. */ +static const struct sparc_opcode *last_insn; +/* The assembled opcode of `last_insn'. */ +static unsigned long last_opcode; + +/* Main entry point to assemble one instruction. */ + +void +md_assemble (str) + char *str; +{ + const struct sparc_opcode *insn; + + know (str); + special_case = SPECIAL_CASE_NONE; + sparc_ip (str, &insn); + + /* We warn about attempts to put a floating point branch in a delay slot, + unless the delay slot has been annulled. */ + if (insn != NULL + && last_insn != NULL + && (insn->flags & F_FBR) != 0 + && (last_insn->flags & F_DELAYED) != 0 + /* ??? This test isn't completely accurate. We assume anything with + F_{UNBR,CONDBR,FBR} set is annullable. */ + && ((last_insn->flags & (F_UNBR | F_CONDBR | F_FBR)) == 0 + || (last_opcode & ANNUL) == 0)) + as_warn ("FP branch in delay slot"); + + /* SPARC before v9 requires a nop instruction between a floating + point instruction and a floating point branch. We insert one + automatically, with a warning. */ + if (max_architecture < SPARC_OPCODE_ARCH_V9 + && insn != NULL + && last_insn != NULL + && (insn->flags & F_FBR) != 0 + && (last_insn->flags & F_FLOAT) != 0) { - fix_new_exp (frag_now, /* which frag */ - (toP - frag_now->fr_literal), /* where */ - 4, /* size */ - &the_insn.exp, - the_insn.pcrel, - the_insn.reloc); + struct sparc_it nop_insn; + + nop_insn.opcode = NOP_INSN; + nop_insn.reloc = BFD_RELOC_NONE; + output_insn (insn, &nop_insn); + as_warn ("FP branch preceded by FP instruction; NOP inserted"); } switch (special_case) { + case SPECIAL_CASE_NONE: + /* normal insn */ + output_insn (insn, &the_insn); + break; + case SPECIAL_CASE_SET: - special_case = 0; - assert (the_insn.reloc == BFD_RELOC_HI22); - /* See if "set" operand has no low-order bits; skip OR if so. */ - if (the_insn.exp.X_op == O_constant - && ((the_insn.exp.X_add_number & 0x3FF) == 0)) - return; - toP = frag_more (4); - rsd = (the_insn.opcode >> 25) & 0x1f; - the_insn.opcode = 0x80102000 | (rsd << 25) | (rsd << 14); - md_number_to_chars (toP, (valueT) the_insn.opcode, 4); - fix_new_exp (frag_now, /* which frag */ - (toP - frag_now->fr_literal), /* where */ - 4, /* size */ - &the_insn.exp, - the_insn.pcrel, - BFD_RELOC_LO10); - return; + { + int need_hi22_p = 0; + + /* "set" is not defined for negative numbers in v9: it doesn't yield + what you expect it to. */ + if (SPARC_OPCODE_ARCH_V9_P (max_architecture) + && the_insn.exp.X_op == O_constant) + { + if (the_insn.exp.X_add_number < 0) + as_warn ("set: used with negative number"); + else if (the_insn.exp.X_add_number > 0xffffffff) + as_warn ("set: number larger than 4294967295"); + } + + /* See if operand is absolute and small; skip sethi if so. */ + if (the_insn.exp.X_op != O_constant + || the_insn.exp.X_add_number >= (1 << 12) + || the_insn.exp.X_add_number < -(1 << 12)) + { + output_insn (insn, &the_insn); + need_hi22_p = 1; + } + /* See if operand has no low-order bits; skip OR if so. */ + if (the_insn.exp.X_op != O_constant + || (need_hi22_p && (the_insn.exp.X_add_number & 0x3FF) != 0) + || ! need_hi22_p) + { + int rd = (the_insn.opcode & RD (~0)) >> 25; + the_insn.opcode = (OR_INSN | (need_hi22_p ? RS1 (rd) : 0) + | RD (rd) + | IMMED + | (the_insn.exp.X_add_number + & (need_hi22_p ? 0x3ff : 0x1fff))); + the_insn.reloc = (the_insn.exp.X_op != O_constant + ? BFD_RELOC_LO10 + : BFD_RELOC_NONE); + output_insn (insn, &the_insn); + } + break; + } + + case SPECIAL_CASE_SETSW: + { + /* FIXME: Not finished. */ + break; + } + + case SPECIAL_CASE_SETX: + { +#define SIGNEXT32(x) ((((x) & 0xffffffff) ^ 0x80000000) - 0x80000000) + int upper32 = SIGNEXT32 (BSR (the_insn.exp.X_add_number, 32)); + int lower32 = SIGNEXT32 (the_insn.exp.X_add_number); +#undef SIGNEXT32 + int tmpreg = (the_insn.opcode & RS1 (~0)) >> 14; + int dstreg = (the_insn.opcode & RD (~0)) >> 25; + /* Output directly to dst reg if lower 32 bits are all zero. */ + int upper_dstreg = (the_insn.exp.X_op == O_constant + && lower32 == 0) ? dstreg : tmpreg; + int need_hh22_p = 0, need_hm10_p = 0, need_hi22_p = 0, need_lo10_p = 0; + + /* The tmp reg should not be the dst reg. */ + if (tmpreg == dstreg) + as_warn ("setx: temporary register same as destination register"); + + /* Reset X_add_number, we've extracted it as upper32/lower32. + Otherwise fixup_segment will complain about not being able to + write an 8 byte number in a 4 byte field. */ + the_insn.exp.X_add_number = 0; + + /* ??? Obviously there are other optimizations we can do + (e.g. sethi+shift for 0x1f0000000) and perhaps we shouldn't be + doing some of these. Later. If you do change things, try to + change all of this to be table driven as well. */ + + /* What to output depends on the number if it's constant. + Compute that first, then output what we've decided upon. */ + if (the_insn.exp.X_op != O_constant) + need_hh22_p = need_hm10_p = need_hi22_p = need_lo10_p = 1; + else + { + /* Only need hh22 if `or' insn can't handle constant. */ + if (upper32 < -(1 << 12) || upper32 >= (1 << 12)) + need_hh22_p = 1; + + /* Does bottom part (after sethi) have bits? */ + if ((need_hh22_p && (upper32 & 0x3ff) != 0) + /* No hh22, but does upper32 still have bits we can't set + from lower32? */ + || (! need_hh22_p + && upper32 != 0 + && (upper32 != -1 || lower32 >= 0))) + need_hm10_p = 1; + + /* If the lower half is all zero, we build the upper half directly + into the dst reg. */ + if (lower32 != 0 + /* Need lower half if number is zero. */ + || (! need_hh22_p && ! need_hm10_p)) + { + /* No need for sethi if `or' insn can handle constant. */ + if (lower32 < -(1 << 12) || lower32 >= (1 << 12) + /* Note that we can't use a negative constant in the `or' + insn unless the upper 32 bits are all ones. */ + || (lower32 < 0 && upper32 != -1)) + need_hi22_p = 1; + + /* Does bottom part (after sethi) have bits? */ + if ((need_hi22_p && (lower32 & 0x3ff) != 0) + /* No sethi. */ + || (! need_hi22_p && (lower32 & 0x1fff) != 0) + /* Need `or' if we didn't set anything else. */ + || (! need_hi22_p && ! need_hh22_p && ! need_hm10_p)) + need_lo10_p = 1; + } + } + + if (need_hh22_p) + { + the_insn.opcode = (SETHI_INSN | RD (upper_dstreg) + | ((upper32 >> 10) & 0x3fffff)); + the_insn.reloc = (the_insn.exp.X_op != O_constant + ? BFD_RELOC_SPARC_HH22 : BFD_RELOC_NONE); + output_insn (insn, &the_insn); + } + + if (need_hm10_p) + { + the_insn.opcode = (OR_INSN + | (need_hh22_p ? RS1 (upper_dstreg) : 0) + | RD (upper_dstreg) + | IMMED + | (upper32 + & (need_hh22_p ? 0x3ff : 0x1fff))); + the_insn.reloc = (the_insn.exp.X_op != O_constant + ? BFD_RELOC_SPARC_HM10 : BFD_RELOC_NONE); + output_insn (insn, &the_insn); + } + + if (need_hi22_p) + { + the_insn.opcode = (SETHI_INSN | RD (dstreg) + | ((lower32 >> 10) & 0x3fffff)); + the_insn.reloc = BFD_RELOC_HI22; + output_insn (insn, &the_insn); + } + + if (need_lo10_p) + { + /* FIXME: One nice optimization to do here is to OR the low part + with the highpart if hi22 isn't needed and the low part is + positive. */ + the_insn.opcode = (OR_INSN | (need_hi22_p ? RS1 (dstreg) : 0) + | RD (dstreg) + | IMMED + | (lower32 + & (need_hi22_p ? 0x3ff : 0x1fff))); + the_insn.reloc = BFD_RELOC_LO10; + output_insn (insn, &the_insn); + } + + /* If we needed to build the upper part, shift it into place. */ + if (need_hh22_p || need_hm10_p) + { + the_insn.opcode = (SLLX_INSN | RS1 (upper_dstreg) | RD (upper_dstreg) + | IMMED | 32); + the_insn.reloc = BFD_RELOC_NONE; + output_insn (insn, &the_insn); + } + + /* If we needed to build both upper and lower parts, OR them together. */ + if ((need_hh22_p || need_hm10_p) + && (need_hi22_p || need_lo10_p)) + { + the_insn.opcode = (OR_INSN | RS1 (dstreg) | RS2 (upper_dstreg) + | RD (dstreg)); + the_insn.reloc = BFD_RELOC_NONE; + output_insn (insn, &the_insn); + } + /* We didn't need both regs, but we may have to sign extend lower32. */ + else if (need_hi22_p && upper32 == -1) + { + the_insn.opcode = (SRA_INSN | RS1 (dstreg) | RD (dstreg) + | IMMED | 0); + the_insn.reloc = BFD_RELOC_NONE; + output_insn (insn, &the_insn); + } + break; + } case SPECIAL_CASE_FDIV: - /* According to information leaked from Sun, the "fdiv" instructions - on early SPARC machines would produce incorrect results sometimes. - The workaround is to add an fmovs of the destination register to - itself just after the instruction. This was true on machines - with Weitek 1165 float chips, such as the Sun-4/260 and /280. */ - special_case = 0; - assert (the_insn.reloc == BFD_RELOC_NONE); - toP = frag_more (4); - rsd = (the_insn.opcode >> 25) & 0x1f; - the_insn.opcode = 0x81A00020 | (rsd << 25) | rsd; /* fmovs dest,dest */ - md_number_to_chars (toP, (valueT) the_insn.opcode, 4); - return; - - case 0: - return; + { + int rd = (the_insn.opcode >> 25) & 0x1f; + + output_insn (insn, &the_insn); + + /* According to information leaked from Sun, the "fdiv" instructions + on early SPARC machines would produce incorrect results sometimes. + The workaround is to add an fmovs of the destination register to + itself just after the instruction. This was true on machines + with Weitek 1165 float chips, such as the Sun-4/260 and /280. */ + assert (the_insn.reloc == BFD_RELOC_NONE); + the_insn.opcode = FMOVS_INSN | rd | RD (rd); + output_insn (insn, &the_insn); + break; + } default: - as_fatal ("failed sanity check."); + as_fatal ("failed special case insn sanity check"); } } +/* Subroutine of md_assemble to do the actual parsing. */ + static void -sparc_ip (str) +sparc_ip (str, pinsn) char *str; + const struct sparc_opcode **pinsn; { char *error_message = ""; char *s; const char *args; char c; - struct sparc_opcode *insn; + const struct sparc_opcode *insn; char *argsStart; unsigned long opcode; unsigned int mask = 0; int match = 0; int comma = 0; - long immediate_max = 0; + int v9_arg_p; for (s = str; islower (*s) || (*s >= '0' && *s <= '3'); ++s) ; + switch (*s) { - case '\0': break; @@ -725,10 +1037,11 @@ sparc_ip (str) break; default: - as_bad ("Unknown opcode: `%s'", str); - exit (1); + as_fatal ("Unknown opcode: `%s'", str); } - if ((insn = (struct sparc_opcode *) hash_find (op_hash, str)) == NULL) + insn = (struct sparc_opcode *) hash_find (op_hash, str); + *pinsn = insn; + if (insn == NULL) { as_bad ("Unknown opcode: `%s'", str); return; @@ -737,12 +1050,14 @@ sparc_ip (str) { *--s = ','; } + argsStart = s; for (;;) { opcode = insn->match; memset (&the_insn, '\0', sizeof (the_insn)); the_insn.reloc = BFD_RELOC_NONE; + v9_arg_p = 0; /* * Build the opcode, checking as we go to make @@ -752,116 +1067,81 @@ sparc_ip (str) { switch (*args) { - - /* start-sanitize-v9 */ -#ifndef NO_V9 case 'K': { int kmask = 0; - int i; /* Parse a series of masks. */ if (*s == '#') { while (*s == '#') { - ++s; - for (i = 0; i < MEMBAR_MASKS_SIZE; i++) - if (!strncmp (s, membar_masks[i].name, - membar_masks[i].len)) - break; - if (i < MEMBAR_MASKS_SIZE) - { - kmask |= membar_masks[i].mask; - s += membar_masks[i].len; - } - else + int mask; + + if (! parse_keyword_arg (sparc_encode_membar, &s, + &mask)) { error_message = ": invalid membar mask name"; goto error; } - if (*s == '|') + kmask |= mask; + while (*s == ' ') { ++s; continue; } + if (*s == '|' || *s == '+') ++s; + while (*s == ' ') { ++s; continue; } } } else { - expressionS exp; - char *hold; - char *send; - - hold = input_line_pointer; - input_line_pointer = s; - expression (&exp); - send = input_line_pointer; - input_line_pointer = hold; - - kmask = exp.X_add_number; - if (exp.X_op != O_constant - || kmask < 0 - || kmask > 127) + if (! parse_const_expr_arg (&s, &kmask)) + { + error_message = ": invalid membar mask expression"; + goto error; + } + if (kmask < 0 || kmask > 127) { error_message = ": invalid membar mask number"; goto error; } - - s = send; } - opcode |= SIMM13 (kmask); + opcode |= MEMBAR (kmask); continue; } case '*': { - int prefetch_fcn = 0; + int fcn = 0; /* Parse a prefetch function. */ if (*s == '#') { - s += 1; - if (!strncmp (s, "n_reads", 7)) - prefetch_fcn = 0, s += 7; - else if (!strncmp (s, "one_read", 8)) - prefetch_fcn = 1, s += 8; - else if (!strncmp (s, "n_writes", 8)) - prefetch_fcn = 2, s += 8; - else if (!strncmp (s, "one_write", 9)) - prefetch_fcn = 3, s += 9; - else if (!strncmp (s, "page", 4)) - prefetch_fcn = 4, s += 4; - else + if (! parse_keyword_arg (sparc_encode_prefetch, &s, &fcn)) { error_message = ": invalid prefetch function name"; goto error; } } - else if (isdigit (*s)) + else { - while (isdigit (*s)) + if (! parse_const_expr_arg (&s, &fcn)) { - prefetch_fcn = prefetch_fcn * 10 + *s - '0'; - ++s; + error_message = ": invalid prefetch function expression"; + goto error; } - - if (prefetch_fcn < 0 || prefetch_fcn > 31) + if (fcn < 0 || fcn > 31) { error_message = ": invalid prefetch function number"; goto error; } } - else - { - error_message = ": unrecognizable prefetch function"; - goto error; - } - opcode |= RD (prefetch_fcn); + opcode |= RD (fcn); continue; } case '!': case '?': - /* Parse a privileged register. */ + /* Parse a sparc64 privileged register. */ if (*s == '%') { struct priv_reg_entry *p = priv_reg_table; @@ -894,8 +1174,6 @@ sparc_ip (str) error_message = ": unrecognizable privileged register"; goto error; } -#endif - /* end-sanitize-v9 */ case 'M': case 'm': @@ -913,34 +1191,60 @@ sparc_ip (str) ++s; } - if (num < 16 || 31 < num) + if (current_architecture >= SPARC_OPCODE_ARCH_V9) { - error_message = ": asr number must be between 15 and 31"; - goto error; - } /* out of range */ - - opcode |= (*args == 'M' ? RS1 (num) : RD (num)); - continue; - } - else - { - error_message = ": expecting %asrN"; - goto error; - } /* if %asr followed by a number. */ - - } /* if %asr */ + if (num < 16 || 31 < num) + { + error_message = ": asr number must be between 16 and 31"; + goto error; + } + } + else + { + if (num < 0 || 31 < num) + { + error_message = ": asr number must be between 0 and 31"; + goto error; + } + } + + opcode |= (*args == 'M' ? RS1 (num) : RD (num)); + continue; + } + else + { + error_message = ": expecting %asrN"; + goto error; + } + } /* if %asr */ break; - /* start-sanitize-v9 */ -#ifndef NO_V9 case 'I': the_insn.reloc = BFD_RELOC_SPARC_11; - immediate_max = 0x03FF; goto immediate; case 'j': the_insn.reloc = BFD_RELOC_SPARC_10; - immediate_max = 0x01FF; + goto immediate; + + case 'X': + /* V8 systems don't understand BFD_RELOC_SPARC_5. */ + if (SPARC_OPCODE_ARCH_V9_P (max_architecture)) + the_insn.reloc = BFD_RELOC_SPARC_5; + else + the_insn.reloc = BFD_RELOC_SPARC13; + /* These fields are unsigned, but for upward compatibility, + allow negative values as well. */ + goto immediate; + + case 'Y': + /* V8 systems don't understand BFD_RELOC_SPARC_6. */ + if (SPARC_OPCODE_ARCH_V9_P (max_architecture)) + the_insn.reloc = BFD_RELOC_SPARC_6; + else + the_insn.reloc = BFD_RELOC_SPARC13; + /* These fields are unsigned, but for upward compatibility, + allow negative values as well. */ goto immediate; case 'k': @@ -1056,8 +1360,6 @@ sparc_ip (str) continue; } break; -#endif /* NO_V9 */ - /* end-sanitize-v9 */ case '\0': /* end of args */ if (*s == '\0') @@ -1142,6 +1444,7 @@ sparc_ip (str) break; case 'r': /* next operand must be a register */ + case 'O': case '1': case '2': case 'd': @@ -1231,13 +1534,11 @@ sparc_ip (str) default: goto error; } - /* - * Got the register, now figure out where - * it goes in the opcode. - */ + + /* Got the register, now figure out where + it goes in the opcode. */ switch (*args) { - case '1': opcode |= mask << 14; continue; @@ -1253,6 +1554,10 @@ sparc_ip (str) case 'r': opcode |= (mask << 25) | (mask << 14); continue; + + case 'O': + opcode |= (mask << 25) | (mask << 0); + continue; } } break; @@ -1296,27 +1601,27 @@ sparc_ip (str) break; } /* register must be multiple of 4 */ -/* start-sanitize-v9 */ -#ifndef NO_V9 if (mask >= 64) { - error_message = ": There are only 64 f registers; [0-63]"; + if (SPARC_OPCODE_ARCH_V9_P (max_architecture)) + error_message = ": There are only 64 f registers; [0-63]"; + else + error_message = ": There are only 32 f registers; [0-31]"; goto error; } /* on error */ - if (mask >= 32) - { - mask -= 31; - } /* wrap high bit */ -#else -/* end-sanitize-v9 */ - if (mask >= 32) + else if (mask >= 32) { - error_message = ": There are only 32 f registers; [0-31]"; - goto error; - } /* on error */ -/* start-sanitize-v9 */ -#endif -/* end-sanitize-v9 */ + if (SPARC_OPCODE_ARCH_V9_P (max_architecture)) + { + v9_arg_p = 1; + mask -= 31; /* wrap high bit */ + } + else + { + error_message = ": There are only 32 f registers; [0-31]"; + goto error; + } + } } else { @@ -1325,7 +1630,6 @@ sparc_ip (str) switch (*args) { - case 'v': case 'V': case 'e': @@ -1358,6 +1662,10 @@ sparc_ip (str) } break; + case '0': /* 64 bit immediate (setx insn) */ + the_insn.reloc = BFD_RELOC_NONE; /* reloc handled elsewhere */ + goto immediate; + case 'h': /* high 22 bits */ the_insn.reloc = BFD_RELOC_HI22; goto immediate; @@ -1377,49 +1685,59 @@ sparc_ip (str) goto immediate; case 'i': /* 13 bit immediate */ - /* What's the difference between base13 and 13? */ - the_insn.reloc = BFD_RELOC_SPARC_BASE13; - immediate_max = 0x0FFF; + the_insn.reloc = BFD_RELOC_SPARC13; - /*FALLTHROUGH */ + /* fallthrough */ immediate: if (*s == ' ') s++; + + /* Check for %hi, etc. */ if (*s == '%') { - if ((c = s[1]) == 'h' && s[2] == 'i') - { - the_insn.reloc = BFD_RELOC_HI22; - s += 3; - } - else if (c == 'l' && s[2] == 'o') - { - the_insn.reloc = BFD_RELOC_LO10; - s += 3; - } - /* start-sanitize-v9 */ -#ifndef NO_V9 - else if (c == 'u' - && s[2] == 'h' - && s[3] == 'i') - { - the_insn.reloc = BFD_RELOC_SPARC_HH22; - s += 4; - } - else if (c == 'u' - && s[2] == 'l' - && s[3] == 'o') - { - the_insn.reloc = BFD_RELOC_SPARC_HM10; - s += 4; - } -#endif /* NO_V9 */ - /* end-sanitize-v9 */ - else + static struct ops { + /* The name as it appears in assembler. */ + char *name; + /* strlen (name), precomputed for speed */ + int len; + /* The reloc this pseudo-op translates to. */ + int reloc; + /* Non-zero if for v9 only. */ + int v9_p; + /* Non-zero if can be used in pc-relative contexts. */ + int pcrel_p;/*FIXME:wip*/ + } ops[] = { + /* hix/lox must appear before hi/lo so %hix won't be + mistaken for %hi. */ + { "hix", 3, BFD_RELOC_SPARC_HIX22, 1, 0 }, + { "lox", 3, BFD_RELOC_SPARC_LOX10, 1, 0 }, + { "hi", 2, BFD_RELOC_HI22, 0, 1 }, + { "lo", 2, BFD_RELOC_LO10, 0, 1 }, + { "hh", 2, BFD_RELOC_SPARC_HH22, 1, 1 }, + { "hm", 2, BFD_RELOC_SPARC_HM10, 1, 1 }, + { "lm", 2, BFD_RELOC_SPARC_LM22, 1, 1 }, + { "h44", 3, BFD_RELOC_SPARC_H44, 1, 0 }, + { "m44", 3, BFD_RELOC_SPARC_M44, 1, 0 }, + { "l44", 3, BFD_RELOC_SPARC_L44, 1, 0 }, + { "uhi", 3, BFD_RELOC_SPARC_HH22, 1, 0 }, + { "ulo", 3, BFD_RELOC_SPARC_HM10, 1, 0 }, + { NULL } + }; + struct ops *o; + + for (o = ops; o->name; o++) + if (strncmp (s + 1, o->name, o->len) == 0) + break; + if (o->name == NULL) break; + + the_insn.reloc = o->reloc; + s += o->len + 1; + v9_arg_p = o->v9_p; } - /* Note that if the getExpression() fails, we will still + + /* Note that if the get_expression() fails, we will still have created U entries in the symbol table for the 'symbols' in the input string. Try not to create U symbols for registers, etc. */ @@ -1431,7 +1749,7 @@ sparc_ip (str) char *s1; - for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++);; + for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++) ; if (s1 != s && isdigit (s1[-1])) { @@ -1439,7 +1757,7 @@ sparc_ip (str) { s1 -= 3; *s1 = '\0'; - (void) getExpression (s); + (void) get_expression (s); *s1 = '+'; s = s1; continue; @@ -1448,51 +1766,40 @@ sparc_ip (str) { s1 -= 4; *s1 = '\0'; - (void) getExpression (s); + (void) get_expression (s); *s1 = '+'; s = s1; continue; } } } - (void) getExpression (s); + (void) get_expression (s); s = expr_end; + /* Check for constants that don't require emitting a reloc. */ if (the_insn.exp.X_op == O_constant && the_insn.exp.X_add_symbol == 0 && the_insn.exp.X_op_symbol == 0) { - /* start-sanitize-v9 */ -#ifndef NO_V9 - switch (the_insn.reloc) + /* For pc-relative call instructions, we reject + constants to get better code. */ + if (the_insn.pcrel + && the_insn.reloc == BFD_RELOC_32_PCREL_S2 + && in_signed_range (the_insn.exp.X_add_number, 0x3fff)) { - case BFD_RELOC_SPARC_HH22: - the_insn.reloc = BFD_RELOC_HI22; - the_insn.exp.X_add_number >>= 32; - break; - case BFD_RELOC_SPARC_HM10: - the_insn.reloc = BFD_RELOC_LO10; - the_insn.exp.X_add_number >>= 32; - break; - default: - break; + error_message = ": PC-relative operand can't be a constant"; + goto error; } -#endif - /* end-sanitize-v9 */ - /* Check for invalid constant values. Don't warn if - constant was inside %hi or %lo, since these - truncate the constant to fit. */ - if (immediate_max != 0 - && the_insn.reloc != BFD_RELOC_LO10 - && the_insn.reloc != BFD_RELOC_HI22 - && (the_insn.exp.X_add_number > immediate_max - || the_insn.exp.X_add_number < ~immediate_max)) - as_bad ("constant value must be between %ld and %ld", - ~immediate_max, immediate_max); - } - /* Reset to prevent extraneous range check. */ - immediate_max = 0; + /* Constants that won't fit are checked in md_apply_fix3 + and bfd_install_relocation. + ??? It would be preferable to install the constants + into the insn here and save having to create a fixS + for each one. There already exists code to handle + all the various cases (e.g. in md_apply_fix3 and + bfd_install_relocation) so duplicating all that code + here isn't right. */ + } continue; @@ -1506,73 +1813,32 @@ sparc_ip (str) case 'A': { -/* start-sanitize-v9 */ -#ifdef NO_V9 -/* end-sanitize-v9 */ - char *push = input_line_pointer; - expressionS e; - - input_line_pointer = s; - - expression (&e); - if (e.X_op == O_constant) - { - opcode |= e.X_add_number << 5; - s = input_line_pointer; - input_line_pointer = push; - continue; - } /* if absolute */ - - break; -/* start-sanitize-v9 */ -#else int asi = 0; /* Parse an asi. */ if (*s == '#') { - s += 1; - if (!strncmp (s, "ASI_AIUP", 8)) - asi = 0x10, s += 8; - else if (!strncmp (s, "ASI_AIUS", 8)) - asi = 0x11, s += 8; - else if (!strncmp (s, "ASI_PNF", 7)) - asi = 0x82, s += 7; - else if (!strncmp (s, "ASI_SNF", 7)) - asi = 0x83, s += 7; - else if (!strncmp (s, "ASI_P", 5)) - asi = 0x80, s += 5; - else if (!strncmp (s, "ASI_S", 5)) - asi = 0x81, s += 5; - else + if (! parse_keyword_arg (sparc_encode_asi, &s, &asi)) { - error_message = ": invalid asi name"; + error_message = ": invalid ASI name"; goto error; } } - else if (isdigit (*s)) + else { - char *push = input_line_pointer; - input_line_pointer = s; - asi = get_absolute_expression (); - s = input_line_pointer; - input_line_pointer = push; - + if (! parse_const_expr_arg (&s, &asi)) + { + error_message = ": invalid ASI expression"; + goto error; + } if (asi < 0 || asi > 255) { - error_message = ": invalid asi number"; + error_message = ": invalid ASI number"; goto error; } } - else - { - error_message = ": unrecognizable asi"; - goto error; - } opcode |= ASI (asi); continue; -#endif -/* end-sanitize-v9 */ } /* alternate space */ case 'p': @@ -1600,11 +1866,22 @@ sparc_ip (str) break; case 'S': - if (strcmp (str, "set") == 0) + if (strcmp (str, "set") == 0 + || strcmp (str, "setuw") == 0) { special_case = SPECIAL_CASE_SET; continue; } + else if (strcmp (str, "setsw") == 0) + { + special_case = SPECIAL_CASE_SETSW; + continue; + } + else if (strcmp (str, "setx") == 0) + { + special_case = SPECIAL_CASE_SETX; + continue; + } else if (strncmp (str, "fdiv", 4) == 0) { special_case = SPECIAL_CASE_FDIV; @@ -1612,8 +1889,6 @@ sparc_ip (str) } break; - /* start-sanitize-v9 */ -#ifndef NO_V9 case 'o': if (strncmp (s, "%asi", 4) != 0) break; @@ -1631,8 +1906,6 @@ sparc_ip (str) break; s += 4; continue; -#endif /* NO_V9 */ - /* end-sanitize-v9 */ case 't': if (strncmp (s, "%tbr", 4) != 0) @@ -1646,23 +1919,63 @@ sparc_ip (str) s += 4; continue; + case 'x': + { + char *push = input_line_pointer; + expressionS e; + + input_line_pointer = s; + expression (&e); + if (e.X_op == O_constant) + { + int n = e.X_add_number; + if (n != e.X_add_number || (n & ~0x1ff) != 0) + as_bad ("OPF immediate operand out of range (0-0x1ff)"); + else + opcode |= e.X_add_number << 5; + } + else + as_bad ("non-immediate OPF operand, ignored"); + s = input_line_pointer; + input_line_pointer = push; + continue; + } + case 'y': if (strncmp (s, "%y", 2) != 0) break; s += 2; continue; + case 'u': + case 'U': + { + /* Parse a sparclet cpreg. */ + int cpreg; + if (! parse_keyword_arg (sparc_encode_sparclet_cpreg, &s, &cpreg)) + { + error_message = ": invalid cpreg name"; + goto error; + } + opcode |= (*args == 'U' ? RS1 (cpreg) : RD (cpreg)); + continue; + } + default: as_fatal ("failed sanity check."); } /* switch on arg code */ + + /* Break out of for() loop. */ break; } /* for each arg that we expect */ + error: if (match == 0) { /* Args don't match. */ - if (((unsigned) (&insn[1] - sparc_opcodes)) < NUMOPCODES - && !strcmp (insn->name, insn[1].name)) + if (((unsigned) (&insn[1] - sparc_opcodes)) < sparc_num_opcodes + && (insn->name == insn[1].name + || !strcmp (insn->name, insn[1].name))) { ++insn; s = argsStart; @@ -1676,51 +1989,144 @@ sparc_ip (str) } else { - if (insn->architecture > current_architecture) + /* We have a match. Now see if the architecture is ok. */ + int needed_arch_mask = insn->architecture; + + if (v9_arg_p) { - if ((!architecture_requested || warn_on_bump) - && - /* start-sanitize-v9 */ -#ifndef NO_V9 - !ARCHITECTURES_CONFLICT_P (current_architecture, - insn->architecture) -#else - /* end-sanitize-v9 */ - 1 - /* start-sanitize-v9 */ -#endif - /* end-sanitize-v9 */ - ) - { - if (warn_on_bump) - { - as_warn ("architecture bumped from \"%s\" to \"%s\" on \"%s\"", - architecture_pname[current_architecture], - architecture_pname[insn->architecture], - str); - } /* if warning */ + needed_arch_mask &= ~ ((1 << SPARC_OPCODE_ARCH_V9) + | (1 << SPARC_OPCODE_ARCH_V9A)); + needed_arch_mask |= (1 << SPARC_OPCODE_ARCH_V9); + } + + if (needed_arch_mask & SPARC_OPCODE_SUPPORTED (current_architecture)) + ; /* ok */ + /* Can we bump up the architecture? */ + else if (needed_arch_mask & SPARC_OPCODE_SUPPORTED (max_architecture)) + { + enum sparc_opcode_arch_val needed_architecture = + sparc_ffs (SPARC_OPCODE_SUPPORTED (max_architecture) + & needed_arch_mask); - current_architecture = insn->architecture; + assert (needed_architecture <= SPARC_OPCODE_ARCH_MAX); + if (warn_on_bump + && needed_architecture > warn_after_architecture) + { + as_warn ("architecture bumped from \"%s\" to \"%s\" on \"%s\"", + sparc_opcode_archs[current_architecture].name, + sparc_opcode_archs[needed_architecture].name, + str); + warn_after_architecture = needed_architecture; } - else + current_architecture = needed_architecture; + } + /* Conflict. */ + /* ??? This seems to be a bit fragile. What if the next entry in + the opcode table is the one we want and it is supported? + It is possible to arrange the table today so that this can't + happen but what about tomorrow? */ + else + { + int arch,printed_one_p = 0; + char *p; + char required_archs[SPARC_OPCODE_ARCH_MAX * 16]; + + /* Create a list of the architectures that support the insn. */ + needed_arch_mask &= ~ SPARC_OPCODE_SUPPORTED (max_architecture); + p = required_archs; + arch = sparc_ffs (needed_arch_mask); + while ((1 << arch) <= needed_arch_mask) { - as_bad ("architecture mismatch on \"%s\" (\"%s\"). current architecture is \"%s\"", - str, - architecture_pname[insn->architecture], - architecture_pname[current_architecture]); - return; - } /* if bump ok else error */ - } /* if architecture higher */ - } /* if no match */ + if ((1 << arch) & needed_arch_mask) + { + if (printed_one_p) + *p++ = '|'; + strcpy (p, sparc_opcode_archs[arch].name); + p += strlen (p); + printed_one_p = 1; + } + ++arch; + } + + as_bad ("Architecture mismatch on \"%s\".", str); + as_tsktsk (" (Requires %s; requested architecture is %s.)", + required_archs, + sparc_opcode_archs[max_architecture].name); + return; + } + } /* if no match */ break; - } /* forever looking for a match */ + } /* forever looking for a match */ the_insn.opcode = opcode; } +/* Parse an argument that can be expressed as a keyword. + (eg: #StoreStore or %ccfr). + The result is a boolean indicating success. + If successful, INPUT_POINTER is updated. */ + +static int +parse_keyword_arg (lookup_fn, input_pointerP, valueP) + int (*lookup_fn) PARAMS ((const char *)); + char **input_pointerP; + int *valueP; +{ + int value; + char c, *p, *q; + + p = *input_pointerP; + for (q = p + (*p == '#' || *p == '%'); isalnum (*q) || *q == '_'; ++q) + continue; + c = *q; + *q = 0; + value = (*lookup_fn) (p); + *q = c; + if (value == -1) + return 0; + *valueP = value; + *input_pointerP = q; + return 1; +} + +/* Parse an argument that is a constant expression. + The result is a boolean indicating success. */ + +static int +parse_const_expr_arg (input_pointerP, valueP) + char **input_pointerP; + int *valueP; +{ + char *save = input_line_pointer; + expressionS exp; + + input_line_pointer = *input_pointerP; + /* The next expression may be something other than a constant + (say if we're not processing the right variant of the insn). + Don't call expression unless we're sure it will succeed as it will + signal an error (which we want to defer until later). */ + /* FIXME: It might be better to define md_operand and have it recognize + things like %asi, etc. but continuing that route through to the end + is a lot of work. */ + if (*input_line_pointer == '%') + { + input_line_pointer = save; + return 0; + } + expression (&exp); + *input_pointerP = input_line_pointer; + input_line_pointer = save; + if (exp.X_op != O_constant) + return 0; + *valueP = exp.X_add_number; + return 1; +} + +/* Subroutine of sparc_ip to parse an expression. */ + static int -getExpression (str) +get_expression (str) char *str; { char *save_in; @@ -1743,9 +2149,43 @@ getExpression (str) expr_end = input_line_pointer; input_line_pointer = save_in; return 0; -} /* getExpression() */ +} + +/* Subroutine of md_assemble to output one insn. */ + +static void +output_insn (insn, the_insn) + const struct sparc_opcode *insn; + struct sparc_it *the_insn; +{ + char *toP = frag_more (4); + + /* put out the opcode */ + if (INSN_BIG_ENDIAN) + number_to_chars_bigendian (toP, (valueT) the_insn->opcode, 4); + else + number_to_chars_littleendian (toP, (valueT) the_insn->opcode, 4); + /* put out the symbol-dependent stuff */ + if (the_insn->reloc != BFD_RELOC_NONE) + { + fixS *fixP = fix_new_exp (frag_now, /* which frag */ + (toP - frag_now->fr_literal), /* where */ + 4, /* size */ + &the_insn->exp, + the_insn->pcrel, + the_insn->reloc); + /* Turn off overflow checking in fixup_segment. We'll do our + own overflow checking in md_apply_fix3. This is necessary because + the insn size is 4 and fixup_segment will signal an overflow for + large 8 byte quantities. */ + fixP->fx_no_overflow = 1; + } + last_insn = insn; + last_opcode = the_insn->opcode; +} + /* This is identical to the md_atof in m68k.c. I think this is right, but I'm not sure. @@ -1764,15 +2204,12 @@ md_atof (type, litP, sizeP) char *litP; int *sizeP; { - int prec; + int i,prec; LITTLENUM_TYPE words[MAX_LITTLENUMS]; - LITTLENUM_TYPE *wordP; char *t; - char *atof_ieee (); switch (type) { - case 'f': case 'F': case 's': @@ -1801,40 +2238,59 @@ md_atof (type, litP, sizeP) *sizeP = 0; return "Bad call to MD_ATOF()"; } + t = atof_ieee (input_line_pointer, type, words); if (t) input_line_pointer = t; *sizeP = prec * sizeof (LITTLENUM_TYPE); - for (wordP = words; prec--;) + + if (target_big_endian) + { + for (i = 0; i < prec; i++) + { + md_number_to_chars (litP, (valueT) words[i], sizeof (LITTLENUM_TYPE)); + litP += sizeof (LITTLENUM_TYPE); + } + } + else { - md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE)); - litP += sizeof (LITTLENUM_TYPE); + for (i = prec - 1; i >= 0; i--) + { + md_number_to_chars (litP, (valueT) words[i], sizeof (LITTLENUM_TYPE)); + litP += sizeof (LITTLENUM_TYPE); + } } + return 0; } -/* - * Write out big-endian. - */ +/* Write a value out to the object file, using the appropriate + endianness. */ + void md_number_to_chars (buf, val, n) char *buf; valueT val; int n; { - number_to_chars_bigendian (buf, val, n); + if (target_big_endian) + number_to_chars_bigendian (buf, val, n); + else + number_to_chars_littleendian (buf, val, n); } - + /* Apply a fixS to the frags, now that we know the value it ought to hold. */ int -md_apply_fix (fixP, value) +md_apply_fix3 (fixP, value, segment) fixS *fixP; valueT *value; + segT segment; { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; offsetT val; + long insn; val = *value; @@ -1845,9 +2301,28 @@ md_apply_fix (fixP, value) #ifdef OBJ_ELF /* FIXME: SPARC ELF relocations don't use an addend in the data field itself. This whole approach should be somehow combined - with the calls to bfd_perform_relocation. */ + with the calls to bfd_install_relocation. Also, the value passed + in by fixup_segment includes the value of a defined symbol. We + don't want to include the value of an externally visible symbol. */ if (fixP->fx_addsy != NULL) - return 1; + { + if (fixP->fx_addsy->sy_used_in_reloc + && (S_IS_EXTERNAL (fixP->fx_addsy) + || S_IS_WEAK (fixP->fx_addsy) + || (sparc_pic_code && ! fixP->fx_pcrel) + || (S_GET_SEGMENT (fixP->fx_addsy) != segment + && ((bfd_get_section_flags (stdoutput, + S_GET_SEGMENT (fixP->fx_addsy)) + & SEC_LINK_ONCE) != 0 + || strncmp (segment_name (S_GET_SEGMENT (fixP->fx_addsy)), + ".gnu.linkonce", + sizeof ".gnu.linkonce" - 1) == 0))) + && S_GET_SEGMENT (fixP->fx_addsy) != absolute_section + && S_GET_SEGMENT (fixP->fx_addsy) != undefined_section + && ! bfd_is_com_section (S_GET_SEGMENT (fixP->fx_addsy))) + fixP->fx_addnumber -= S_GET_VALUE (fixP->fx_addsy); + return 1; + } #endif /* This is a hack. There should be a better way to @@ -1856,175 +2331,225 @@ md_apply_fix (fixP, value) if (fixP->fx_r_type == BFD_RELOC_32_PCREL_S2 && fixP->fx_addsy) val += fixP->fx_where + fixP->fx_frag->fr_address; - switch (fixP->fx_r_type) - { - case BFD_RELOC_16: - buf[0] = val >> 8; - buf[1] = val; - break; - - case BFD_RELOC_32: - buf[0] = val >> 24; - buf[1] = val >> 16; - buf[2] = val >> 8; - buf[3] = val; - break; +#ifdef OBJ_AOUT + /* FIXME: More ridiculous gas reloc hacking. If we are going to + generate a reloc, then we just want to let the reloc addend set + the value. We do not want to also stuff the addend into the + object file. Including the addend in the object file works when + doing a static link, because the linker will ignore the object + file contents. However, the dynamic linker does not ignore the + object file contents. */ + if (fixP->fx_addsy != NULL + && fixP->fx_r_type != BFD_RELOC_32_PCREL_S2) + val = 0; + + /* When generating PIC code, we do not want an addend for a reloc + against a local symbol. We adjust fx_addnumber to cancel out the + value already included in val, and to also cancel out the + adjustment which bfd_install_relocation will create. */ + if (sparc_pic_code + && fixP->fx_r_type != BFD_RELOC_32_PCREL_S2 + && fixP->fx_addsy != NULL + && ! S_IS_COMMON (fixP->fx_addsy) + && (fixP->fx_addsy->bsym->flags & BSF_SECTION_SYM) == 0) + fixP->fx_addnumber -= 2 * S_GET_VALUE (fixP->fx_addsy); +#endif - case BFD_RELOC_32_PCREL_S2: - val = (val >>= 2) + 1; - buf[0] |= (val >> 24) & 0x3f; - buf[1] = (val >> 16); - buf[2] = val >> 8; - buf[3] = val; - break; + /* If this is a data relocation, just output VAL. */ - /* start-sanitize-v9 */ -#ifndef NO_V9 - case BFD_RELOC_64: - buf[0] = val >> 56; - buf[1] = val >> 48; - buf[2] = val >> 40; - buf[3] = val >> 32; - buf[4] = val >> 24; - buf[5] = val >> 16; - buf[6] = val >> 8; - buf[7] = val; - break; + if (fixP->fx_r_type == BFD_RELOC_16) + { + md_number_to_chars (buf, val, 2); + } + else if (fixP->fx_r_type == BFD_RELOC_32) + { + md_number_to_chars (buf, val, 4); + } + else if (fixP->fx_r_type == BFD_RELOC_64) + { + md_number_to_chars (buf, val, 8); + } + else + { + /* It's a relocation against an instruction. */ - case BFD_RELOC_SPARC_11: - if (((val > 0) && (val & ~0x7ff)) - || ((val < 0) && (~(val - 1) & ~0x7ff))) + if (INSN_BIG_ENDIAN) + insn = bfd_getb32 ((unsigned char *) buf); + else + insn = bfd_getl32 ((unsigned char *) buf); + + switch (fixP->fx_r_type) { - as_bad ("relocation overflow."); - } /* on overflow */ + case BFD_RELOC_32_PCREL_S2: + val = val >> 2; + /* FIXME: This increment-by-one deserves a comment of why it's + being done! */ + if (! sparc_pic_code + || fixP->fx_addsy == NULL + || (fixP->fx_addsy->bsym->flags & BSF_SECTION_SYM) != 0) + ++val; + insn |= val & 0x3fffffff; + break; - buf[2] |= (val >> 8) & 0x7; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC_11: + if (! in_signed_range (val, 0x7ff)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x7ff; + break; - case BFD_RELOC_SPARC_10: - if (((val > 0) && (val & ~0x3ff)) - || ((val < 0) && (~(val - 1) & ~0x3ff))) - { - as_bad ("relocation overflow."); - } /* on overflow */ + case BFD_RELOC_SPARC_10: + if (! in_signed_range (val, 0x3ff)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x3ff; + break; - buf[2] |= (val >> 8) & 0x3; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC_7: + if (! in_bitfield_range (val, 0x7f)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x7f; + break; - case BFD_RELOC_SPARC_WDISP16: - if (((val > 0) && (val & ~0x3fffc)) - || ((val < 0) && (~(val - 1) & ~0x3fffc))) - { - as_bad ("relocation overflow."); - } /* on overflow */ + case BFD_RELOC_SPARC_6: + if (! in_bitfield_range (val, 0x3f)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x3f; + break; - val = (val >>= 2) + 1; - buf[1] |= ((val >> 14) & 0x3) << 4; - buf[2] |= (val >> 8) & 0x3f; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC_5: + if (! in_bitfield_range (val, 0x1f)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x1f; + break; - case BFD_RELOC_SPARC_WDISP19: - if (((val > 0) && (val & ~0x1ffffc)) - || ((val < 0) && (~(val - 1) & ~0x1ffffc))) - { - as_bad ("relocation overflow."); - } /* on overflow */ + case BFD_RELOC_SPARC_WDISP16: + /* FIXME: simplify */ + if (((val > 0) && (val & ~0x3fffc)) + || ((val < 0) && (~(val - 1) & ~0x3fffc))) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + /* FIXME: The +1 deserves a comment. */ + val = (val >> 2) + 1; + insn |= ((val & 0xc000) << 6) | (val & 0x3fff); + break; - val = (val >>= 2) + 1; - buf[1] |= (val >> 16) & 0x7; - buf[2] = (val >> 8) & 0xff; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC_WDISP19: + /* FIXME: simplify */ + if (((val > 0) && (val & ~0x1ffffc)) + || ((val < 0) && (~(val - 1) & ~0x1ffffc))) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + /* FIXME: The +1 deserves a comment. */ + val = (val >> 2) + 1; + insn |= val & 0x7ffff; + break; - case BFD_RELOC_SPARC_HH22: - val >>= 32; - /* intentional fallthrough */ -#endif /* NO_V9 */ - /* end-sanitize-v9 */ + case BFD_RELOC_SPARC_HH22: + val = BSR (val, 32); + /* intentional fallthrough */ - /* start-sanitize-v9 */ -#ifndef NO_V9 - case BFD_RELOC_SPARC_LM22: -#endif - /* end-sanitize-v9 */ - case BFD_RELOC_HI22: - if (!fixP->fx_addsy) - { - buf[1] |= (val >> 26) & 0x3f; - buf[2] = val >> 18; - buf[3] = val >> 10; - } - else - { - buf[2] = 0; - buf[3] = 0; - } - break; + case BFD_RELOC_SPARC_LM22: + case BFD_RELOC_HI22: + /* FIXME: HI22 should signal overflow for 64 bit ABI. */ + if (!fixP->fx_addsy) + { + insn |= (val >> 10) & 0x3fffff; + } + else + { + /* FIXME: Need comment explaining why we do this. */ + insn &= ~0xffff; + } + break; - case BFD_RELOC_SPARC22: - if (val & ~0x003fffff) - { - as_bad ("relocation overflow"); - } /* on overflow */ - buf[1] |= (val >> 16) & 0x3f; - buf[2] = val >> 8; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC22: + if (val & ~0x003fffff) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= (val & 0x3fffff); + break; - case BFD_RELOC_SPARC13: - if (val & ~0x00001fff) - { - as_bad ("relocation overflow"); - } /* on overflow */ - buf[2] |= (val >> 8) & 0x1f; - buf[3] = val & 0xff; - break; + case BFD_RELOC_SPARC_HM10: + val = BSR (val, 32); + /* intentional fallthrough */ - /* start-sanitize-v9 */ -#ifndef NO_V9 - case BFD_RELOC_SPARC_HM10: - val >>= 32; - /* intentional fallthrough */ -#endif /* NO_V9 */ - /* end-sanitize-v9 */ + case BFD_RELOC_LO10: + if (!fixP->fx_addsy) + { + insn |= val & 0x3ff; + } + else + { + /* FIXME: Need comment explaining why we do this. */ + insn &= ~0xff; + } + break; - case BFD_RELOC_LO10: - if (!fixP->fx_addsy) - { - buf[2] |= (val >> 8) & 0x03; - buf[3] = val; - } - else - buf[3] = 0; - break; - case BFD_RELOC_SPARC_BASE13: - if (((val > 0) && (val & ~(offsetT)0x00001fff)) - || ((val < 0) && (~(val - 1) & ~(offsetT)0x00001fff))) - { - as_bad ("relocation overflow"); - } - buf[2] |= (val >> 8) & 0x1f; - buf[3] = val; - break; + case BFD_RELOC_SPARC13: + if (! in_signed_range (val, 0x1fff)) + as_bad_where (fixP->fx_file, fixP->fx_line, "relocation overflow"); + insn |= val & 0x1fff; + break; - case BFD_RELOC_SPARC_WDISP22: - val = (val >>= 2) + 1; - /* FALLTHROUGH */ - case BFD_RELOC_SPARC_BASE22: - buf[1] |= (val >> 16) & 0x3f; - buf[2] = val >> 8; - buf[3] = val; - break; + case BFD_RELOC_SPARC_WDISP22: + val = (val >> 2) + 1; + /* FALLTHROUGH */ + case BFD_RELOC_SPARC_BASE22: + insn |= val & 0x3fffff; + break; - case BFD_RELOC_NONE: - default: - as_bad ("bad or unhandled relocation type: 0x%02x", fixP->fx_r_type); - break; + case BFD_RELOC_SPARC_H44: + if (!fixP->fx_addsy) + { + bfd_vma tval = val; + tval >>= 22; + if (! in_unsigned_range (tval, 0x3fffff)) + as_bad_where (fixP->fx_file, fixP->fx_line, + "relocation overflow"); + insn |= tval & 0x3fffff; + } + break; + + case BFD_RELOC_SPARC_M44: + if (!fixP->fx_addsy) + insn |= (val >> 12) & 0x3ff; + break; + + case BFD_RELOC_SPARC_L44: + if (!fixP->fx_addsy) + insn |= val & 0xfff; + break; + + case BFD_RELOC_SPARC_HIX22: + if (!fixP->fx_addsy) + { + val ^= ~ (offsetT) 0; + if ((val & ~ (offsetT) 0xffffffff) != 0) + as_bad_where (fixP->fx_file, fixP->fx_line, + "relocation overflow"); + insn |= (val >> 10) & 0x3fffff; + } + break; + + case BFD_RELOC_SPARC_LOX10: + if (!fixP->fx_addsy) + insn |= 0x1c00 | (val & 0x3ff); + break; + + case BFD_RELOC_NONE: + default: + as_bad_where (fixP->fx_file, fixP->fx_line, + "bad or unhandled relocation type: 0x%02x", + fixP->fx_r_type); + break; + } + + if (INSN_BIG_ENDIAN) + bfd_putb32 (insn, (unsigned char *) buf); + else + bfd_putl32 (insn, (unsigned char *) buf); } + /* Are we finished with this relocation now? */ + if (fixP->fx_addsy == 0 && !fixP->fx_pcrel) + fixP->fx_done = 1; + return 1; } @@ -2038,8 +2563,7 @@ tc_gen_reloc (section, fixp) arelent *reloc; bfd_reloc_code_real_type code; - reloc = (arelent *) bfd_alloc_by_size_t (stdoutput, sizeof (arelent)); - assert (reloc != 0); + reloc = (arelent *) xmalloc (sizeof (arelent)); reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym; reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; @@ -2051,10 +2575,15 @@ tc_gen_reloc (section, fixp) case BFD_RELOC_HI22: case BFD_RELOC_LO10: case BFD_RELOC_32_PCREL_S2: + case BFD_RELOC_SPARC13: case BFD_RELOC_SPARC_BASE13: + case BFD_RELOC_SPARC_WDISP16: + case BFD_RELOC_SPARC_WDISP19: case BFD_RELOC_SPARC_WDISP22: - /* start-sanitize-v9 */ case BFD_RELOC_64: + case BFD_RELOC_SPARC_5: + case BFD_RELOC_SPARC_6: + case BFD_RELOC_SPARC_7: case BFD_RELOC_SPARC_10: case BFD_RELOC_SPARC_11: case BFD_RELOC_SPARC_HH22: @@ -2063,227 +2592,589 @@ tc_gen_reloc (section, fixp) case BFD_RELOC_SPARC_PC_HH22: case BFD_RELOC_SPARC_PC_HM10: case BFD_RELOC_SPARC_PC_LM22: - /* end-sanitize-v9 */ + case BFD_RELOC_SPARC_H44: + case BFD_RELOC_SPARC_M44: + case BFD_RELOC_SPARC_L44: + case BFD_RELOC_SPARC_HIX22: + case BFD_RELOC_SPARC_LOX10: code = fixp->fx_r_type; break; default: abort (); } + +#if defined (OBJ_ELF) || defined (OBJ_AOUT) + /* If we are generating PIC code, we need to generate a different + set of relocs. */ + +#ifdef OBJ_ELF +#define GOT_NAME "_GLOBAL_OFFSET_TABLE_" +#else +#define GOT_NAME "__GLOBAL_OFFSET_TABLE_" +#endif + + if (sparc_pic_code) + { + switch (code) + { + case BFD_RELOC_32_PCREL_S2: + if (! S_IS_DEFINED (fixp->fx_addsy) + || S_IS_COMMON (fixp->fx_addsy) + || S_IS_EXTERNAL (fixp->fx_addsy) + || S_IS_WEAK (fixp->fx_addsy)) + code = BFD_RELOC_SPARC_WPLT30; + break; + case BFD_RELOC_HI22: + if (fixp->fx_addsy != NULL + && strcmp (S_GET_NAME (fixp->fx_addsy), GOT_NAME) == 0) + code = BFD_RELOC_SPARC_PC22; + else + code = BFD_RELOC_SPARC_GOT22; + break; + case BFD_RELOC_LO10: + if (fixp->fx_addsy != NULL + && strcmp (S_GET_NAME (fixp->fx_addsy), GOT_NAME) == 0) + code = BFD_RELOC_SPARC_PC10; + else + code = BFD_RELOC_SPARC_GOT10; + break; + case BFD_RELOC_SPARC13: + code = BFD_RELOC_SPARC_GOT13; + break; + default: + break; + } + } +#endif /* defined (OBJ_ELF) || defined (OBJ_AOUT) */ + reloc->howto = bfd_reloc_type_lookup (stdoutput, code); - assert (reloc->howto != 0); - assert (!fixp->fx_pcrel == !reloc->howto->pc_relative); + if (reloc->howto == 0) + { + as_bad_where (fixp->fx_file, fixp->fx_line, + "internal error: can't export reloc type %d (`%s')", + fixp->fx_r_type, bfd_get_reloc_code_name (code)); + return 0; + } /* @@ Why fx_addnumber sometimes and fx_offset other times? */ - if (reloc->howto->pc_relative == 0) +#ifdef OBJ_AOUT + + if (reloc->howto->pc_relative == 0 + || code == BFD_RELOC_SPARC_PC10 + || code == BFD_RELOC_SPARC_PC22) reloc->addend = fixp->fx_addnumber; else reloc->addend = fixp->fx_offset - reloc->address; +#else /* elf or coff */ + + if (reloc->howto->pc_relative == 0 + || code == BFD_RELOC_SPARC_PC10 + || code == BFD_RELOC_SPARC_PC22) + reloc->addend = fixp->fx_addnumber; + else if ((fixp->fx_addsy->bsym->flags & BSF_SECTION_SYM) != 0) + reloc->addend = (section->vma + + fixp->fx_addnumber + + md_pcrel_from (fixp)); + else + reloc->addend = fixp->fx_offset; +#endif + return reloc; } + +/* We have no need to default values of symbols. */ - -#if 0 -/* for debugging only */ -static void -print_insn (insn) - struct sparc_it *insn; +/* ARGSUSED */ +symbolS * +md_undefined_symbol (name) + char *name; { - const char *const Reloc[] = { - "RELOC_8", - "RELOC_16", - "RELOC_32", - "RELOC_DISP8", - "RELOC_DISP16", - "RELOC_DISP32", - "RELOC_WDISP30", - "RELOC_WDISP22", - "RELOC_HI22", - "RELOC_22", - "RELOC_13", - "RELOC_LO10", - "RELOC_SFA_BASE", - "RELOC_SFA_OFF13", - "RELOC_BASE10", - "RELOC_BASE13", - "RELOC_BASE22", - "RELOC_PC10", - "RELOC_PC22", - "RELOC_JMP_TBL", - "RELOC_SEGOFF16", - "RELOC_GLOB_DAT", - "RELOC_JMP_SLOT", - "RELOC_RELATIVE", - "NO_RELOC" - }; + return 0; +} /* md_undefined_symbol() */ - if (insn->error) - fprintf (stderr, "ERROR: %s\n"); - fprintf (stderr, "opcode=0x%08x\n", insn->opcode); - fprintf (stderr, "reloc = %s\n", Reloc[insn->reloc]); - fprintf (stderr, "exp = {\n"); - fprintf (stderr, "\t\tX_add_symbol = %s\n", - ((insn->exp.X_add_symbol != NULL) - ? ((S_GET_NAME (insn->exp.X_add_symbol) != NULL) - ? S_GET_NAME (insn->exp.X_add_symbol) - : "???") - : "0")); - fprintf (stderr, "\t\tX_sub_symbol = %s\n", - ((insn->exp.X_op_symbol != NULL) - ? (S_GET_NAME (insn->exp.X_op_symbol) - ? S_GET_NAME (insn->exp.X_op_symbol) - : "???") - : "0")); - fprintf (stderr, "\t\tX_add_number = %d\n", - insn->exp.X_add_number); - fprintf (stderr, "}\n"); -} +/* Round up a section size to the appropriate boundary. */ +valueT +md_section_align (segment, size) + segT segment; + valueT size; +{ +#ifndef OBJ_ELF + /* This is not right for ELF; a.out wants it, and COFF will force + the alignment anyways. */ + valueT align = ((valueT) 1 + << (valueT) bfd_get_section_alignment (stdoutput, segment)); + valueT newsize; + /* turn alignment value into a mask */ + align--; + newsize = (size + align) & ~align; + return newsize; +#else + return size; #endif +} +/* Exactly what point is a PC-relative offset relative TO? + On the sparc, they're relative to the address of the offset, plus + its size. This gets us to the following instruction. + (??? Is this right? FIXME-SOON) */ +long +md_pcrel_from (fixP) + fixS *fixP; +{ + long ret; + + ret = fixP->fx_where + fixP->fx_frag->fr_address; + if (! sparc_pic_code + || fixP->fx_addsy == NULL + || (fixP->fx_addsy->bsym->flags & BSF_SECTION_SYM) != 0) + ret += fixP->fx_size; + return ret; +} + /* - * md_parse_option - * Invocation line includes a switch not recognized by the base assembler. - * See if it's a processor-specific option. These are: - * - * -bump - * Warn on architecture bumps. See also -A. - * - * -Av6, -Av7, -Av8, -Asparclite - * Select the architecture. Instructions or features not - * supported by the selected architecture cause fatal errors. - * - * The default is to start at v6, and bump the architecture up - * whenever an instruction is seen at a higher level. - * - * If -bump is specified, a warning is printing when bumping to - * higher levels. - * - * If an architecture is specified, all instructions must match - * that architecture. Any higher level instructions are flagged - * as errors. - * - * if both an architecture and -bump are specified, the - * architecture starts at the specified level, but bumps are - * warnings. - * - * start-sanitize-v9 - * -Av9 - * Another architecture switch. - * - * Note: - * Bumping between incompatible architectures is always an - * error. For example, from sparclite to v9. - * end-sanitize-v9 + * sort of like s_lcomm */ -int -md_parse_option (argP, cntP, vecP) - char **argP; - int *cntP; - char ***vecP; +#ifndef OBJ_ELF +static int max_alignment = 15; +#endif + +static void +s_reserve (ignore) + int ignore; { + char *name; char *p; - const char **arch; + char c; + int align; + int size; + int temp; + symbolS *symbolP; + + name = input_line_pointer; + c = get_symbol_end (); + p = input_line_pointer; + *p = c; + SKIP_WHITESPACE (); - if (!strcmp (*argP, "bump")) + if (*input_line_pointer != ',') { - warn_on_bump = 1; + as_bad ("Expected comma after name"); + ignore_rest_of_line (); + return; + } + + ++input_line_pointer; + + if ((size = get_absolute_expression ()) < 0) + { + as_bad ("BSS length (%d.) <0! Ignored.", size); + ignore_rest_of_line (); + return; + } /* bad length */ + + *p = 0; + symbolP = symbol_find_or_make (name); + *p = c; + if (strncmp (input_line_pointer, ",\"bss\"", 6) != 0 + && strncmp (input_line_pointer, ",\".bss\"", 7) != 0) + { + as_bad ("bad .reserve segment -- expected BSS segment"); + return; } - else if (**argP == 'A') + + if (input_line_pointer[2] == '.') + input_line_pointer += 7; + else + input_line_pointer += 6; + SKIP_WHITESPACE (); + + if (*input_line_pointer == ',') { - p = (*argP) + 1; + ++input_line_pointer; - for (arch = architecture_pname; *arch != NULL; ++arch) + SKIP_WHITESPACE (); + if (*input_line_pointer == '\n') { - if (strcmp (p, *arch) == 0) - { - break; - } /* found a match */ - } /* walk the pname table */ + as_bad ("Missing alignment"); + return; + } - if (*arch == NULL) + align = get_absolute_expression (); +#ifndef OBJ_ELF + if (align > max_alignment) { - as_bad ("unknown architecture: %s", p); + align = max_alignment; + as_warn ("Alignment too large: %d. assumed.", align); } - else +#endif + if (align < 0) { - current_architecture = (enum sparc_architecture) (arch - architecture_pname); - architecture_requested = 1; + align = 0; + as_warn ("Alignment negative. 0 assumed."); + } + + record_alignment (bss_section, align); + + /* convert to a power of 2 alignment */ + for (temp = 0; (align & 1) == 0; align >>= 1, ++temp);; + + if (align != 1) + { + as_bad ("Alignment not a power of 2"); + ignore_rest_of_line (); + return; + } /* not a power of two */ + + align = temp; + } /* if has optional alignment */ + else + align = 0; + + if (!S_IS_DEFINED (symbolP) +#ifdef OBJ_AOUT + && S_GET_OTHER (symbolP) == 0 + && S_GET_DESC (symbolP) == 0 +#endif + ) + { + if (! need_pass_2) + { + char *pfrag; + segT current_seg = now_seg; + subsegT current_subseg = now_subseg; + + subseg_set (bss_section, 1); /* switch to bss */ + + if (align) + frag_align (align, 0, 0); /* do alignment */ + + /* detach from old frag */ + if (S_GET_SEGMENT(symbolP) == bss_section) + symbolP->sy_frag->fr_symbol = NULL; + + symbolP->sy_frag = frag_now; + pfrag = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP, + (offsetT) size, (char *)0); + *pfrag = 0; + + S_SET_SEGMENT (symbolP, bss_section); + + subseg_set (current_seg, current_subseg); } } -#ifdef OBJ_ELF - else if (**argP == 'V') + else { - print_version_id (); + as_warn("Ignoring attempt to re-define symbol %s", + S_GET_NAME (symbolP)); + } /* if not redefining */ + + demand_empty_rest_of_line (); +} + +static void +s_common (ignore) + int ignore; +{ + char *name; + char c; + char *p; + int temp, size; + symbolS *symbolP; + + name = input_line_pointer; + c = get_symbol_end (); + /* just after name is now '\0' */ + p = input_line_pointer; + *p = c; + SKIP_WHITESPACE (); + if (*input_line_pointer != ',') + { + as_bad ("Expected comma after symbol-name"); + ignore_rest_of_line (); + return; } - else if (**argP == 'Q') + input_line_pointer++; /* skip ',' */ + if ((temp = get_absolute_expression ()) < 0) { - /* Qy - do emit .comment - Qn - do not emit .comment */ + as_bad (".COMMon length (%d.) <0! Ignored.", temp); + ignore_rest_of_line (); + return; } - else if (**argP == 's') + size = temp; + *p = 0; + symbolP = symbol_find_or_make (name); + *p = c; + if (S_IS_DEFINED (symbolP) && ! S_IS_COMMON (symbolP)) { - /* use .stab instead of .stab.excl */ + as_bad ("Ignoring attempt to re-define symbol"); + ignore_rest_of_line (); + return; } + if (S_GET_VALUE (symbolP) != 0) + { + if (S_GET_VALUE (symbolP) != size) + { + as_warn ("Length of .comm \"%s\" is already %ld. Not changed to %d.", + S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size); + } + } + else + { +#ifndef OBJ_ELF + S_SET_VALUE (symbolP, (valueT) size); + S_SET_EXTERNAL (symbolP); #endif - else if (strcmp (*argP, "sparc") == 0) + } + know (symbolP->sy_frag == &zero_address_frag); + if (*input_line_pointer != ',') { - /* Ignore -sparc, used by SunOS make default .s.o rule. */ + as_bad ("Expected comma after common length"); + ignore_rest_of_line (); + return; + } + input_line_pointer++; + SKIP_WHITESPACE (); + if (*input_line_pointer != '"') + { + temp = get_absolute_expression (); +#ifndef OBJ_ELF + if (temp > max_alignment) + { + temp = max_alignment; + as_warn ("Common alignment too large: %d. assumed", temp); + } +#endif + if (temp < 0) + { + temp = 0; + as_warn ("Common alignment negative; 0 assumed"); + } +#ifdef OBJ_ELF + if (symbolP->local) + { + segT old_sec; + int old_subsec; + char *p; + int align; + + old_sec = now_seg; + old_subsec = now_subseg; + align = temp; + record_alignment (bss_section, align); + subseg_set (bss_section, 0); + if (align) + frag_align (align, 0, 0); + if (S_GET_SEGMENT (symbolP) == bss_section) + symbolP->sy_frag->fr_symbol = 0; + symbolP->sy_frag = frag_now; + p = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, + (offsetT) size, (char *) 0); + *p = 0; + S_SET_SEGMENT (symbolP, bss_section); + S_CLEAR_EXTERNAL (symbolP); + subseg_set (old_sec, old_subsec); + } + else +#endif + { + allocate_common: + S_SET_VALUE (symbolP, (valueT) size); +#ifdef OBJ_ELF + S_SET_ALIGN (symbolP, temp); +#endif + S_SET_EXTERNAL (symbolP); + S_SET_SEGMENT (symbolP, bfd_com_section_ptr); + } } else { - /* Unknown option */ - (*argP)++; - return 0; + input_line_pointer++; + /* @@ Some use the dot, some don't. Can we get some consistency?? */ + if (*input_line_pointer == '.') + input_line_pointer++; + /* @@ Some say data, some say bss. */ + if (strncmp (input_line_pointer, "bss\"", 4) + && strncmp (input_line_pointer, "data\"", 5)) + { + while (*--input_line_pointer != '"') + ; + input_line_pointer--; + goto bad_common_segment; + } + while (*input_line_pointer++ != '"') + ; + goto allocate_common; } - **argP = '\0'; /* Done parsing this switch */ - return 1; -} /* md_parse_option() */ -/* We have no need to default values of symbols. */ +#ifdef BFD_ASSEMBLER + symbolP->bsym->flags |= BSF_OBJECT; +#endif -/* ARGSUSED */ -symbolS * -md_undefined_symbol (name) - char *name; + demand_empty_rest_of_line (); + return; + + { + bad_common_segment: + p = input_line_pointer; + while (*p && *p != '\n') + p++; + c = *p; + *p = '\0'; + as_bad ("bad .common segment %s", input_line_pointer + 1); + *p = c; + input_line_pointer = p; + ignore_rest_of_line (); + return; + } +} + +/* Handle the .empty pseudo-op. This supresses the warnings about + invalid delay slot usage. */ + +static void +s_empty (ignore) + int ignore; { - return 0; -} /* md_undefined_symbol() */ + /* The easy way to implement is to just forget about the last + instruction. */ + last_insn = NULL; +} -/* Parse an operand that is machine-specific. - We just return without modifying the expression if we have nothing - to do. */ +static void +s_seg (ignore) + int ignore; +{ -/* ARGSUSED */ -void -md_operand (expressionP) - expressionS *expressionP; + if (strncmp (input_line_pointer, "\"text\"", 6) == 0) + { + input_line_pointer += 6; + s_text (0); + return; + } + if (strncmp (input_line_pointer, "\"data\"", 6) == 0) + { + input_line_pointer += 6; + s_data (0); + return; + } + if (strncmp (input_line_pointer, "\"data1\"", 7) == 0) + { + input_line_pointer += 7; + s_data1 (); + return; + } + if (strncmp (input_line_pointer, "\"bss\"", 5) == 0) + { + input_line_pointer += 5; + /* We only support 2 segments -- text and data -- for now, so + things in the "bss segment" will have to go into data for now. + You can still allocate SEG_BSS stuff with .lcomm or .reserve. */ + subseg_set (data_section, 255); /* FIXME-SOMEDAY */ + return; + } + as_bad ("Unknown segment type"); + demand_empty_rest_of_line (); +} + +static void +s_data1 () { + subseg_set (data_section, 1); + demand_empty_rest_of_line (); } -/* Round up a section size to the appropriate boundary. */ -valueT -md_section_align (segment, size) - segT segment; - valueT size; +static void +s_proc (ignore) + int ignore; { -#ifdef OBJ_AOUT - /* Round all sects to multiple of 8 */ - size = (size + 7) & (valueT) ~7; -#endif - return size; + while (!is_end_of_line[(unsigned char) *input_line_pointer]) + { + ++input_line_pointer; + } + ++input_line_pointer; } -/* Exactly what point is a PC-relative offset relative TO? - On the sparc, they're relative to the address of the offset, plus - its size. This gets us to the following instruction. - (??? Is this right? FIXME-SOON) */ -long -md_pcrel_from (fixP) - fixS *fixP; +/* This static variable is set by s_uacons to tell sparc_cons_align + that the expession does not need to be aligned. */ + +static int sparc_no_align_cons = 0; + +/* This handles the unaligned space allocation pseudo-ops, such as + .uaword. .uaword is just like .word, but the value does not need + to be aligned. */ + +static void +s_uacons (bytes) + int bytes; +{ + /* Tell sparc_cons_align not to align this value. */ + sparc_no_align_cons = 1; + cons (bytes); +} + +/* If the --enforce-aligned-data option is used, we require .word, + et. al., to be aligned correctly. We do it by setting up an + rs_align_code frag, and checking in HANDLE_ALIGN to make sure that + no unexpected alignment was introduced. + + The SunOS and Solaris native assemblers enforce aligned data by + default. We don't want to do that, because gcc can deliberately + generate misaligned data if the packed attribute is used. Instead, + we permit misaligned data by default, and permit the user to set an + option to check for it. */ + +void +sparc_cons_align (nbytes) + int nbytes; { - return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address; + int nalign; + char *p; + + /* Only do this if we are enforcing aligned data. */ + if (! enforce_aligned_data) + return; + + if (sparc_no_align_cons) + { + /* This is an unaligned pseudo-op. */ + sparc_no_align_cons = 0; + return; + } + + nalign = 0; + while ((nbytes & 1) == 0) + { + ++nalign; + nbytes >>= 1; + } + + if (nalign == 0) + return; + + if (now_seg == absolute_section) + { + if ((abs_section_offset & ((1 << nalign) - 1)) != 0) + as_bad ("misaligned data"); + return; + } + + p = frag_var (rs_align_code, 1, 1, (relax_substateT) 0, + (symbolS *) NULL, (offsetT) nalign, (char *) NULL); + + record_alignment (now_seg, nalign); } -/* end of tc-sparc.c */ +/* This is where we do the unexpected alignment check. + This is called from HANDLE_ALIGN in tc-sparc.h. */ + +void +sparc_handle_align (fragp) + fragS *fragp; +{ + if (fragp->fr_type == rs_align_code + && fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix != 0) + as_bad_where (fragp->fr_file, fragp->fr_line, "misaligned data"); +}