diff options
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 37 | ||||
| -rw-r--r-- | test/MC/AsmParser/directive_fill.s | 16 |
2 files changed, 37 insertions, 16 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index c1f825a..1267dc8 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -2353,7 +2353,7 @@ bool AsmParser::parseDirectiveZero() { } /// parseDirectiveFill -/// ::= .fill expression , expression , expression +/// ::= .fill expression [ , expression [ , expression ] ] bool AsmParser::parseDirectiveFill() { checkForValidSection(); @@ -2361,26 +2361,31 @@ bool AsmParser::parseDirectiveFill() { if (parseAbsoluteExpression(NumValues)) return true; - if (getLexer().isNot(AsmToken::Comma)) - return TokError("unexpected token in '.fill' directive"); - Lex(); + int64_t FillSize = 1; + int64_t FillExpr = 0; - int64_t FillSize; - if (parseAbsoluteExpression(FillSize)) - return true; + if (getLexer().isNot(AsmToken::EndOfStatement)) { + if (getLexer().isNot(AsmToken::Comma)) + return TokError("unexpected token in '.fill' directive"); + Lex(); - if (getLexer().isNot(AsmToken::Comma)) - return TokError("unexpected token in '.fill' directive"); - Lex(); + if (parseAbsoluteExpression(FillSize)) + return true; - int64_t FillExpr; - if (parseAbsoluteExpression(FillExpr)) - return true; + if (getLexer().isNot(AsmToken::EndOfStatement)) { + if (getLexer().isNot(AsmToken::Comma)) + return TokError("unexpected token in '.fill' directive"); + Lex(); - if (getLexer().isNot(AsmToken::EndOfStatement)) - return TokError("unexpected token in '.fill' directive"); + if (parseAbsoluteExpression(FillExpr)) + return true; - Lex(); + if (getLexer().isNot(AsmToken::EndOfStatement)) + return TokError("unexpected token in '.fill' directive"); + + Lex(); + } + } if (FillSize != 1 && FillSize != 2 && FillSize != 4 && FillSize != 8) return TokError("invalid '.fill' size, expected 1, 2, 4, or 8"); diff --git a/test/MC/AsmParser/directive_fill.s b/test/MC/AsmParser/directive_fill.s index 60bd468..bb3ced0 100644 --- a/test/MC/AsmParser/directive_fill.s +++ b/test/MC/AsmParser/directive_fill.s @@ -15,3 +15,19 @@ TEST1: # CHECK: .quad 4 TEST2: .fill 1, 8, 4 + +# CHECK: TEST3 +# CHECK: .byte 0 +# CHECK: .byte 0 +# CHECK: .byte 0 +# CHECK: .byte 0 +TEST3: + .fill 4 + +# CHECK: TEST4 +# CHECK: .short 0 +# CHECK: .short 0 +# CHECK: .short 0 +# CHECK: .short 0 +TEST4: + .fill 4, 2 |