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

prune #includes in TargetAsmParser.h

Browse Source 
Pass in SMLoc of instr opcode into ParseInstruction.
Make AsmToken be a class, not a struct.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93457 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-01-14 21:32:45 +00:00
parent 9f82da7cbf
commit f007e853e2
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/MC/MCAsmLexer.h
View File

@ -20,7 +20,8 @@ class SMLoc;
class Target;
/// AsmToken - Target independent representation for an assembler token.
struct AsmToken {
class AsmToken {
public:
enum TokenKind {
// Markers
Eof, Error,

4
include/llvm/MC/MCParsedAsmOperand.h
View File

@ -18,8 +18,8 @@ namespace llvm {
/// between parsing an asm instruction and recognizing it.
class MCParsedAsmOperand {
public:
MCParsedAsmOperand();
virtual ~MCParsedAsmOperand() = 0;
MCParsedAsmOperand() {}
virtual ~MCParsedAsmOperand() {}
// TODO: Out of line vfun.
};

7
include/llvm/Target/TargetAsmParser.h
View File

@ -10,13 +10,13 @@
#ifndef LLVM_TARGET_TARGETPARSER_H
#define LLVM_TARGET_TARGETPARSER_H
#include "llvm/MC/MCAsmLexer.h"
namespace llvm {
class MCAsmParser;
class MCInst;
class StringRef;
class Target;
class SMLoc;
class AsmToken;
/// TargetAsmParser - Generic interface to target specific assembly parsers.
class TargetAsmParser {
@ -45,7 +45,8 @@ public:
/// \param Name - The instruction name.
/// \param Inst [out] - On success, the parsed instruction.
/// \return True on failure.
virtual bool ParseInstruction(const StringRef &Name, MCInst &Inst) = 0;
virtual bool ParseInstruction(const StringRef &Name, SMLoc NameLoc,
MCInst &Inst) = 0;
/// ParseDirective - Parse a target specific assembler directive
///

6
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -95,7 +95,8 @@ public:
ARMAsmParser(const Target &T, MCAsmParser &_Parser)
: TargetAsmParser(T), Parser(_Parser) {}
virtual bool ParseInstruction(const StringRef &Name, MCInst &Inst);
virtual bool ParseInstruction(const StringRef &Name, SMLoc NameLoc,
MCInst &Inst);
virtual bool ParseDirective(AsmToken DirectiveID);
};
@ -579,7 +580,8 @@ bool ARMAsmParser::ParseOperand(ARMOperand &Op) {
}
/// Parse an arm instruction mnemonic followed by its operands.
bool ARMAsmParser::ParseInstruction(const StringRef &Name, MCInst &Inst) {
bool ARMAsmParser::ParseInstruction(const StringRef &Name, SMLoc NameLoc,
MCInst &Inst) {
SmallVector<ARMOperand, 7> Operands;
Operands.push_back(ARMOperand::CreateToken(Name));

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

@ -60,7 +60,8 @@ public:
X86ATTAsmParser(const Target &T, MCAsmParser &_Parser)
: TargetAsmParser(T), Parser(_Parser) {}
virtual bool ParseInstruction(const StringRef &Name, MCInst &Inst);
virtual bool ParseInstruction(const StringRef &Name, SMLoc NameLoc,
MCInst &Inst);
virtual bool ParseDirective(AsmToken DirectiveID);
};
@ -401,7 +402,8 @@ bool X86ATTAsmParser::ParseMemOperand(X86Operand &Op) {
return false;
}
bool X86ATTAsmParser::ParseInstruction(const StringRef &Name, MCInst &Inst) {
bool X86ATTAsmParser::ParseInstruction(const StringRef &Name,
SMLoc NameLoc, MCInst &Inst) {
SmallVector<X86Operand, 8> Operands;
Operands.push_back(X86Operand::CreateToken(Name));

2
tools/llvm-mc/AsmParser.cpp
View File

@ -711,7 +711,7 @@ bool AsmParser::ParseStatement() {
}
MCInst Inst;
if (getTargetParser().ParseInstruction(IDVal, Inst))
if (getTargetParser().ParseInstruction(IDVal, IDLoc, Inst))
return true;
if (Lexer.isNot(AsmToken::EndOfStatement))