From 1d1fe918de14c3021e60ee232ad9520d0a26c7eb Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 22 Jun 2009 06:35:58 +0000 Subject: [PATCH] process memory operands with a parenthesized expression for a displacement, like "(4+5)(%eax)". llvm-svn: 73878 --- llvm/tools/llvm-mc/AsmParser.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/llvm/tools/llvm-mc/AsmParser.cpp b/llvm/tools/llvm-mc/AsmParser.cpp index 397c5fe9c7ce..715ff3932bc6 100644 --- a/llvm/tools/llvm-mc/AsmParser.cpp +++ b/llvm/tools/llvm-mc/AsmParser.cpp @@ -167,8 +167,18 @@ bool AsmParser::ParseX86MemOperand(X86Operand &Op) { // Nothing to do here, fall into the code below with the '(' part of the // memory operand consumed. } else { - // FIXME: Call ParseParenExpression with the leading ( consumed. - return TokError("FIXME: Paren expr not implemented yet!"); + // It must be an parenthesized expression, parse it now. + if (ParseParenExpr(Disp)) return true; + + // After parsing the base expression we could either have a parenthesized + // memory address or not. If not, return now. If so, eat the (. + if (Lexer.isNot(asmtok::LParen)) { + Op = X86Operand::CreateMem(SegReg, Disp, 0, 0, 0); + return false; + } + + // Eat the '('. + Lexer.Lex(); } }