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

gas/

Browse Source 
* config/tc-mips.c (macro, mips_ip): Correct message
	capitalization.

	gas/testsuite/
	* gas/mips/at-2.l: Adjust according to message capitalization
	fixes.
	* gas/mips/illegal.l: Likewise.
	* gas/mips/jalr.l: Likewise.
	* gas/mips/octeon-ill.l: Likewise.
	* gas/mips/tls-ill.l: Likewise.
This commit is contained in:
Maciej W. Rozycki
2010-12-09 22:04:43 +00:00
parent 30a7f059d8
commit f71d0d440e
8 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-09 Maciej W. Rozycki <macro@codesourcery.com>
* config/tc-mips.c (macro, mips_ip): Correct message
capitalization.
2010-12-09 Arnold Metselaar <arnold.metselaar@planet.nl> 2010-12-09 Arnold Metselaar <arnold.metselaar@planet.nl>
* config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning. * config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning.

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

@ -5577,7 +5577,7 @@ macro (struct mips_cl_insn *ip)
if (offset_expr.X_op != O_symbol if (offset_expr.X_op != O_symbol
&& offset_expr.X_op != O_constant) && offset_expr.X_op != O_constant)
{ {
as_bad (_("expression too complex")); as_bad (_("Expression too complex"));
offset_expr.X_op = O_constant; offset_expr.X_op = O_constant;
} }
@ -5665,7 +5665,7 @@ macro (struct mips_cl_insn *ip)
relax_switch (); relax_switch ();
} }
if (!IS_SEXT_32BIT_NUM (offset_expr.X_add_number)) if (!IS_SEXT_32BIT_NUM (offset_expr.X_add_number))
as_bad (_("offset too large")); as_bad (_("Offset too large"));
macro_build_lui (&offset_expr, tempreg); macro_build_lui (&offset_expr, tempreg);
macro_build (&offset_expr, ADDRESS_ADDI_INSN, "t,r,j", macro_build (&offset_expr, ADDRESS_ADDI_INSN, "t,r,j",
tempreg, tempreg, BFD_RELOC_LO16); tempreg, tempreg, BFD_RELOC_LO16);
@ -6525,7 +6525,7 @@ macro (struct mips_cl_insn *ip)
&& NO_ISA_COP (mips_opts.arch) && NO_ISA_COP (mips_opts.arch)
&& (ip->insn_mo->pinfo2 & (INSN2_M_FP_S | INSN2_M_FP_D)) == 0) && (ip->insn_mo->pinfo2 & (INSN2_M_FP_S | INSN2_M_FP_D)) == 0)
{ {
as_bad (_("opcode not supported on this processor: %s"), as_bad (_("Opcode not supported on this processor: %s"),
mips_cpu_info_from_arch (mips_opts.arch)->name); mips_cpu_info_from_arch (mips_opts.arch)->name);
break; break;
} }
@ -6548,7 +6548,7 @@ macro (struct mips_cl_insn *ip)
if (offset_expr.X_op != O_constant if (offset_expr.X_op != O_constant
&& offset_expr.X_op != O_symbol) && offset_expr.X_op != O_symbol)
{ {
as_bad (_("expression too complex")); as_bad (_("Expression too complex"));
offset_expr.X_op = O_constant; offset_expr.X_op = O_constant;
} }
@ -7124,7 +7124,7 @@ macro (struct mips_cl_insn *ip)
if (offset_expr.X_op != O_symbol if (offset_expr.X_op != O_symbol
&& offset_expr.X_op != O_constant) && offset_expr.X_op != O_constant)
{ {
as_bad (_("expression too complex")); as_bad (_("Expression too complex"));
offset_expr.X_op = O_constant; offset_expr.X_op = O_constant;
} }
@ -7995,7 +7995,7 @@ macro (struct mips_cl_insn *ip)
ulh: ulh:
used_at = 1; used_at = 1;
if (offset_expr.X_add_number >= 0x7fff) if (offset_expr.X_add_number >= 0x7fff)
as_bad (_("operand overflow")); as_bad (_("Operand overflow"));
if (!target_big_endian) if (!target_big_endian)
++offset_expr.X_add_number; ++offset_expr.X_add_number;
macro_build (&offset_expr, s, "t,o(b)", AT, BFD_RELOC_LO16, breg); macro_build (&offset_expr, s, "t,o(b)", AT, BFD_RELOC_LO16, breg);
@ -8019,7 +8019,7 @@ macro (struct mips_cl_insn *ip)
off = 3; off = 3;
ulw: ulw:
if (offset_expr.X_add_number >= 0x8000 - off) if (offset_expr.X_add_number >= 0x8000 - off)
as_bad (_("operand overflow")); as_bad (_("Operand overflow"));
if (treg != breg) if (treg != breg)
tempreg = treg; tempreg = treg;
else else
@ -8092,7 +8092,7 @@ macro (struct mips_cl_insn *ip)
case M_USH: case M_USH:
used_at = 1; used_at = 1;
if (offset_expr.X_add_number >= 0x7fff) if (offset_expr.X_add_number >= 0x7fff)
as_bad (_("operand overflow")); as_bad (_("Operand overflow"));
if (target_big_endian) if (target_big_endian)
++offset_expr.X_add_number; ++offset_expr.X_add_number;
macro_build (&offset_expr, "sb", "t,o(b)", treg, BFD_RELOC_LO16, breg); macro_build (&offset_expr, "sb", "t,o(b)", treg, BFD_RELOC_LO16, breg);
@ -8115,7 +8115,7 @@ macro (struct mips_cl_insn *ip)
off = 3; off = 3;
usw: usw:
if (offset_expr.X_add_number >= 0x8000 - off) if (offset_expr.X_add_number >= 0x8000 - off)
as_bad (_("operand overflow")); as_bad (_("Operand overflow"));
if (!target_big_endian) if (!target_big_endian)
offset_expr.X_add_number += off; offset_expr.X_add_number += off;
macro_build (&offset_expr, s, "t,o(b)", treg, BFD_RELOC_LO16, breg); macro_build (&offset_expr, s, "t,o(b)", treg, BFD_RELOC_LO16, breg);
@ -8677,7 +8677,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
/* If we did not find a '.', then we can quit now. */ /* If we did not find a '.', then we can quit now. */
if (*s != '.') if (*s != '.')
{ {
insn_error = _("unrecognized opcode"); insn_error = _("Unrecognized opcode");
return; return;
} }
@ -8685,7 +8685,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
*s++ = '\0'; *s++ = '\0';
if ((insn = (struct mips_opcode *) hash_find (op_hash, str)) == NULL) if ((insn = (struct mips_opcode *) hash_find (op_hash, str)) == NULL)
{ {
insn_error = _("unrecognized opcode"); insn_error = _("Unrecognized opcode");
return; return;
} }
} }
@ -9279,7 +9279,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
continue; continue;
default: default:
as_bad (_("Internal: bad mips opcode " as_bad (_("Internal error: bad mips opcode "
"(unknown extension operand type `+%c'): %s %s"), "(unknown extension operand type `+%c'): %s %s"),
*args, insn->name, insn->args); *args, insn->name, insn->args);
/* Further processing is fruitless. */ /* Further processing is fruitless. */
@ -9464,9 +9464,9 @@ mips_ip (char *str, struct mips_cl_insn *ip)
if (regno == AT && mips_opts.at) if (regno == AT && mips_opts.at)
{ {
if (mips_opts.at == ATREG) if (mips_opts.at == ATREG)
as_warn (_("used $at without \".set noat\"")); as_warn (_("Used $at without \".set noat\""));
else else
as_warn (_("used $%u with \".set at=$%u\""), as_warn (_("Used $%u with \".set at=$%u\""),
regno, mips_opts.at); regno, mips_opts.at);
} }
} }
@ -9493,13 +9493,13 @@ mips_ip (char *str, struct mips_cl_insn *ip)
if (regno == lastregno) if (regno == lastregno)
{ {
insn_error insn_error
= _("source and destination must be different"); = _("Source and destination must be different");
continue; continue;
} }
if (regno == 31 && lastregno == 0xffffffff) if (regno == 31 && lastregno == 0xffffffff)
{ {
insn_error insn_error
= _("a destination register must be supplied"); = _("A destination register must be supplied");
continue; continue;
} }
} }
@ -9952,7 +9952,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
break; break;
if (imm_expr.X_op == O_constant if (imm_expr.X_op == O_constant
|| imm_expr.X_op == O_big) || imm_expr.X_op == O_big)
as_bad (_("expression out of range")); as_bad (_("Expression out of range"));
} }
} }
s = expr_end; s = expr_end;
@ -10053,7 +10053,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
c = 8; /* Invalid sel value. */ c = 8; /* Invalid sel value. */
if (c > 7) if (c > 7)
as_bad (_("invalid coprocessor sub-selection value (0-7)")); as_bad (_("Invalid coprocessor sub-selection value (0-7)"));
ip->insn_opcode |= c; ip->insn_opcode |= c;
continue; continue;
@ -10093,7 +10093,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
continue; continue;
default: default:
as_bad (_("bad char = '%c'\n"), *args); as_bad (_("Bad char = '%c'\n"), *args);
internalError (); internalError ();
} }
break; break;
@ -10104,12 +10104,12 @@ mips_ip (char *str, struct mips_cl_insn *ip)
{ {
++insn; ++insn;
s = argsStart; s = argsStart;
insn_error = _("illegal operands"); insn_error = _("Illegal operands");
continue; continue;
} }
if (save_c) if (save_c)
*(--argsStart) = save_c; *(--argsStart) = save_c;
insn_error = _("illegal operands"); insn_error = _("Illegal operands");
return; return;
} }
} }

9
gas/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2010-12-09 Maciej W. Rozycki <macro@codesourcery.com>
* gas/mips/at-2.l: Adjust according to message capitalization
fixes.
* gas/mips/illegal.l: Likewise.
* gas/mips/jalr.l: Likewise.
* gas/mips/octeon-ill.l: Likewise.
* gas/mips/tls-ill.l: Likewise.
2010-12-09 Maciej W. Rozycki <macro@codesourcery.com> 2010-12-09 Maciej W. Rozycki <macro@codesourcery.com>
* gas/mips/ldstla-32.d: Use wildcard address matching. * gas/mips/ldstla-32.d: Use wildcard address matching.

18
gas/testsuite/gas/mips/at-2.l
View File

@ -2,12 +2,12 @@
.*\.s:4: Error: Macro used \$at after ".set noat" .*\.s:4: Error: Macro used \$at after ".set noat"
.*\.s:5: Error: Macro used \$at after ".set noat" .*\.s:5: Error: Macro used \$at after ".set noat"
.*\.s:6: Error: Macro used \$at after ".set noat" .*\.s:6: Error: Macro used \$at after ".set noat"
.*\.s:8: Warning: used \$at without ".set noat" .*\.s:8: Warning: Used \$at without ".set noat"
.*\.s:8: Warning: used \$at without ".set noat" .*\.s:8: Warning: Used \$at without ".set noat"
.*\.s:8: Warning: used \$at without ".set noat" .*\.s:8: Warning: Used \$at without ".set noat"
.*\.s:13: Warning: used \$26 with ".set at=\$26" .*\.s:13: Warning: Used \$26 with ".set at=\$26"
.*\.s:13: Warning: used \$26 with ".set at=\$26" .*\.s:13: Warning: Used \$26 with ".set at=\$26"
.*\.s:13: Warning: used \$26 with ".set at=\$26" .*\.s:13: Warning: Used \$26 with ".set at=\$26"
.*\.s:18: Warning: used \$27 with ".set at=\$27" .*\.s:18: Warning: Used \$27 with ".set at=\$27"
.*\.s:18: Warning: used \$27 with ".set at=\$27" .*\.s:18: Warning: Used \$27 with ".set at=\$27"
.*\.s:18: Warning: used \$27 with ".set at=\$27" .*\.s:18: Warning: Used \$27 with ".set at=\$27"

4
gas/testsuite/gas/mips/illegal.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:4: Error: illegal operands `move 1,2' .*:4: Error: Illegal operands `move 1,2'
.*:5: Error: illegal operands `c.eq.s 1,2' .*:5: Error: Illegal operands `c.eq.s 1,2'

13
gas/testsuite/gas/mips/jalr.l
View File

@ -1,8 +1,7 @@
.*: Assembler messages: .*: Assembler messages:
.*:1: Error: illegal operands.* .*:1: Error: Illegal operands.*
.*:2: Error: a destination register must be supplied.* .*:2: Error: A destination register must be supplied.*
.*:3: Error: source and destination must be different.* .*:3: Error: Source and destination must be different.*
.*:10: Error: illegal operands.* .*:10: Error: Illegal operands.*
.*:11: Error: a destination register must be supplied.* .*:11: Error: A destination register must be supplied.*
.*:12: Error: source and destination must be different.* .*:12: Error: Source and destination must be different.*

28
gas/testsuite/gas/mips/octeon-ill.l
View File

@ -15,25 +15,25 @@
.*:27: Error: opcode not supported on this processor.* .*:27: Error: opcode not supported on this processor.*
.*:28: Error: opcode not supported on this processor.* .*:28: Error: opcode not supported on this processor.*
.*:29: Error: opcode not supported on this processor.* .*:29: Error: opcode not supported on this processor.*
.*:30: Error: opcode not supported on this processor.* .*:30: Error: Opcode not supported on this processor.*
.*:31: Error: opcode not supported on this processor.* .*:31: Error: Opcode not supported on this processor.*
.*:32: Error: opcode not supported on this processor.* .*:32: Error: opcode not supported on this processor.*
.*:33: Error: opcode not supported on this processor.* .*:33: Error: opcode not supported on this processor.*
.*:34: Error: opcode not supported on this processor.* .*:34: Error: opcode not supported on this processor.*
.*:35: Error: opcode not supported on this processor.* .*:35: Error: opcode not supported on this processor.*
.*:36: Error: opcode not supported on this processor.* .*:36: Error: Opcode not supported on this processor.*
.*:37: Error: opcode not supported on this processor.* .*:37: Error: Opcode not supported on this processor.*
.*:39: Error: opcode not supported on this processor.* .*:39: Error: opcode not supported on this processor.*
.*:40: Error: opcode not supported on this processor.* .*:40: Error: Opcode not supported on this processor.*
.*:41: Error: opcode not supported on this processor.* .*:41: Error: Opcode not supported on this processor.*
.*:42: Error: opcode not supported on this processor.* .*:42: Error: Opcode not supported on this processor.*
.*:43: Error: opcode not supported on this processor.* .*:43: Error: Opcode not supported on this processor.*
.*:45: Error: illegal operands `dmfc2 \$2,0x10000' .*:45: Error: Illegal operands `dmfc2 \$2,0x10000'
.*:46: Error: illegal operands `dmtc2 \$2,0x12345' .*:46: Error: Illegal operands `dmtc2 \$2,0x12345'
.*:47: Error: illegal operands `dmfc2 \$9,\$12' .*:47: Error: Illegal operands `dmfc2 \$9,\$12'
.*:48: Error: illegal operands `dmfc2 \$4,\$15,4' .*:48: Error: Illegal operands `dmfc2 \$4,\$15,4'
.*:49: Error: illegal operands `dmtc2 \$16,\$8' .*:49: Error: Illegal operands `dmtc2 \$16,\$8'
.*:50: Error: illegal operands `dmtc2 \$22,\$7,\$4' .*:50: Error: Illegal operands `dmtc2 \$22,\$7,\$4'
.*:52: Error: Improper size \(32\) .*:52: Error: Improper size \(32\)
.*:54: Error: Improper position \(32\) .*:54: Error: Improper position \(32\)
.*:55: Error: Improper size \(29\) .*:55: Error: Improper size \(29\)

8
gas/testsuite/gas/mips/tls-ill.l
View File

@ -1,11 +1,11 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad expression .*:6: Error: bad expression
.*:6: Error: illegal operands `addiu \$4,\$28,%dtprel\(tlsvar\)' .*:6: Error: Illegal operands `addiu \$4,\$28,%dtprel\(tlsvar\)'
.*:7: Error: bad expression .*:7: Error: bad expression
.*:7: Error: illegal operands `addiu \$4,\$28,%tprel\(tlsvar\)' .*:7: Error: Illegal operands `addiu \$4,\$28,%tprel\(tlsvar\)'
.*:8: Error: bad expression .*:8: Error: bad expression
.*:8: Error: missing '\)' .*:8: Error: missing '\)'
.*:8: Error: illegal operands `addiu \$4,\$28,%lo\(%gottprel\(tlsvar\)\)' .*:8: Error: Illegal operands `addiu \$4,\$28,%lo\(%gottprel\(tlsvar\)\)'
.*:9: Error: bad expression .*:9: Error: bad expression
.*:9: Error: missing '\)' .*:9: Error: missing '\)'
.*:9: Error: illegal operands `addiu \$4,\$28,%hi\(%gottprel\(tlsvar\)\)' .*:9: Error: Illegal operands `addiu \$4,\$28,%hi\(%gottprel\(tlsvar\)\)'