OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* config/tc-mips.c (append_insn): Don't swap an instruction which 

sets a condition code with an instruction which uses a condition
	code.
	(mips_ip): In cases 'N' and 'M', look for $fccN rather than an
	immediate value.
This commit is contained in:
Ian Lance Taylor 1996-09-09 18:37:10 +00:00
parent 30b1724cc8
commit d31a3f5e76
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,5 +1,11 @@
Mon Sep 9 10:57:42 1996 Ian Lance Taylor <ian@cygnus.com>
* config/tc-mips.c (append_insn): Don't swap an instruction which
sets a condition code with an instruction which uses a condition
code.
(mips_ip): In cases 'N' and 'M', look for $fccN rather than an
immediate value.
* config/tc-mips.c (md_begin): Recognize r5000 for cpu. If
mips_cpu is 5000, set interlocks and cop_interlocks.
(mips_ip): Give a better error message if the ISA level is wrong.

31
gas/config/tc-mips.c
View File

@ -1417,7 +1417,13 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
&& insn_uses_reg (ip,
((prev_prev_insn.insn_opcode >> OP_SH_RT)
& OP_MASK_RT),
0)))
0))
/* If one instruction sets a condition code and the
other one uses a condition code, we can not swap. */
|| ((pinfo & INSN_READ_COND_CODE)
&& (prev_pinfo & INSN_WRITE_COND_CODE))
|| ((pinfo & INSN_WRITE_COND_CODE)
&& (prev_pinfo & INSN_READ_COND_CODE)))
{
/* We could do even better for unconditional branches to
portions of this object file; we could pick up the
@ -5891,20 +5897,23 @@ mips_ip (str, ip)
case 'N': /* 3 bit branch condition code */
case 'M': /* 3 bit compare condition code */
my_getExpression (&imm_expr, s);
check_absolute_expr (ip, &imm_expr);
if ((unsigned long) imm_expr.X_add_number > 7)
if (strncmp (s, "$fcc", 4) != 0)
break;
s += 4;
regno = 0;
do
{
as_warn ("Condition code > 7 (%ld)",
(long) imm_expr.X_add_number);
imm_expr.X_add_number &= 7;
regno *= 10;
regno += *s - '0';
++s;
}
while (isdigit (*s));
if (regno > 7)
as_bad ("invalid condition code register $fcc%d", regno);
if (*args == 'N')
ip->insn_opcode |= imm_expr.X_add_number << OP_SH_BCC;
ip->insn_opcode |= regno << OP_SH_BCC;
else
ip->insn_opcode |= imm_expr.X_add_number << OP_SH_CCC;
imm_expr.X_op = O_absent;
s = expr_end;
ip->insn_opcode |= regno << OP_SH_CCC;
continue;
default: