From bf96a92b1725690b61f498791283a0ec55fed5d5 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Fri, 19 Jun 2009 10:58:27 +0000 Subject: [PATCH] * config/tc-s390.c (md_gather_operands): Accept an instruction without operands if all operands are tagged as optional. --- gas/ChangeLog | 5 +++++ gas/config/tc-s390.c | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2f19a40b6..075d6f07f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-06-19 Martin Schwidefsky + + * config/tc-s390.c (md_gather_operands): Accept an instruction + without operands if all operands are tagged as optional. + 2009-06-18 Nick Clifton PR 10169 diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index da7d4c5fa..f5c2a2ec4 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -1188,7 +1188,24 @@ md_gather_operands (char *str, if (ex.X_op == O_illegal) as_bad (_("illegal operand")); else if (ex.X_op == O_absent) - as_bad (_("missing operand")); + { + /* No operands, check if all operands can be skipped. */ + while (*opindex_ptr != 0 && operand->flags & S390_OPERAND_OPTIONAL) + { + if (operand->flags & S390_OPERAND_DISP) + { + /* An optional displacement makes the whole D(X,B) + D(L,B) or D(B) block optional. */ + do { + operand = s390_operands + *(++opindex_ptr); + } while (!(operand->flags & S390_OPERAND_BASE)); + } + operand = s390_operands + *(++opindex_ptr); + } + if (opindex_ptr[0] == '\0') + break; + as_bad (_("missing operand")); + } else if (ex.X_op == O_register || ex.X_op == O_constant) { s390_lit_suffix (&str, &ex, ELF_SUFFIX_NONE); -- 2.11.4.GIT