From 7fe9cf6bf650c675da056a2e6cef9631440535be Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 13 Sep 2002 09:16:02 +0000 Subject: [PATCH] Do not count FAKE operands when deciding if any operands have been skipped. --- gas/ChangeLog | 5 +++++ gas/config/tc-ppc.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4f419868661..ad807bd2e74 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2002-09-13 Nick Clifton + + * config/tc-ppc.c (md_assemble): Do not count FAKE operands + when deciding if any operands have been skipped. + 2002-09-11 Nick Clifton * NEWS: New TI port supports both C4x and C3x series of DSPs. diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 613a61a203c..8f89c77ff0c 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -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; -- 2.30.2