espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-04 04:08:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/tc-xtensa.c (xg_add_opcode_fix): Number operands starting

Browse Source 
from 1, not 0, in error messages.
	(md_assemble): Simplify special-case check for ENTRY instructions.
	(tinsn_has_invalid_symbolic_operands): Do not include opcode and
	operand in error message.
This commit is contained in:
Bob Wilson
2006-02-14 00:58:05 +00:00
parent 2d7ff946c7
commit 431ad2d0db
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -1,3 +1,11 @@
2006-02-13 Bob Wilson <bob.wilson@acm.org>
* config/tc-xtensa.c (xg_add_opcode_fix): Number operands starting
from 1, not 0, in error messages.
(md_assemble): Simplify special-case check for ENTRY instructions.
(tinsn_has_invalid_symbolic_operands): Do not include opcode and
operand in error message.
2006-02-13 Joseph S. Myers <joseph@codesourcery.com> 2006-02-13 Joseph S. Myers <joseph@codesourcery.com>
* configure.tgt (arm-*-linux-gnueabi*): Change to * configure.tgt (arm-*-linux-gnueabi*): Change to

25
gas/config/tc-xtensa.c
View File

@ -4131,7 +4131,7 @@ xg_add_opcode_fix (TInsn *tinsn,
if (opnum != get_relaxable_immed (opcode)) if (opnum != get_relaxable_immed (opcode))
{ {
as_bad (_("invalid relocation for operand %i of '%s'"), as_bad (_("invalid relocation for operand %i of '%s'"),
opnum, xtensa_opcode_name (xtensa_default_isa, opcode)); opnum + 1, xtensa_opcode_name (xtensa_default_isa, opcode));
return FALSE; return FALSE;
} }
@ -4141,7 +4141,7 @@ xg_add_opcode_fix (TInsn *tinsn,
if (expr->X_op == O_lo16 || expr->X_op == O_hi16) if (expr->X_op == O_lo16 || expr->X_op == O_hi16)
{ {
as_bad (_("invalid expression for operand %i of '%s'"), as_bad (_("invalid expression for operand %i of '%s'"),
opnum, xtensa_opcode_name (xtensa_default_isa, opcode)); opnum + 1, xtensa_opcode_name (xtensa_default_isa, opcode));
return FALSE; return FALSE;
} }
@ -5252,24 +5252,12 @@ md_assemble (char *str)
xg_add_branch_and_loop_targets (&orig_insn); xg_add_branch_and_loop_targets (&orig_insn);
/* Special-case for "entry" instruction. */ /* Check that immediate value for ENTRY is >= 16. */
if (orig_insn.opcode == xtensa_entry_opcode) if (orig_insn.opcode == xtensa_entry_opcode && orig_insn.ntok >= 3)
{
/* Check that the third opcode (#2) is >= 16. */
if (orig_insn.ntok >= 3)
{ {
expressionS *exp = &orig_insn.tok[2]; expressionS *exp = &orig_insn.tok[2];
switch (exp->X_op) if (exp->X_op == O_constant && exp->X_add_number < 16)
{
case O_constant:
if (exp->X_add_number < 16)
as_warn (_("entry instruction with stack decrement < 16")); as_warn (_("entry instruction with stack decrement < 16"));
break;
default:
as_warn (_("entry instruction with non-constant decrement"));
}
}
} }
/* Finish it off: /* Finish it off:
@ -11045,8 +11033,7 @@ tinsn_has_invalid_symbolic_operands (const TInsn *insn)
|| (xtensa_operand_is_PCrelative (isa, insn->opcode, i) != 1 || (xtensa_operand_is_PCrelative (isa, insn->opcode, i) != 1
&& insn->opcode != xtensa_const16_opcode)) && insn->opcode != xtensa_const16_opcode))
{ {
as_bad (_("invalid symbolic operand %d on '%s'"), as_bad (_("invalid symbolic operand"));
i, xtensa_opcode_name (isa, insn->opcode));
return TRUE; return TRUE;
} }
} }