Do not count FAKE operands when deciding if any operands have been skipped.

This commit is contained in:
Nick Clifton 2002-09-13 09:16:02 +00:00
parent dde1b13223
commit 7fe9cf6bf6
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2002-09-13 Nick Clifton <nickc@redhat.com>
* config/tc-ppc.c (md_assemble): Do not count FAKE operands
when deciding if any operands have been skipped.
2002-09-11 Nick Clifton <nickc@redhat.com>
* NEWS: New TI port supports both C4x and C3x series of DSPs.

View File

@ -2069,6 +2069,8 @@ md_assemble (str)
if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0)
{
unsigned int opcount;
unsigned int num_operands_expected;
unsigned int i;
/* There is an optional operand. Count the number of
commas in the input line. */
@ -2085,10 +2087,16 @@ md_assemble (str)
}
}
/* Compute the number of expected operands.
Do not count fake operands. */
for (num_operands_expected = 0, i = 0; opcode->operands[i]; i ++)
if ((powerpc_operands [opcode->operands[i]].flags & PPC_OPERAND_FAKE) == 0)
++ num_operands_expected;
/* If there are fewer operands in the line then are called
for by the instruction, we want to skip the optional
operand. */
if (opcount < strlen (opcode->operands))
if (opcount < num_operands_expected)
skip_optional = 1;
break;