[ms-inline asm] Have the target AsmParser create the asmrewrite for the offsetof

operator.

llvm-svn: 166779
This commit is contained in:
Chad Rosier 2012-10-26 16:09:20 +00:00
parent 808102685b
commit e2f03771c4
2 changed files with 4 additions and 7 deletions

View File

@ -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;

View File

@ -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.