X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-mips.c;h=562da649332bd3cc477242f19c762f80a4149b4f;hb=0674ee5dada21c8deec690ca66d5b2870f13ea49;hp=1e195d92701fbaa1b7a1eb0ef3275c42a09832bf;hpb=be0fcbee1d47558af13288c6aece922dd4be6df5;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 1e195d9270..562da64933 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2111,7 +2111,7 @@ mips_lookup_ase (const char *name) static inline unsigned int micromips_insn_length (const struct mips_opcode *mo) { - return (mo->mask >> 16) == 0 ? 2 : 4; + return mips_opcode_32bit_p (mo) ? 4 : 2; } /* Return the length of MIPS16 instruction OPCODE. */ @@ -3258,7 +3258,8 @@ is_opcode_valid_16 (const struct mips_opcode *mo) } /* Return TRUE if the size of the microMIPS opcode MO matches one - explicitly requested. Always TRUE in the standard MIPS mode. */ + explicitly requested. Always TRUE in the standard MIPS mode. + Use is_size_valid_16 for MIPS16 opcodes. */ static bfd_boolean is_size_valid (const struct mips_opcode *mo) @@ -3280,6 +3281,23 @@ is_size_valid (const struct mips_opcode *mo) return forced_insn_length == micromips_insn_length (mo); } +/* Return TRUE if the size of the MIPS16 opcode MO matches one + explicitly requested. */ + +static bfd_boolean +is_size_valid_16 (const struct mips_opcode *mo) +{ + if (!forced_insn_length) + return TRUE; + if (mo->pinfo == INSN_MACRO) + return FALSE; + if (forced_insn_length == 2 && mips_opcode_32bit_p (mo)) + return FALSE; + if (forced_insn_length == 4 && (mo->pinfo2 & INSN2_SHORT_ONLY)) + return FALSE; + return TRUE; +} + /* Return TRUE if the microMIPS opcode MO is valid for the delay slot of the preceding instruction. Always TRUE in the standard MIPS mode. @@ -3356,7 +3374,7 @@ validate_mips_insn (const struct mips_opcode *opcode, default: if (!decode_operand) - operand = decode_mips16_operand (*s, FALSE); + operand = decode_mips16_operand (*s, mips_opcode_32bit_p (opcode)); else operand = decode_operand (s); if (!operand && opcode->pinfo != INSN_MACRO) @@ -3414,18 +3432,9 @@ static int validate_mips16_insn (const struct mips_opcode *opcode, struct mips_operand_array *operands) { - if (opcode->args[0] == 'a' || opcode->args[0] == 'i') - { - /* In this case OPCODE defines the first 16 bits in a 32-bit jump - instruction. Use TMP to describe the full instruction. */ - struct mips_opcode tmp; + unsigned long insn_bits = mips_opcode_32bit_p (opcode) ? 0xffffffff : 0xffff; - tmp = *opcode; - tmp.match <<= 16; - tmp.mask <<= 16; - return validate_mips_insn (&tmp, 0xffffffff, 0, operands); - } - return validate_mips_insn (opcode, 0xffff, 0, operands); + return validate_mips_insn (opcode, insn_bits, 0, operands); } /* The microMIPS version of validate_mips_insn. */ @@ -7357,9 +7366,23 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, } else if (mips_opts.mips16 && *reloc_type > BFD_RELOC_UNUSED) { + bfd_boolean require_unextended; + bfd_boolean require_extended; symbolS *symbol; offsetT offset; + if (forced_insn_length != 0) + { + require_unextended = forced_insn_length == 2; + require_extended = forced_insn_length == 4; + } + else + { + require_unextended = (mips_opts.noautoextend + && !mips_opcode_32bit_p (ip->insn_mo)); + require_extended = 0; + } + /* We need to set up a variant frag. */ gas_assert (address_expr != NULL); /* Pass any `O_symbol' expression unchanged as an `expr_section' @@ -7378,7 +7401,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, add_relaxed_insn (ip, 4, 0, RELAX_MIPS16_ENCODE (*reloc_type - BFD_RELOC_UNUSED, - forced_insn_length == 2, forced_insn_length == 4, + require_unextended, require_extended, delayed_branch_p (&history[0]), history[0].mips16_absolute_jump_p), symbol, offset); @@ -8039,9 +8062,17 @@ match_mips16_insn (struct mips_cl_insn *insn, const struct mips_opcode *opcode, const char *args; const struct mips_operand *operand; const struct mips_operand *ext_operand; + int required_insn_length; struct mips_arg_info arg; int relax_char; + if (forced_insn_length) + required_insn_length = forced_insn_length; + else if (mips_opts.noautoextend && !mips_opcode_32bit_p (opcode)) + required_insn_length = 2; + else + required_insn_length = 0; + create_insn (insn, opcode); imm_expr.X_op = O_absent; offset_expr.X_op = O_absent; @@ -8097,13 +8128,13 @@ match_mips16_insn (struct mips_cl_insn *insn, const struct mips_opcode *opcode, &value)) { mips16_immed (NULL, 0, relax_char, *offset_reloc, value, - forced_insn_length, &insn->insn_opcode); + required_insn_length, &insn->insn_opcode); offset_expr.X_op = O_absent; *offset_reloc = BFD_RELOC_UNUSED; } else if (relax_char && *offset_reloc != BFD_RELOC_UNUSED) { - if (forced_insn_length == 2) + if (required_insn_length == 2) set_insn_error (0, _("invalid unextended operand value")); forced_insn_length = 4; insn->insn_opcode |= MIPS16_EXTEND; @@ -8150,22 +8181,14 @@ match_mips16_insn (struct mips_cl_insn *insn, const struct mips_opcode *opcode, case 'a': case 'i': *offset_reloc = BFD_RELOC_MIPS16_JMP; - insn->insn_opcode <<= 16; break; } - operand = decode_mips16_operand (c, FALSE); + operand = decode_mips16_operand (c, mips_opcode_32bit_p (opcode)); if (!operand) abort (); - /* '6' is a special case. It is used for BREAK and SDBBP, - whose operands are only meaningful to the software that decodes - them. This means that there is no architectural reason why - they cannot be prefixed by EXTEND, but in practice, - exception handlers will only look at the instruction - itself. We therefore allow '6' to be extended when - disassembling but not when assembling. */ - if (operand->type != OP_PCREL && c != '6') + if (operand->type != OP_PCREL) { ext_operand = decode_mips16_operand (c, TRUE); if (operand != ext_operand) @@ -8315,11 +8338,13 @@ match_mips16_insns (struct mips_cl_insn *insn, const struct mips_opcode *first, { const struct mips_opcode *opcode; bfd_boolean seen_valid_for_isa; + bfd_boolean seen_valid_for_size; /* Search for a match, ignoring alternatives that don't satisfy the current ISA. There are no separate entries for extended forms so we deal with forced_length later. */ seen_valid_for_isa = FALSE; + seen_valid_for_size = FALSE; opcode = first; do { @@ -8327,8 +8352,12 @@ match_mips16_insns (struct mips_cl_insn *insn, const struct mips_opcode *first, if (is_opcode_valid_16 (opcode)) { seen_valid_for_isa = TRUE; - if (match_mips16_insn (insn, opcode, tokens)) - return TRUE; + if (is_size_valid_16 (opcode)) + { + seen_valid_for_size = TRUE; + if (match_mips16_insn (insn, opcode, tokens)) + return TRUE; + } } ++opcode; } @@ -8343,6 +8372,19 @@ match_mips16_insns (struct mips_cl_insn *insn, const struct mips_opcode *first, return TRUE; } + /* Handle the case where we didn't try to match an instruction because + all the alternatives were of the wrong size. */ + if (!seen_valid_for_size) + { + if (forced_insn_length == 2) + set_insn_error + (0, _("unrecognized unextended version of MIPS16 opcode")); + else + set_insn_error + (0, _("unrecognized extended version of MIPS16 opcode")); + return TRUE; + } + return FALSE; } @@ -8723,7 +8765,6 @@ mips16_macro_build (expressionS *ep, const char *name, const char *fmt, break; case '<': - case '>': case '4': case '5': case 'H': @@ -13811,13 +13852,14 @@ mips16_ip (char *str, struct mips_cl_insn *insn) char *end, *s, c; struct mips_opcode *first; struct mips_operand_token *tokens; - - forced_insn_length = 0; + unsigned int l; for (s = str; ISLOWER (*s); ++s) ; end = s; c = *end; + + l = 0; switch (c) { case '\0': @@ -13828,26 +13870,27 @@ mips16_ip (char *str, struct mips_cl_insn *insn) break; case '.': - if (s[1] == 't' && s[2] == ' ') + s++; + if (*s == 't') { - forced_insn_length = 2; - s += 3; - break; + l = 2; + s++; } - else if (s[1] == 'e' && s[2] == ' ') + else if (*s == 'e') { - forced_insn_length = 4; - s += 3; - break; + l = 4; + s++; } + if (*s == '\0') + break; + else if (*s++ == ' ') + break; /* Fall through. */ default: set_insn_error (0, _("unrecognized opcode")); return; } - - if (mips_opts.noautoextend && !forced_insn_length) - forced_insn_length = 2; + forced_insn_length = l; *end = 0; first = (struct mips_opcode *) hash_find (mips16_op_hash, str); @@ -18370,10 +18413,10 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp) _("unsupported relocation")); break; } - if (reloc != BFD_RELOC_NONE) + if (reloc == BFD_RELOC_NONE) + ; + else if (ext) { - gas_assert (ext); - exp.X_op = O_symbol; exp.X_add_symbol = fragp->fr_symbol; exp.X_add_number = fragp->fr_offset; @@ -18388,6 +18431,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp) in 2 octets. */ fixp->fx_no_overflow = 1; } + else + as_bad_where (fragp->fr_file, fragp->fr_line, + _("invalid unextended operand value")); } else mips16_immed (fragp->fr_file, fragp->fr_line, type,