This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
fix Xtensa assembler error checks
- From: Bob Wilson <bwilson at tensilica dot com>
- To: binutils at sources dot redhat dot com
- Date: Thu, 27 Oct 2005 15:16:36 -0700
- Subject: fix Xtensa assembler error checks
I've committed this patch from Sterling Augustine to fix a problem in the Xtensa
port of GAS. The wrong index values were being passed to a function when
checking for resource conflicts. The patch also fixes some related error
messages to use the more generic term "ports" instead of "queues". I ran the
GAS testsuite for an xtensa-elf target and saw no regressions other than the
weakref problems.
2005-10-27 Sterling Augustine <sterling@tensilica.com>
* config/tc-xtensa.c (find_vinsn_conflicts): Change error messages to
refer to "ports" instead of "queues".
(check_t1_t2_reads_and_writes): Pass correct interface values to
xtensa_interface_inout.
Index: config/tc-xtensa.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-xtensa.c,v
retrieving revision 1.48
diff -u -p -r1.48 tc-xtensa.c
--- config/tc-xtensa.c 18 Oct 2005 23:13:48 -0000 1.48
+++ config/tc-xtensa.c 27 Oct 2005 22:09:17 -0000
@@ -6185,12 +6185,12 @@ find_vinsn_conflicts (vliw_insn *vinsn)
xtensa_opcode_name (isa, op2->opcode), j);
return TRUE;
case 'e':
- as_bad (_("opcodes '%s' (slot %d) and '%s' (slot %d) write the same queue"),
+ as_bad (_("opcodes '%s' (slot %d) and '%s' (slot %d) write the same port"),
xtensa_opcode_name (isa, op1->opcode), i,
xtensa_opcode_name (isa, op2->opcode), j);
return TRUE;
case 'f':
- as_bad (_("opcodes '%s' (slot %d) and '%s' (slot %d) both have volatile queue accesses"),
+ as_bad (_("opcodes '%s' (slot %d) and '%s' (slot %d) both have volatile port accesses"),
xtensa_opcode_name (isa, op1->opcode), i,
xtensa_opcode_name (isa, op2->opcode), j);
return TRUE;
@@ -6349,7 +6349,7 @@ check_t1_t2_reads_and_writes (TInsn *t1,
= xtensa_interfaceOperand_interface (isa, t2->opcode, j);
int t2_class = xtensa_interface_class_id (isa, t2_int);
- t2_inout = xtensa_interface_inout (isa, j);
+ t2_inout = xtensa_interface_inout (isa, t2_int);
if (xtensa_interface_has_side_effect (isa, t2_int) == 1)
t2_volatile = TRUE;
@@ -6359,7 +6359,7 @@ check_t1_t2_reads_and_writes (TInsn *t1,
= xtensa_interfaceOperand_interface (isa, t1->opcode, j);
int t1_class = xtensa_interface_class_id (isa, t1_int);
- t1_inout = xtensa_interface_inout (isa, i);
+ t1_inout = xtensa_interface_inout (isa, t1_int);
if (xtensa_interface_has_side_effect (isa, t1_int) == 1)
t1_volatile = TRUE;