6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-20 14:29:27 +00:00
Code Issues Projects Releases Wiki Activity

[ms-inline asm] Have the [ Symbol ] case fall into the more general logic. This

Browse Source 
is a follow on to r179393.  Test case to be added on the clang side.
Part of rdar://13453209


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179399 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2013-04-12 18:54:20 +00:00
parent d64ee4455a
commit b71ce6a423
1 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -1135,38 +1135,9 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
unsigned TmpReg = 0; unsigned TmpReg = 0;
SMLoc StartInBrac = Tok.getLoc(); SMLoc StartInBrac = Tok.getLoc();
// Parse [ Symbol + ImmDisp ] and [ BaseReg + Scale*IndexReg + ImmDisp ]. We
// Try to handle '[' 'Symbol' ']' // may have already parsed an immediate displacement before the bracketed
if (getLexer().is(AsmToken::Identifier)) { // expression.
SMLoc Loc = Tok.getLoc();
if (ParseRegister(TmpReg, Loc, End)) {
const MCExpr *Disp;
StringRef Identifier = Tok.getString();
if (getParser().parseExpression(Disp, End))
return 0;
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier))
return Err;
if (getLexer().isNot(AsmToken::RBrac))
return ErrorOperand(Tok.getLoc(), "Expected ']' token!");
if (isParsingInlineAsm()) {
// Remove the '[' and ']' from the IR string.
InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Skip, Start, 1));
InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Skip, Tok.getLoc(), 1));
}
Parser.Lex(); // Eat ']'
if (!isParsingInlineAsm())
return X86Operand::CreateMem(Disp, Start, End, Size);
return CreateMemForInlineAsm(/*SegReg=*/0, Disp, /*BaseReg=*/0,
/*IndexReg=*/0, /*Scale*/1, Start, End,
SizeDirLoc, Size, Identifier);
}
}
// Parse [ BaseReg + Scale*IndexReg + Disp ]. We may have already parsed an
// immediate displacement before the bracketed expression.
bool Done = false; bool Done = false;
IntelBracExprStateMachine SM(Parser, ImmDisp); IntelBracExprStateMachine SM(Parser, ImmDisp);
@ -1196,14 +1167,17 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
// This could be a register or a symbolic displacement. // This could be a register or a symbolic displacement.
unsigned TmpReg; unsigned TmpReg;
const MCExpr *Disp = 0; const MCExpr *Disp = 0;
AsmToken IdentTok = Parser.getTok(); SMLoc IdentLoc = Tok.getLoc();
SMLoc IdentLoc = IdentTok.getLoc(); StringRef Identifier = Tok.getString();
if(!ParseRegister(TmpReg, IdentLoc, End)) { if(!ParseRegister(TmpReg, IdentLoc, End)) {
SM.onRegister(TmpReg); SM.onRegister(TmpReg);
UpdateLocLex = false; UpdateLocLex = false;
break; break;
} else if (!getParser().parsePrimaryExpr(Disp, End)) { } else if (!getParser().parsePrimaryExpr(Disp, End)) {
SM.onDispExpr(Disp, IdentTok.getString()); if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier))
return Err;
SM.onDispExpr(Disp, Identifier);
UpdateLocLex = false; UpdateLocLex = false;
break; break;
} }
@ -1240,19 +1214,23 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Skip, End, 1)); InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Skip, End, 1));
// If ImmDisp is non-zero, then we parsed a displacement before the // If ImmDisp is non-zero, then we parsed a displacement before the
// bracketed expression (i.e., ImmDisp [ BaseReg + Scale*IndexReg + Disp ]) // bracketed expression (i.e., ImmDisp [ BaseReg + Scale*IndexReg + Disp])
uint64_t FinalImmDisp = SM.getImmDisp(); uint64_t FinalImmDisp = SM.getImmDisp();
if (ImmDisp && ImmDisp != FinalImmDisp) {
// If ImmDisp doesn't match the displacement computed by the state machine // If ImmDisp doesn't match the displacement computed by the state machine
// then we have an additional displacement in the bracketed expression. // then we have an additional displacement in the bracketed expression.
if (ImmDisp != FinalImmDisp) {
if (ImmDisp) {
// FIXME: We have an immediate displacement before the bracketed
// expression. Adjust this to match the final immediate displacement.
} else {
// We have a symbolic and an immediate displacement, but no displacement
// before the bracketed expression.
} else if (FinalImmDisp) { // Put the immediate displacement before the bracketed expression.
// We have a symbolic and an immediate displacement, but no displacement InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Imm, Start, 0,
// before the bracketed expression. FinalImmDisp));
}
// Put the immediate displacement before the bracketed expression.
InstInfo->AsmRewrites->push_back(AsmRewrite(AOK_Imm, Start, 0,
FinalImmDisp));
} }
// Remove all the ImmPrefix rewrites within the brackets. // Remove all the ImmPrefix rewrites within the brackets.
for (SmallVectorImpl<AsmRewrite>::iterator for (SmallVectorImpl<AsmRewrite>::iterator