* config/tc-mips.c (macro_build_jalr): Reverse a negative

conditional.
	(mips_ip): Likewise.
This commit is contained in:
Maciej W. Rozycki 2011-11-16 12:27:06 +00:00
parent 514f48bb1d
commit 2906b03761
2 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2011-11-16 Maciej W. Rozycki <macro@codesourcery.com>
* config/tc-mips.c (macro_build_jalr): Reverse a negative
conditional.
(mips_ip): Likewise.
2011-11-16 Catherine Moore <clm@codesourcery.com> 2011-11-16 Catherine Moore <clm@codesourcery.com>
Maciej W. Rozycki <macro@codesourcery.com> Maciej W. Rozycki <macro@codesourcery.com>

View File

@ -5260,9 +5260,7 @@ macro_build_jalr (expressionS *ep, int cprestore)
frag_grow (8); frag_grow (8);
f = frag_more (0); f = frag_more (0);
} }
if (!mips_opts.micromips) if (mips_opts.micromips)
macro_build (NULL, "jalr", "d,s", RA, PIC_CALL_REG);
else
{ {
jalr = mips_opts.noreorder && !cprestore ? "jalr" : "jalrs"; jalr = mips_opts.noreorder && !cprestore ? "jalr" : "jalrs";
if (MIPS_JALR_HINT_P (ep)) if (MIPS_JALR_HINT_P (ep))
@ -5270,6 +5268,8 @@ macro_build_jalr (expressionS *ep, int cprestore)
else else
macro_build (NULL, jalr, "mj", PIC_CALL_REG); macro_build (NULL, jalr, "mj", PIC_CALL_REG);
} }
else
macro_build (NULL, "jalr", "d,s", RA, PIC_CALL_REG);
if (MIPS_JALR_HINT_P (ep)) if (MIPS_JALR_HINT_P (ep))
fix_new_exp (frag_now, f - frag_now->fr_literal, 4, ep, FALSE, jalr_reloc); fix_new_exp (frag_now, f - frag_now->fr_literal, 4, ep, FALSE, jalr_reloc);
} }
@ -10964,9 +10964,9 @@ mips_ip (char *str, struct mips_cl_insn *ip)
case '\\': /* 3-bit bit position. */ case '\\': /* 3-bit bit position. */
{ {
unsigned long mask = (!mips_opts.micromips unsigned long mask = (mips_opts.micromips
? OP_MASK_3BITPOS ? MICROMIPSOP_MASK_3BITPOS
: MICROMIPSOP_MASK_3BITPOS); : OP_MASK_3BITPOS);
my_getExpression (&imm_expr, s); my_getExpression (&imm_expr, s);
check_absolute_expr (ip, &imm_expr); check_absolute_expr (ip, &imm_expr);