From 8f138d1121730007f973131ca79a06a58f981011 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Mon, 15 Oct 2012 17:19:13 +0000 Subject: [ms-inline asm] Add a few new APIs to the AsmParser class in support of MS-Style inline assembly. For the time being, these will be called directly by clang. However, in the near future I expect these to be sunk back into the MC layer and more basic APIs (e.g., getClobbers(), getConstraints(), etc.) will be called by clang. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165946 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCParser/AsmParser.cpp | 47 +++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) (limited to 'lib/MC') diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 8bf017a1a0..0a8053121c 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -133,9 +133,18 @@ private: /// IsDarwin - is Darwin compatibility enabled? bool IsDarwin; - /// ParsingInlineAsm - are we parsing ms-style inline assembly? + /// ParsingInlineAsm - Are we parsing ms-style inline assembly? bool ParsingInlineAsm; + /// IsInstruction - Was the last parsed statement an instruction? + bool IsInstruction; + + /// ParsedOperands - The parsed operands from the last parsed statement. + SmallVector ParsedOperands; + + /// Opcode - The opcode from the last parsed instruction. + unsigned Opcode; + public: AsmParser(SourceMgr &SM, MCContext &Ctx, MCStreamer &Out, const MCAsmInfo &MAI); @@ -174,7 +183,20 @@ public: virtual const AsmToken &Lex(); + bool ParseStatement(); void setParsingInlineAsm(bool V) { ParsingInlineAsm = V; } + unsigned getNumParsedOperands() { return ParsedOperands.size(); } + MCParsedAsmOperand &getParsedOperand(unsigned OpNum) { + assert (ParsedOperands.size() > OpNum); + return *ParsedOperands[OpNum]; + } + void freeParsedOperands() { + for (unsigned i = 0, e = ParsedOperands.size(); i != e; ++i) + delete ParsedOperands[i]; + ParsedOperands.clear(); + } + bool isInstruction() { return IsInstruction; } + unsigned getOpcode() { return Opcode; } bool ParseExpression(const MCExpr *&Res); virtual bool ParseExpression(const MCExpr *&Res, SMLoc &EndLoc); @@ -186,7 +208,6 @@ public: private: void CheckForValidSection(); - bool ParseStatement(); void EatToEndOfLine(); bool ParseCppHashLineFilenameComment(const SMLoc &L); @@ -417,7 +438,8 @@ AsmParser::AsmParser(SourceMgr &_SM, MCContext &_Ctx, : Lexer(_MAI), Ctx(_Ctx), Out(_Out), MAI(_MAI), SrcMgr(_SM), GenericParser(new GenericAsmParser), PlatformParser(0), CurBuffer(0), MacrosEnabled(true), CppHashLineNumber(0), - AssemblerDialect(~0U), IsDarwin(false), ParsingInlineAsm(false) { + AssemblerDialect(~0U), IsDarwin(false), ParsingInlineAsm(false), + IsInstruction(false), Opcode(0) { // Save the old handler. SavedDiagHandler = SrcMgr.getDiagHandler(); SavedDiagContext = SrcMgr.getDiagContext(); @@ -1315,12 +1337,11 @@ bool AsmParser::ParseStatement() { CheckForValidSection(); // Canonicalize the opcode to lower case. - SmallString<128> Opcode; + SmallString<128> OpcodeStr; for (unsigned i = 0, e = IDVal.size(); i != e; ++i) - Opcode.push_back(tolower(IDVal[i])); + OpcodeStr.push_back(tolower(IDVal[i])); - SmallVector ParsedOperands; - bool HadError = getTargetParser().ParseInstruction(Opcode.str(), IDLoc, + bool HadError = getTargetParser().ParseInstruction(OpcodeStr.str(), IDLoc, ParsedOperands); // Dump the parsed representation, if requested. @@ -1352,17 +1373,17 @@ bool AsmParser::ParseStatement() { // If parsing succeeded, match the instruction. if (!HadError) { - unsigned Opcode; unsigned ErrorInfo; HadError = getTargetParser().MatchAndEmitInstruction(IDLoc, Opcode, - ParsedOperands, - Out, ErrorInfo, + ParsedOperands, Out, + ErrorInfo, ParsingInlineAsm); } - // Free any parsed operands. - for (unsigned i = 0, e = ParsedOperands.size(); i != e; ++i) - delete ParsedOperands[i]; + // Free any parsed operands. If parsing ms-style inline assembly it is the + // responsibility of the caller (i.e., clang) to free the parsed operands. + if (!ParsingInlineAsm) + freeParsedOperands(); // Don't skip the rest of the line, the instruction parser is responsible for // that. -- cgit v1.2.3