X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-sparc.c;h=60b5dae03867a739223bda0350f669dced4c5a42;hb=d01ecef67288811d520d1ffe26ac36350882b213;hp=da9252b6ef0d7b0e53c05c2a8cbbd7fe890e77d5;hpb=ae6063d440ba5ec28af81e9fc899cc099561339e;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c index da9252b6ef..60b5dae038 100644 --- a/gas/config/tc-sparc.c +++ b/gas/config/tc-sparc.c @@ -1,6 +1,6 @@ /* tc-sparc.c -- Assemble for the SPARC Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write - to the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + to the Free Software Foundation, 51 Franklin Street - Fifth Floor, + Boston, MA 02110-1301, USA. */ #include @@ -26,6 +26,7 @@ #include "subsegs.h" #include "opcode/sparc.h" +#include "dw2gencfi.h" #ifdef OBJ_ELF #include "elf/sparc.h" @@ -116,6 +117,9 @@ static int target_little_endian_data; /* Symbols for global registers on v9. */ static symbolS *globals[8]; +/* The dwarf2 data alignment, adjusted for 32 or 64 bit. */ +int sparc_cie_data_alignment; + /* V9 and 86x have 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. @@ -129,7 +133,7 @@ static symbolS *globals[8]; /* Handle of the OPCODE hash table. */ static struct hash_control *op_hash; -static int log2 PARAMS ((int)); +static int mylog2 PARAMS ((int)); static void s_data1 PARAMS ((void)); static void s_seg PARAMS ((int)); static void s_proc PARAMS ((int)); @@ -161,8 +165,6 @@ const pseudo_typeS md_pseudo_table[] = {"uaword", s_uacons, 4}, {"uaxword", s_uacons, 8}, #ifdef OBJ_ELF - {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0}, - {"loc", dwarf2_directive_loc, 0}, /* These are specific to sparc/svr4. */ {"2byte", s_uacons, 2}, {"4byte", s_uacons, 4}, @@ -725,7 +727,7 @@ struct {NULL, NULL, NULL}, }; -/* sparc64 priviledged registers. */ +/* sparc64 privileged registers. */ struct priv_reg_entry { @@ -800,6 +802,7 @@ md_begin () if (! default_init_p) init_default_arch (); + sparc_cie_data_alignment = sparc_arch_size == 64 ? -8 : -4; op_hash = hash_new (); while (i < (unsigned int) sparc_num_opcodes) @@ -1301,11 +1304,12 @@ md_assemble (str) know (str); special_case = sparc_ip (str, &insn); + if (insn == NULL) + return; /* 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 + if (last_insn != NULL && (insn->flags & F_FBR) != 0 && (last_insn->flags & F_DELAYED) != 0 /* ??? This test isn't completely accurate. We assume anything with @@ -1318,7 +1322,6 @@ md_assemble (str) 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) @@ -1414,7 +1417,9 @@ sparc_ip (str, pinsn) break; default: - as_fatal (_("Unknown opcode: `%s'"), str); + as_bad (_("Unknown opcode: `%s'"), str); + *pinsn = NULL; + return special_case; } insn = (struct sparc_opcode *) hash_find (op_hash, str); *pinsn = insn; @@ -1806,10 +1811,88 @@ sparc_ip (str, pinsn) break; case '\0': /* End of args. */ - if (*s == '\0') + if (s[0] == ',' && s[1] == '%') { - match = 1; + static const struct tls_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; + /* 1 if call. */ + int call; + } tls_ops[] = { + { "tgd_add", 7, BFD_RELOC_SPARC_TLS_GD_ADD, 0 }, + { "tgd_call", 8, BFD_RELOC_SPARC_TLS_GD_CALL, 1 }, + { "tldm_add", 8, BFD_RELOC_SPARC_TLS_LDM_ADD, 0 }, + { "tldm_call", 9, BFD_RELOC_SPARC_TLS_LDM_CALL, 1 }, + { "tldo_add", 8, BFD_RELOC_SPARC_TLS_LDO_ADD, 0 }, + { "tie_ldx", 7, BFD_RELOC_SPARC_TLS_IE_LDX, 0 }, + { "tie_ld", 6, BFD_RELOC_SPARC_TLS_IE_LD, 0 }, + { "tie_add", 7, BFD_RELOC_SPARC_TLS_IE_ADD, 0 } + }; + const struct tls_ops *o; + char *s1; + int npar = 0; + + for (o = tls_ops; o->name; o++) + if (strncmp (s + 2, o->name, o->len) == 0) + break; + if (o->name == NULL) + break; + + if (s[o->len + 2] != '(') + { + as_bad (_("Illegal operands: %%%s requires arguments in ()"), o->name); + return special_case; + } + + if (! o->call && the_insn.reloc != BFD_RELOC_NONE) + { + as_bad (_("Illegal operands: %%%s cannot be used together with other relocs in the insn ()"), + o->name); + return special_case; + } + + if (o->call + && (the_insn.reloc != BFD_RELOC_32_PCREL_S2 + || the_insn.exp.X_add_number != 0 + || the_insn.exp.X_add_symbol + != symbol_find_or_make ("__tls_get_addr"))) + { + as_bad (_("Illegal operands: %%%s can be only used with call __tls_get_addr"), + o->name); + return special_case; + } + + the_insn.reloc = o->reloc; + memset (&the_insn.exp, 0, sizeof (the_insn.exp)); + s += o->len + 3; + + for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++) + if (*s1 == '(') + npar++; + else if (*s1 == ')') + { + if (!npar) + break; + npar--; + } + + if (*s1 != ')') + { + as_bad (_("Illegal operands: %%%s requires arguments in ()"), o->name); + return special_case; + } + + *s1 = '\0'; + (void) get_expression (s); + *s1 = ')'; + s = s1 + 1; } + if (*s == '\0') + match = 1; break; case '+': @@ -2065,6 +2148,12 @@ sparc_ip (str, pinsn) { if (SPARC_OPCODE_ARCH_V9_P (max_architecture)) { + if (*args == 'e' || *args == 'f' || *args == 'g') + { + error_message + = _(": There are only 32 single precision f registers; [0-31]"); + goto error; + } v9_arg_p = 1; mask -= 31; /* wrap high bit */ } @@ -2144,7 +2233,7 @@ sparc_ip (str, pinsn) { char *s1; char *op_arg = NULL; - expressionS op_exp; + static expressionS op_exp; bfd_reloc_code_real_type old_reloc = the_insn.reloc; /* Check for %hi, etc. */ @@ -2176,6 +2265,18 @@ sparc_ip (str, pinsn) { "l44", 3, BFD_RELOC_SPARC_L44, 1, 0 }, { "uhi", 3, BFD_RELOC_SPARC_HH22, 1, 0 }, { "ulo", 3, BFD_RELOC_SPARC_HM10, 1, 0 }, + { "tgd_hi22", 8, BFD_RELOC_SPARC_TLS_GD_HI22, 0, 0 }, + { "tgd_lo10", 8, BFD_RELOC_SPARC_TLS_GD_LO10, 0, 0 }, + { "tldm_hi22", 9, BFD_RELOC_SPARC_TLS_LDM_HI22, 0, 0 }, + { "tldm_lo10", 9, BFD_RELOC_SPARC_TLS_LDM_LO10, 0, 0 }, + { "tldo_hix22", 10, BFD_RELOC_SPARC_TLS_LDO_HIX22, 0, + 0 }, + { "tldo_lox10", 10, BFD_RELOC_SPARC_TLS_LDO_LOX10, 0, + 0 }, + { "tie_hi22", 8, BFD_RELOC_SPARC_TLS_IE_HI22, 0, 0 }, + { "tie_lo10", 8, BFD_RELOC_SPARC_TLS_IE_LO10, 0, 0 }, + { "tle_hix22", 9, BFD_RELOC_SPARC_TLS_LE_HIX22, 0, 0 }, + { "tle_lox10", 9, BFD_RELOC_SPARC_TLS_LE_LOX10, 0, 0 }, { NULL, 0, 0, 0, 0 } }; const struct ops *o; @@ -2378,12 +2479,19 @@ sparc_ip (str, pinsn) goto error; } - /* Constants that won't fit are checked in md_apply_fix3 + if (the_insn.reloc >= BFD_RELOC_SPARC_TLS_GD_HI22 + && the_insn.reloc <= BFD_RELOC_SPARC_TLS_TPOFF64) + { + error_message = _(": TLS operand can't be a constant"); + goto error; + } + + /* Constants that won't fit are checked in md_apply_fix 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 + all the various cases (e.g. in md_apply_fix and bfd_install_relocation) so duplicating all that code here isn't right. */ } @@ -2771,7 +2879,7 @@ output_insn (insn, the_insn) 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 + own overflow checking in md_apply_fix. 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; @@ -2890,7 +2998,7 @@ md_number_to_chars (buf, val, n) hold. */ void -md_apply_fix3 (fixP, valP, segment) +md_apply_fix (fixP, valP, segment) fixS *fixP; valueT *valP; segT segment ATTRIBUTE_UNUSED; @@ -2906,7 +3014,41 @@ md_apply_fix3 (fixP, valP, segment) #ifdef OBJ_ELF /* SPARC ELF relocations don't use an addend in the data field. */ if (fixP->fx_addsy != NULL) - return; + { + switch (fixP->fx_r_type) + { + case BFD_RELOC_SPARC_TLS_GD_HI22: + case BFD_RELOC_SPARC_TLS_GD_LO10: + case BFD_RELOC_SPARC_TLS_GD_ADD: + case BFD_RELOC_SPARC_TLS_GD_CALL: + case BFD_RELOC_SPARC_TLS_LDM_HI22: + case BFD_RELOC_SPARC_TLS_LDM_LO10: + case BFD_RELOC_SPARC_TLS_LDM_ADD: + case BFD_RELOC_SPARC_TLS_LDM_CALL: + case BFD_RELOC_SPARC_TLS_LDO_HIX22: + case BFD_RELOC_SPARC_TLS_LDO_LOX10: + case BFD_RELOC_SPARC_TLS_LDO_ADD: + case BFD_RELOC_SPARC_TLS_IE_HI22: + case BFD_RELOC_SPARC_TLS_IE_LO10: + case BFD_RELOC_SPARC_TLS_IE_LD: + case BFD_RELOC_SPARC_TLS_IE_LDX: + case BFD_RELOC_SPARC_TLS_IE_ADD: + case BFD_RELOC_SPARC_TLS_LE_HIX22: + case BFD_RELOC_SPARC_TLS_LE_LOX10: + case BFD_RELOC_SPARC_TLS_DTPMOD32: + case BFD_RELOC_SPARC_TLS_DTPMOD64: + case BFD_RELOC_SPARC_TLS_DTPOFF32: + case BFD_RELOC_SPARC_TLS_DTPOFF64: + case BFD_RELOC_SPARC_TLS_TPOFF32: + case BFD_RELOC_SPARC_TLS_TPOFF64: + S_SET_THREAD_LOCAL (fixP->fx_addsy); + + default: + break; + } + + return; + } #endif /* This is a hack. There should be a better way to @@ -3305,6 +3447,26 @@ tc_gen_reloc (section, fixp) case BFD_RELOC_SPARC_PLT64: case BFD_RELOC_VTABLE_ENTRY: case BFD_RELOC_VTABLE_INHERIT: + case BFD_RELOC_SPARC_TLS_GD_HI22: + case BFD_RELOC_SPARC_TLS_GD_LO10: + case BFD_RELOC_SPARC_TLS_GD_ADD: + case BFD_RELOC_SPARC_TLS_GD_CALL: + case BFD_RELOC_SPARC_TLS_LDM_HI22: + case BFD_RELOC_SPARC_TLS_LDM_LO10: + case BFD_RELOC_SPARC_TLS_LDM_ADD: + case BFD_RELOC_SPARC_TLS_LDM_CALL: + case BFD_RELOC_SPARC_TLS_LDO_HIX22: + case BFD_RELOC_SPARC_TLS_LDO_LOX10: + case BFD_RELOC_SPARC_TLS_LDO_ADD: + case BFD_RELOC_SPARC_TLS_IE_HI22: + case BFD_RELOC_SPARC_TLS_IE_LO10: + case BFD_RELOC_SPARC_TLS_IE_LD: + case BFD_RELOC_SPARC_TLS_IE_LDX: + case BFD_RELOC_SPARC_TLS_IE_ADD: + case BFD_RELOC_SPARC_TLS_LE_HIX22: + case BFD_RELOC_SPARC_TLS_LE_LOX10: + case BFD_RELOC_SPARC_TLS_DTPOFF32: + case BFD_RELOC_SPARC_TLS_DTPOFF64: code = fixp->fx_r_type; break; default: @@ -3393,7 +3555,9 @@ tc_gen_reloc (section, fixp) && code != BFD_RELOC_SPARC_WDISP22 && code != BFD_RELOC_SPARC_WDISP16 && code != BFD_RELOC_SPARC_WDISP19 - && code != BFD_RELOC_SPARC_WPLT30) + && code != BFD_RELOC_SPARC_WPLT30 + && code != BFD_RELOC_SPARC_TLS_GD_CALL + && code != BFD_RELOC_SPARC_TLS_LDM_CALL) reloc->addend = fixp->fx_addnumber; else if (symbol_section_p (fixp->fx_addsy)) reloc->addend = (section->vma @@ -3475,7 +3639,7 @@ md_pcrel_from (fixP) of two. */ static int -log2 (value) +mylog2 (value) int value; { int shift; @@ -3577,7 +3741,7 @@ s_reserve (ignore) if (align != 0) { - temp = log2 (align); + temp = mylog2 (align); if (temp < 0) { as_bad (_("alignment not a power of 2")); @@ -3647,7 +3811,7 @@ s_common (ignore) char *name; char c; char *p; - int temp, size; + offsetT temp, size; symbolS *symbolP; name = input_line_pointer; @@ -3668,7 +3832,8 @@ s_common (ignore) if ((temp = get_absolute_expression ()) < 0) { - as_bad (_(".COMMon length (%d.) <0! Ignored."), temp); + as_bad (_(".COMMon length (%lu) out of range ignored"), + (unsigned long) temp); ignore_rest_of_line (); return; } @@ -3686,8 +3851,8 @@ s_common (ignore) { if (S_GET_VALUE (symbolP) != (valueT) size) { - as_warn (_("Length of .comm \"%s\" is already %ld. Not changed to %d."), - S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size); + as_warn (_("Length of .comm \"%s\" is already %ld. Not changed to %ld."), + S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), (long) size); } } else @@ -3714,7 +3879,7 @@ s_common (ignore) if (temp > max_alignment) { temp = max_alignment; - as_warn (_("alignment too large; assuming %d"), temp); + as_warn (_("alignment too large; assuming %ld"), (long) temp); } #endif @@ -3739,7 +3904,7 @@ s_common (ignore) if (temp == 0) align = 0; else - align = log2 (temp); + align = mylog2 (temp); if (align < 0) { @@ -3818,7 +3983,7 @@ s_common (ignore) } } -/* Handle the .empty pseudo-op. This supresses the warnings about +/* Handle the .empty pseudo-op. This suppresses the warnings about invalid delay slot usage. */ static void @@ -3885,7 +4050,7 @@ s_proc (ignore) } /* This static variable is set by s_uacons to tell sparc_cons_align - that the expession does not need to be aligned. */ + that the expression does not need to be aligned. */ static int sparc_no_align_cons = 0; @@ -4062,7 +4227,7 @@ sparc_cons_align (nbytes) if (sparc_no_align_cons) return; - nalign = log2 (nbytes); + nalign = mylog2 (nbytes); if (nalign == 0) return; @@ -4196,6 +4361,16 @@ sparc_cons (exp, size) sparc_cons_special_reloc = "plt"; } } + else if (strncmp (input_line_pointer + 3, "tls_dtpoff", 10) == 0) + { + if (size != 4 && size != 8) + as_bad (_("Illegal operands: %%r_tls_dtpoff in %d-byte data field"), size); + else + { + input_line_pointer += 13; + sparc_cons_special_reloc = "tls_dtpoff"; + } + } if (sparc_cons_special_reloc) { int bad = 0; @@ -4329,12 +4504,18 @@ cons_fix_new_sparc (frag, where, nbytes, exp) case 8: r = BFD_RELOC_64_PCREL; break; default: abort (); } - else + else if (*sparc_cons_special_reloc == 'p') switch (nbytes) { case 4: r = BFD_RELOC_SPARC_PLT32; break; case 8: r = BFD_RELOC_SPARC_PLT64; break; } + else + switch (nbytes) + { + case 4: r = BFD_RELOC_SPARC_TLS_DTPOFF32; break; + case 8: r = BFD_RELOC_SPARC_TLS_DTPOFF64; break; + } } else if (sparc_no_align_cons) { @@ -4348,4 +4529,63 @@ cons_fix_new_sparc (frag, where, nbytes, exp) } fix_new_exp (frag, where, (int) nbytes, exp, 0, r); + sparc_cons_special_reloc = NULL; +} + +void +sparc_cfi_frame_initial_instructions () +{ + cfi_add_CFA_def_cfa (14, sparc_arch_size == 64 ? 0x7ff : 0); +} + +int +sparc_regname_to_dw2regnum (const char *regname) +{ + char *p, *q; + + if (!regname[0]) + return -1; + + q = "goli"; + p = strchr (q, regname[0]); + if (p) + { + if (regname[1] < '0' || regname[1] > '8' || regname[2]) + return -1; + return (p - q) * 8 + regname[1] - '0'; + } + if (regname[0] == 's' && regname[1] == 'p' && !regname[2]) + return 14; + if (regname[0] == 'f' && regname[1] == 'p' && !regname[2]) + return 30; + if (regname[0] == 'f' || regname[0] == 'r') + { + unsigned int regnum; + + regnum = strtoul (regname + 1, &q, 10); + if (p == q || *q) + return -1; + if (regnum >= ((regname[0] == 'f' + && SPARC_OPCODE_ARCH_V9_P (max_architecture)) + ? 64 : 32)) + return -1; + if (regname[0] == 'f') + { + regnum += 32; + if (regnum >= 64 && (regnum & 1)) + return -1; + } + return regnum; + } + return -1; +} + +void +sparc_cfi_emit_pcrel_expr (expressionS *exp, unsigned int nbytes) +{ + sparc_cons_special_reloc = "disp"; + sparc_no_align_cons = 1; + emit_expr (exp, nbytes); + sparc_no_align_cons = 0; + sparc_cons_special_reloc = NULL; }