projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MatchRegisterName() returns 0 if it can't match the register.
[oota-llvm.git]
/
lib
/
Target
/
ARM
/
AsmParser
/
ARMAsmParser.cpp
diff --git
a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 642cd9c93070f517dfe725992b61ffaac2bd3fc6..b41b71d4b0a842d9299b24207aa5af7973771fe0 100644
(file)
--- a/
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@
-8,10
+8,12
@@
//===----------------------------------------------------------------------===//
#include "ARM.h"
//===----------------------------------------------------------------------===//
#include "ARM.h"
+#include "ARMAddressingModes.h"
#include "ARMSubtarget.h"
#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCParser/MCAsmParser.h"
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "ARMSubtarget.h"
#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCParser/MCAsmParser.h"
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
+#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
@@
-92,7
+94,11
@@
private:
public:
ARMAsmParser(const Target &T, MCAsmParser &_Parser, TargetMachine &_TM)
public:
ARMAsmParser(const Target &T, MCAsmParser &_Parser, TargetMachine &_TM)
- : TargetAsmParser(T), Parser(_Parser), TM(_TM) {}
+ : TargetAsmParser(T), Parser(_Parser), TM(_TM) {
+ // Initialize the set of available features.
+ setAvailableFeatures(ComputeAvailableFeatures(
+ &TM.getSubtarget<ARMSubtarget>()));
+ }
virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc,
SmallVectorImpl<MCParsedAsmOperand*> &Operands);
virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc,
SmallVectorImpl<MCParsedAsmOperand*> &Operands);
@@
-256,16
+262,25
@@
public:
Inst.addOperand(MCOperand::CreateReg(Mem.BaseRegNum));
assert(!Mem.OffsetIsReg && "invalid mode 5 operand");
Inst.addOperand(MCOperand::CreateReg(Mem.BaseRegNum));
assert(!Mem.OffsetIsReg && "invalid mode 5 operand");
+
// FIXME: #-0 is encoded differently than #0. Does the parser preserve
// the difference?
if (Mem.Offset) {
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset);
// FIXME: #-0 is encoded differently than #0. Does the parser preserve
// the difference?
if (Mem.Offset) {
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset);
- assert (CE && "non-constant mode 5 offset operand!");
+ assert(CE && "Non-constant mode 5 offset operand!");
+
// The MCInst offset operand doesn't include the low two bits (like
// the instruction encoding).
// The MCInst offset operand doesn't include the low two bits (like
// the instruction encoding).
- Inst.addOperand(MCOperand::CreateImm(CE->getValue() / 4));
- } else
+ int64_t Offset = CE->getValue() / 4;
+ if (Offset >= 0)
+ Inst.addOperand(MCOperand::CreateImm(ARM_AM::getAM5Opc(ARM_AM::add,
+ Offset)));
+ else
+ Inst.addOperand(MCOperand::CreateImm(ARM_AM::getAM5Opc(ARM_AM::sub,
+ -Offset)));
+ } else {
Inst.addOperand(MCOperand::CreateImm(0));
Inst.addOperand(MCOperand::CreateImm(0));
+ }
}
virtual void dump(raw_ostream &OS) const;
}
virtual void dump(raw_ostream &OS) const;
@@
-369,17
+384,17
@@
static unsigned MatchRegisterName(StringRef Name);
int ARMAsmParser::TryParseRegister() {
const AsmToken &Tok = Parser.getTok();
assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier");
int ARMAsmParser::TryParseRegister() {
const AsmToken &Tok = Parser.getTok();
assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier");
-
+
// FIXME: Validate register for the current architecture; we have to do
// validation later, so maybe there is no need for this here.
// FIXME: Validate register for the current architecture; we have to do
// validation later, so maybe there is no need for this here.
-
int
RegNum = MatchRegisterName(Tok.getString());
- if (RegNum ==
-1
)
+
unsigned
RegNum = MatchRegisterName(Tok.getString());
+ if (RegNum ==
0
)
return -1;
Parser.Lex(); // Eat identifier token.
return RegNum;
}
return -1;
Parser.Lex(); // Eat identifier token.
return RegNum;
}
-
-
+
+
/// Try to parse a register name. The token must be an Identifier when called,
/// and if it is a register name the token is eaten and the register number is
/// returned. Otherwise return -1.
/// Try to parse a register name. The token must be an Identifier when called,
/// and if it is a register name the token is eaten and the register number is
/// returned. Otherwise return -1.
@@
-390,7
+405,7
@@
ARMOperand *ARMAsmParser::TryParseRegisterWithWriteBack() {
SMLoc S = Parser.getTok().getLoc();
int RegNo = TryParseRegister();
if (RegNo == -1) return 0;
SMLoc S = Parser.getTok().getLoc();
int RegNo = TryParseRegister();
if (RegNo == -1) return 0;
-
+
SMLoc E = Parser.getTok().getLoc();
bool Writeback = false;
SMLoc E = Parser.getTok().getLoc();
bool Writeback = false;
@@
-419,13
+434,12
@@
ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected");
return 0;
}
Error(RegLoc, "register expected");
return 0;
}
- int RegNum =
MatchRegisterName(RegTok.getString()
);
+ int RegNum =
TryParseRegister(
);
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
}
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
}
- Parser.Lex(); // Eat identifier token.
unsigned RegList = 1 << RegNum;
int HighRegNum = RegNum;
unsigned RegList = 1 << RegNum;
int HighRegNum = RegNum;
@@
-439,7
+453,7
@@
ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected");
return 0;
}
Error(RegLoc, "register expected");
return 0;
}
- int RegNum =
MatchRegisterName(RegTok.getString()
);
+ int RegNum =
TryParseRegister(
);
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
@@
-451,8
+465,6
@@
ARMOperand *ARMAsmParser::ParseRegisterList() {
Warning(RegLoc, "register not in ascending order in register list");
RegList |= 1 << RegNum;
HighRegNum = RegNum;
Warning(RegLoc, "register not in ascending order in register list");
RegList |= 1 << RegNum;
HighRegNum = RegNum;
-
- Parser.Lex(); // Eat identifier token.
}
const AsmToken &RCurlyTok = Parser.getTok();
if (RCurlyTok.isNot(AsmToken::RCurly)) {
}
const AsmToken &RCurlyTok = Parser.getTok();
if (RCurlyTok.isNot(AsmToken::RCurly)) {
@@
-602,7
+614,7
@@
bool ARMAsmParser::ParseMemoryOffsetReg(bool &Negative,
E = CurLoc;
}
}
E = CurLoc;
}
}
-
+
// If we parsed a register as the offset then their can be a shift after that
if (OffsetRegNum != -1) {
// Look for a comma then a shift
// If we parsed a register as the offset then their can be a shift after that
if (OffsetRegNum != -1) {
// Look for a comma then a shift
@@
-752,6
+764,7
@@
bool ARMAsmParser::ParseInstruction(StringRef Name, SMLoc NameLoc,
}
Operands.push_back(ARMOperand::CreateToken(Head, NameLoc));
}
Operands.push_back(ARMOperand::CreateToken(Head, NameLoc));
+ // FIXME: Should only add this operand for predicated instructions
Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC), NameLoc));
// Add the remaining tokens in the mnemonic.
Operands.push_back(ARMOperand::CreateCondCode(ARMCC::CondCodes(CC), NameLoc));
// Add the remaining tokens in the mnemonic.
@@
-888,15
+901,16
@@
bool ARMAsmParser::ParseDirectiveThumb(SMLoc L) {
bool ARMAsmParser::ParseDirectiveThumbFunc(SMLoc L) {
const AsmToken &Tok = Parser.getTok();
if (Tok.isNot(AsmToken::Identifier) && Tok.isNot(AsmToken::String))
bool ARMAsmParser::ParseDirectiveThumbFunc(SMLoc L) {
const AsmToken &Tok = Parser.getTok();
if (Tok.isNot(AsmToken::Identifier) && Tok.isNot(AsmToken::String))
- return Error(L, "unexpected token in .syntax directive");
+ return Error(L, "unexpected token in .thumb_func directive");
+ StringRef Name = Tok.getString();
Parser.Lex(); // Consume the identifier token.
Parser.Lex(); // Consume the identifier token.
-
if (getLexer().isNot(AsmToken::EndOfStatement))
return Error(L, "unexpected token in directive");
Parser.Lex();
if (getLexer().isNot(AsmToken::EndOfStatement))
return Error(L, "unexpected token in directive");
Parser.Lex();
- // TODO: mark symbol as a thumb symbol
- // getParser().getStreamer().Emit???();
+ // Mark symbol as a thumb symbol.
+ MCSymbol *Func = getParser().getContext().GetOrCreateSymbol(Name);
+ getParser().getStreamer().EmitThumbFunc(Func);
return false;
}
return false;
}
@@
-941,8
+955,11
@@
bool ARMAsmParser::ParseDirectiveCode(SMLoc L) {
return Error(Parser.getTok().getLoc(), "unexpected token in directive");
Parser.Lex();
return Error(Parser.getTok().getLoc(), "unexpected token in directive");
Parser.Lex();
- // TODO tell the MC streamer the mode
- // getParser().getStreamer().Emit???();
+ if (Val == 16)
+ getParser().getStreamer().EmitAssemblerFlag(MCAF_Code16);
+ else
+ getParser().getStreamer().EmitAssemblerFlag(MCAF_Code32);
+
return false;
}
return false;
}