espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 13:56:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/tc-mips.c (gpr_interlocks): The r5900 always has

Browse Source 
gpr interlocks.
Fixes minor assembler testsuite failure on the r5900.
This commit is contained in:
Jeff Law
1998-12-09 19:33:06 +00:00
parent 4883439b08
commit 3b35597c52
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
start-sanitize-r5900
Wed Dec 9 12:29:23 1998 Jeffrey A Law (law@cygnus.com)
* config/tc-mips.c (gpr_interlocks): The r5900 always has
gpr interlocks.
end-sanitize-r5900
Tue Dec 8 19:51:50 1998 Mark Klein <mklein@dis.com> Tue Dec 8 19:51:50 1998 Mark Klein <mklein@dis.com>
* configure.in (hppa-*-mpeix*): New target. * configure.in (hppa-*-mpeix*): New target.

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

@ -249,7 +249,7 @@ static int mips_4900 = -1;
used to set the default value of these options, as is the case for used to set the default value of these options, as is the case for
mips_4010. */ mips_4010. */
#define hilo_interlocks (mips_4010 || mips_3900 \ #define hilo_interlocks (mips_4010 \
/* start-sanitize-tx49 */ \ /* start-sanitize-tx49 */ \
|| mips_cpu == 4900 || mips_4900 \ || mips_cpu == 4900 || mips_4900 \
/* end-sanitize-tx49 */ \ /* end-sanitize-tx49 */ \
@ -263,12 +263,15 @@ static int mips_4900 = -1;
/* Whether the processor uses hardware interlocks to protect reads /* Whether the processor uses hardware interlocks to protect reads
from the GPRs, and thus does not require nops to be inserted. */ from the GPRs, and thus does not require nops to be inserted. */
#define gpr_interlocks (mips_opts.isa >= 2 || mips_3900) #define gpr_interlocks \
/* start-sanitize-cygnus */ (mips_opts.isa >= 2 \
#undef gpr_interlocks /* start-sanitize-cygnus */ \
#define gpr_interlocks (mips_opts.isa >= 2 || mips_3900 || mips_5400) || mips_5400 \
/* end-sanitize-cygnus */ /* end-sanitize-cygnus */ \
/* start-sanitize-r5900 */ \
|| mips_5900 \
/* end-sanitize-r5900 */ \
|| mips_3900)
/* As with other "interlocks" this is used by hardware that has FP /* As with other "interlocks" this is used by hardware that has FP
(co-processor) interlocks. */ (co-processor) interlocks. */
@ -930,6 +933,11 @@ md_begin ()
else if (strcmp (cpu, "mips64vr4300") == 0) else if (strcmp (cpu, "mips64vr4300") == 0)
mips_cpu = 4300; mips_cpu = 4300;
/* start-sanitize-vr4xxx */
else if (strcmp (cpu, "mips64vr4xxx") == 0)
mips_cpu = 4300;
/* end-sanitize-vr4xxx */
/* start-sanitize-vr4320 */ /* start-sanitize-vr4320 */
else if (strcmp (cpu, "r4320") == 0 else if (strcmp (cpu, "r4320") == 0
|| strcmp (cpu, "mips64vr4320") == 0) || strcmp (cpu, "mips64vr4320") == 0)
@ -1633,8 +1641,13 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
{ {
/* The previous instruction reads the LO register; if the /* The previous instruction reads the LO register; if the
current instruction writes to the LO register, we must current instruction writes to the LO register, we must
insert two NOPS. Some newer processors have interlocks. */ insert two NOPS. Some newer processors have interlocks.
if (! hilo_interlocks Also the tx39's multiply instructions can be exectuted
immediatly after a read from HI/LO (without the delay),
though the tx39's divide insns still do require the
delay. */
if (! (hilo_interlocks
|| (mips_3900 && (pinfo & INSN_MULT)))
&& (mips_optimize == 0 && (mips_optimize == 0
|| (pinfo & INSN_WRITE_LO))) || (pinfo & INSN_WRITE_LO)))
nops += 2; nops += 2;
@ -1643,8 +1656,10 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
{ {
/* The previous instruction reads the HI register; if the /* The previous instruction reads the HI register; if the
current instruction writes to the HI register, we must current instruction writes to the HI register, we must
insert a NOP. Some newer processors have interlocks. */ insert a NOP. Some newer processors have interlocks.
if (! hilo_interlocks Also the note tx39's multiply above. */
if (! (hilo_interlocks
|| (mips_3900 && (pinfo & INSN_MULT)))
&& (mips_optimize == 0 && (mips_optimize == 0
|| (pinfo & INSN_WRITE_HI))) || (pinfo & INSN_WRITE_HI)))
nops += 2; nops += 2;
@ -1672,10 +1687,12 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
&& ! cop_interlocks) && ! cop_interlocks)
|| ((prev_prev_insn.insn_mo->pinfo & INSN_READ_LO) || ((prev_prev_insn.insn_mo->pinfo & INSN_READ_LO)
&& (pinfo & INSN_WRITE_LO) && (pinfo & INSN_WRITE_LO)
&& ! hilo_interlocks) && ! (hilo_interlocks
|| (mips_3900 && (pinfo & INSN_MULT))))
|| ((prev_prev_insn.insn_mo->pinfo & INSN_READ_HI) || ((prev_prev_insn.insn_mo->pinfo & INSN_READ_HI)
&& (pinfo & INSN_WRITE_HI) && (pinfo & INSN_WRITE_HI)
&& ! hilo_interlocks)) && ! (hilo_interlocks
|| (mips_3900 && (pinfo & INSN_MULT)))))
prev_prev_nop = 1; prev_prev_nop = 1;
else else
prev_prev_nop = 0; prev_prev_nop = 0;
@ -2068,7 +2085,7 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi)
& (INSN_LOAD_COPROC_DELAY & (INSN_LOAD_COPROC_DELAY
| INSN_COPROC_MOVE_DELAY | INSN_COPROC_MOVE_DELAY
| INSN_WRITE_COND_CODE))) | INSN_WRITE_COND_CODE)))
|| (! hilo_interlocks || (! (hilo_interlocks || (mips_3900 && (pinfo & INSN_MULT)))
&& (prev_pinfo && (prev_pinfo
& (INSN_READ_LO & (INSN_READ_LO
| INSN_READ_HI))) | INSN_READ_HI)))