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

* config/tc-i386.c (md_assemble): Print operand number rather than

Browse Source 
using ordinal_names.
	(i386_operand): Likewise.
This commit is contained in:
Ian Lance Taylor
1998-04-22 18:54:39 +00:00
parent f2a0822c05
commit 8081c2be07
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,3 +1,9 @@
Wed Apr 22 14:52:36 1998 Ian Lance Taylor <ian@cygnus.com>
* config/tc-i386.c (md_assemble): Print operand number rather than
using ordinal_names.
(i386_operand): Likewise.
Tue Apr 21 22:34:25 1998 Tom Tromey <tromey@scribbles.cygnus.com> Tue Apr 21 22:34:25 1998 Tom Tromey <tromey@scribbles.cygnus.com>
* Makefile.am (INTLLIBS): Define to work around apparent automake * Makefile.am (INTLLIBS): Define to work around apparent automake

18
gas/config/tc-i386.c
View File

@ -1260,13 +1260,12 @@ md_assemble (line)
if ((i.tm.opcode_modifier & IsString) != 0 && i.mem_operands != 0) if ((i.tm.opcode_modifier & IsString) != 0 && i.mem_operands != 0)
{ {
int mem_op = (i.types[0] & Mem) ? 0 : 1; int mem_op = (i.types[0] & Mem) ? 0 : 1;
if ((i.tm.operand_types[mem_op+0] & EsSeg) != 0) if ((i.tm.operand_types[mem_op] & EsSeg) != 0)
{ {
if (i.seg[0] != (seg_entry *) 0 && i.seg[0] != (seg_entry *) &es) if (i.seg[0] != (seg_entry *) 0 && i.seg[0] != (seg_entry *) &es)
{ {
as_bad ("`%s' %s operand must use `%%es' segment", as_bad ("`%s' operand %d must use `%%es' segment",
i.tm.name, i.tm.name, mem_op);
ordinal_names[mem_op+0]);
return; return;
} }
/* There's only ever one segment override allowed per instruction. /* There's only ever one segment override allowed per instruction.
@ -1275,13 +1274,12 @@ md_assemble (line)
instructions store it, allowing common code. */ instructions store it, allowing common code. */
i.seg[0] = i.seg[1]; i.seg[0] = i.seg[1];
} }
else if ((i.tm.operand_types[mem_op+1] & EsSeg) != 0) else if ((i.tm.operand_types[mem_op + 1] & EsSeg) != 0)
{ {
if (i.seg[1] != (seg_entry *) 0 && i.seg[1] != (seg_entry *) &es) if (i.seg[1] != (seg_entry *) 0 && i.seg[1] != (seg_entry *) &es)
{ {
as_bad ("`%s' %s operand must use `%%es' segment", as_bad ("`%s' operand %d must use `%%es' segment",
i.tm.name, i.tm.name, mem_op + 1);
ordinal_names[mem_op+1]);
return; return;
} }
} }
@ -2622,8 +2620,8 @@ i386_operand (operand_string)
} }
else else
{ /* it's not a memory operand; argh! */ { /* it's not a memory operand; argh! */
as_bad (_("invalid char %s begining %s operand `%s'"), as_bad (_("invalid char %s begining operand %d `%s'"),
output_invalid (*op_string), ordinal_names[this_operand], output_invalid (*op_string), this_operand,
op_string); op_string);
return 0; return 0;
} }