From 6e43157b5d39a713d4061f97629bf9107c6d25e0 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Fri, 26 Oct 2012 16:09:20 +0000 Subject: [ms-inline asm] Have the target AsmParser create the asmrewrite for the offsetof operator. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166779 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCParser/AsmParser.cpp | 6 ------ lib/Target/X86/AsmParser/X86AsmParser.cpp | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index b47a6bdb54..0a65720549 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -3667,12 +3667,6 @@ bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString, AsmStrRewrites.push_back(AsmRewrite(AOK_SizeDirective, Operand->getStartLoc(), 0, Operand->getMemSize())); - - // Don't emit the offset directive. - if (Operand->isOffsetOf()) - AsmStrRewrites.push_back(AsmRewrite(AOK_Skip, - Operand->getOffsetOfLoc(), 7)); - if (isOutput) { std::string Constraint = "="; ++InputIdx; diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp index 7f47ef4c63..a3e90af71a 100644 --- a/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -879,13 +879,16 @@ X86Operand *X86AsmParser::ParseIntelOffsetOfOperator(SMLoc Start) { Start = Parser.getTok().getLoc(); assert (Parser.getTok().is(AsmToken::Identifier) && "Expected an identifier"); - SMLoc End; + SMLoc End; const MCExpr *Val; if (getParser().ParseExpression(Val, End)) return 0; End = Parser.getTok().getLoc(); + // Don't emit the offset operator. + InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Skip, OffsetOfLoc, 7)); + // The offset operator will have an 'r' constraint, thus we need to create // register operand to ensure proper matching. Just pick a GPR based on // the size of a pointer. -- cgit v1.2.3