6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-03 13:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Intel syntax. Support .intel_syntax directive.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149270 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2012-01-30 20:02:42 +00:00
parent 630ecf0f53
commit be3e310d5e
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ struct X86Operand;
class X86AsmParser : public MCTargetAsmParser { class X86AsmParser : public MCTargetAsmParser {
MCSubtargetInfo &STI; MCSubtargetInfo &STI;
MCAsmParser &Parser; MCAsmParser &Parser;
bool IntelSyntax;
private: private:
MCAsmParser &getParser() const { return Parser; } MCAsmParser &getParser() const { return Parser; }
@ -94,7 +94,7 @@ private:
public: public:
X86AsmParser(MCSubtargetInfo &sti, MCAsmParser &parser) X86AsmParser(MCSubtargetInfo &sti, MCAsmParser &parser)
: MCTargetAsmParser(), STI(sti), Parser(parser) { : MCTargetAsmParser(), STI(sti), Parser(parser), IntelSyntax(false) {
// Initialize the set of available features. // Initialize the set of available features.
setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits())); setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
@ -105,6 +105,10 @@ public:
SmallVectorImpl<MCParsedAsmOperand*> &Operands); SmallVectorImpl<MCParsedAsmOperand*> &Operands);
virtual bool ParseDirective(AsmToken DirectiveID); virtual bool ParseDirective(AsmToken DirectiveID);
bool isParsingIntelSyntax() {
return IntelSyntax || getParser().getAssemblerDialect();
}
}; };
} // end anonymous namespace } // end anonymous namespace
@ -470,8 +474,7 @@ bool X86AsmParser::isDstOp(X86Operand &Op) {
bool X86AsmParser::ParseRegister(unsigned &RegNo, bool X86AsmParser::ParseRegister(unsigned &RegNo,
SMLoc &StartLoc, SMLoc &EndLoc) { SMLoc &StartLoc, SMLoc &EndLoc) {
RegNo = 0; RegNo = 0;
bool IntelSyntax = getParser().getAssemblerDialect(); if (!isParsingIntelSyntax()) {
if (!IntelSyntax) {
const AsmToken &TokPercent = Parser.getTok(); const AsmToken &TokPercent = Parser.getTok();
assert(TokPercent.is(AsmToken::Percent) && "Invalid token kind!"); assert(TokPercent.is(AsmToken::Percent) && "Invalid token kind!");
StartLoc = TokPercent.getLoc(); StartLoc = TokPercent.getLoc();
@ -480,7 +483,7 @@ bool X86AsmParser::ParseRegister(unsigned &RegNo,
const AsmToken &Tok = Parser.getTok(); const AsmToken &Tok = Parser.getTok();
if (Tok.isNot(AsmToken::Identifier)) { if (Tok.isNot(AsmToken::Identifier)) {
if (IntelSyntax) return true; if (isParsingIntelSyntax()) return true;
return Error(StartLoc, "invalid register name", return Error(StartLoc, "invalid register name",
SMRange(StartLoc, Tok.getEndLoc())); SMRange(StartLoc, Tok.getEndLoc()));
} }
@ -564,7 +567,7 @@ bool X86AsmParser::ParseRegister(unsigned &RegNo,
} }
if (RegNo == 0) { if (RegNo == 0) {
if (IntelSyntax) return true; if (isParsingIntelSyntax()) return true;
return Error(StartLoc, "invalid register name", return Error(StartLoc, "invalid register name",
SMRange(StartLoc, Tok.getEndLoc())); SMRange(StartLoc, Tok.getEndLoc()));
} }
@ -575,7 +578,7 @@ bool X86AsmParser::ParseRegister(unsigned &RegNo,
} }
X86Operand *X86AsmParser::ParseOperand() { X86Operand *X86AsmParser::ParseOperand() {
if (getParser().getAssemblerDialect()) if (isParsingIntelSyntax())
return ParseIntelOperand(); return ParseIntelOperand();
return ParseATTOperand(); return ParseATTOperand();
} }
@ -1170,7 +1173,7 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
Name.startswith("rcl") || Name.startswith("rcr") || Name.startswith("rcl") || Name.startswith("rcr") ||
Name.startswith("rol") || Name.startswith("ror")) && Name.startswith("rol") || Name.startswith("ror")) &&
Operands.size() == 3) { Operands.size() == 3) {
if (getParser().getAssemblerDialect()) { if (isParsingIntelSyntax()) {
// Intel syntax // Intel syntax
X86Operand *Op1 = static_cast<X86Operand*>(Operands[2]); X86Operand *Op1 = static_cast<X86Operand*>(Operands[2]);
if (Op1->isImm() && isa<MCConstantExpr>(Op1->getImm()) && if (Op1->isImm() && isa<MCConstantExpr>(Op1->getImm()) &&
@ -1486,7 +1489,7 @@ MatchAndEmitInstruction(SMLoc IDLoc,
// First, try a direct match. // First, try a direct match.
switch (MatchInstructionImpl(Operands, Inst, OrigErrorInfo, switch (MatchInstructionImpl(Operands, Inst, OrigErrorInfo,
getParser().getAssemblerDialect())) { isParsingIntelSyntax())) {
default: break; default: break;
case Match_Success: case Match_Success:
// Some instructions need post-processing to, for example, tweak which // Some instructions need post-processing to, for example, tweak which
@ -1640,6 +1643,17 @@ bool X86AsmParser::ParseDirective(AsmToken DirectiveID) {
return ParseDirectiveWord(2, DirectiveID.getLoc()); return ParseDirectiveWord(2, DirectiveID.getLoc());
else if (IDVal.startswith(".code")) else if (IDVal.startswith(".code"))
return ParseDirectiveCode(IDVal, DirectiveID.getLoc()); return ParseDirectiveCode(IDVal, DirectiveID.getLoc());
else if (IDVal.startswith(".intel_syntax")) {
IntelSyntax = true;
if (getLexer().isNot(AsmToken::EndOfStatement)) {
if(Parser.getTok().getString() == "noprefix") {
// FIXME : Handle noprefix
Parser.Lex();
} else
return true;
}
return false;
}
return true; return true;
} }

7
test/MC/X86/intel-syntax-2.s Normal file
View File

@ -0,0 +1,7 @@
// RUN: llvm-mc -triple x86_64-unknown-unknown %s | FileCheck %s
.intel_syntax
_test:
// CHECK: movl $257, -4(%rsp)
mov DWORD PTR [RSP - 4], 257