6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-23 17:29:19 +00:00
Code Issues Projects Releases Wiki Activity

[ms-inline asm] If the state of the parser is ignore, then don't parse the

Browse Source 
inline assembly.  Also make sure the remove the ignored statements from the IR.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166357 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2012-10-20 00:47:08 +00:00
parent 4ade92b614
commit 17feeec8d8
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/MC/MCParser/AsmParser.cpp
View File

@ -1138,7 +1138,7 @@ bool AsmParser::ParseStatement() {
return ParseDirectiveEndIf(IDLoc); return ParseDirectiveEndIf(IDLoc);
// If we are in a ".if 0" block, ignore this statement. // If we are in a ".if 0" block, ignore this statement.
if (TheCondState.Ignore && !ParsingInlineAsm) { if (TheCondState.Ignore) {
EatToEndOfStatement(); EatToEndOfStatement();
return false; return false;
} }
@ -3579,7 +3579,8 @@ enum AsmOpRewriteKind {
AOK_Imm, AOK_Imm,
AOK_Input, AOK_Input,
AOK_Output, AOK_Output,
AOK_SizeDirective AOK_SizeDirective,
AOK_Skip
}; };
struct AsmOpRewrite { struct AsmOpRewrite {
@ -3619,9 +3620,24 @@ bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString,
// Clear the opcode. // Clear the opcode.
setOpcode(~0x0); setOpcode(~0x0);
// Save the conditional ignore state of the parser prior to parsing the statement.
bool PreParseCondStateIgnore = TheCondState.Ignore;
// Save the starting point of this statement in case we need to skip it.
SMLoc Start = getLexer().getLoc();
if (ParseStatement()) if (ParseStatement())
return true; return true;
// If PreParseCondStateIgnore is false, but TheCondState.Ignore is true, then we
// just parsed a directive that changed the state to ignore. Don't skip
// emitting this directive.
if (PreParseCondStateIgnore && TheCondState.Ignore) {
unsigned Len = getLexer().getLoc().getPointer() - Start.getPointer();
AsmStrRewrites.push_back(AsmOpRewrite(AOK_Skip, Start, Len));
continue;
}
if (isInstruction()) { if (isInstruction()) {
const MCInstrDesc &Desc = MII->get(getOpcode()); const MCInstrDesc &Desc = MII->get(getOpcode());
@ -3727,8 +3743,15 @@ bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString,
OS << StringRef(Start, Loc - Start); OS << StringRef(Start, Loc - Start);
PrevKind = Kind; PrevKind = Kind;
// Skip the original expression.
if (Kind == AOK_Skip) {
Start = Loc + (*I).Len;
continue;
}
// Rewrite expressions in $N notation. // Rewrite expressions in $N notation.
switch (Kind) { switch (Kind) {
default: break;
case AOK_Imm: case AOK_Imm:
OS << Twine("$$") + StringRef(Loc, (*I).Len); OS << Twine("$$") + StringRef(Loc, (*I).Len);
break; break;