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

TargetAsmParser doesn't need reference to Target.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134721 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng 2011-07-08 19:33:14 +00:00
parent 11b4c952a6
commit 480cee5d43
6 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@
namespace llvm { namespace llvm {
class MCStreamer; class MCStreamer;
class StringRef; class StringRef;
class Target;
class SMLoc; class SMLoc;
class AsmToken; class AsmToken;
class MCParsedAsmOperand; class MCParsedAsmOperand;
@ -26,23 +25,19 @@ class TargetAsmParser : public MCAsmParserExtension {
TargetAsmParser(const TargetAsmParser &); // DO NOT IMPLEMENT TargetAsmParser(const TargetAsmParser &); // DO NOT IMPLEMENT
void operator=(const TargetAsmParser &); // DO NOT IMPLEMENT void operator=(const TargetAsmParser &); // DO NOT IMPLEMENT
protected: // Can only create subclasses. protected: // Can only create subclasses.
TargetAsmParser(const Target &); TargetAsmParser();
/// The Target that this machine was created for. /// AvailableFeatures - The current set of available features.
const Target &TheTarget;
/// The current set of available features.
unsigned AvailableFeatures; unsigned AvailableFeatures;
public: public:
virtual ~TargetAsmParser(); virtual ~TargetAsmParser();
const Target &getTarget() const { return TheTarget; }
unsigned getAvailableFeatures() const { return AvailableFeatures; } unsigned getAvailableFeatures() const { return AvailableFeatures; }
void setAvailableFeatures(unsigned Value) { AvailableFeatures = Value; } void setAvailableFeatures(unsigned Value) { AvailableFeatures = Value; }
virtual bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) = 0; virtual bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc,
SMLoc &EndLoc) = 0;
/// ParseInstruction - Parse one assembly instruction. /// ParseInstruction - Parse one assembly instruction.
/// ///

14
include/llvm/Target/TargetRegistry.h
View File

@ -79,7 +79,7 @@ namespace llvm {
const std::string &TT); const std::string &TT);
typedef TargetAsmLexer *(*AsmLexerCtorTy)(const Target &T, typedef TargetAsmLexer *(*AsmLexerCtorTy)(const Target &T,
const MCAsmInfo &MAI); const MCAsmInfo &MAI);
typedef TargetAsmParser *(*AsmParserCtorTy)(const Target &T, StringRef TT, typedef TargetAsmParser *(*AsmParserCtorTy)(StringRef TT,
StringRef CPU, StringRef Features, StringRef CPU, StringRef Features,
MCAsmParser &P); MCAsmParser &P);
typedef MCDisassembler *(*MCDisassemblerCtorTy)(const Target &T); typedef MCDisassembler *(*MCDisassemblerCtorTy)(const Target &T);
@ -300,10 +300,11 @@ namespace llvm {
/// \arg Parser - The target independent parser implementation to use for /// \arg Parser - The target independent parser implementation to use for
/// parsing and lexing. /// parsing and lexing.
TargetAsmParser *createAsmParser(StringRef Triple, StringRef CPU, TargetAsmParser *createAsmParser(StringRef Triple, StringRef CPU,
StringRef Features, MCAsmParser &Parser) const { StringRef Features,
MCAsmParser &Parser) const {
if (!AsmParserCtorFn) if (!AsmParserCtorFn)
return 0; return 0;
return AsmParserCtorFn(*this, Triple, CPU, Features, Parser); return AsmParserCtorFn(Triple, CPU, Features, Parser);
} }
/// createAsmPrinter - Create a target specific assembly printer pass. This /// createAsmPrinter - Create a target specific assembly printer pass. This
@ -858,10 +859,9 @@ namespace llvm {
} }
private: private:
static TargetAsmParser *Allocator(const Target &T, StringRef TT, static TargetAsmParser *Allocator(StringRef TT, StringRef CPU,
StringRef CPU, StringRef FS, StringRef FS, MCAsmParser &P) {
MCAsmParser &P) { return new AsmParserImpl(TT, CPU, FS, P);
return new AsmParserImpl(T, TT, CPU, FS, P);
} }
}; };

4
lib/MC/MCParser/TargetAsmParser.cpp
View File

@ -10,8 +10,8 @@
#include "llvm/Target/TargetAsmParser.h" #include "llvm/Target/TargetAsmParser.h"
using namespace llvm; using namespace llvm;
TargetAsmParser::TargetAsmParser(const Target &T) TargetAsmParser::TargetAsmParser()
: TheTarget(T), AvailableFeatures(0) : AvailableFeatures(0)
{ {
} }

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

@ -41,7 +41,7 @@ class ARMOperand;
class ARMAsmParser : public TargetAsmParser { class ARMAsmParser : public TargetAsmParser {
MCAsmParser &Parser; MCAsmParser &Parser;
MCSubtargetInfo *STI; const MCSubtargetInfo *STI;
MCAsmParser &getParser() const { return Parser; } MCAsmParser &getParser() const { return Parser; }
MCAsmLexer &getLexer() const { return Parser.getLexer(); } MCAsmLexer &getLexer() const { return Parser.getLexer(); }
@ -127,9 +127,8 @@ class ARMAsmParser : public TargetAsmParser {
const SmallVectorImpl<MCParsedAsmOperand*> &); const SmallVectorImpl<MCParsedAsmOperand*> &);
public: public:
ARMAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS, ARMAsmParser(StringRef TT, StringRef CPU, StringRef FS, MCAsmParser &_Parser)
MCAsmParser &_Parser) : TargetAsmParser(), Parser(_Parser) {
: TargetAsmParser(T), Parser(_Parser) {
STI = ARM_MC::createARMMCSubtargetInfo(TT, CPU, FS); STI = ARM_MC::createARMMCSubtargetInfo(TT, CPU, FS);
MCAsmParserExtension::Initialize(_Parser); MCAsmParserExtension::Initialize(_Parser);

4
lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
View File

@ -63,9 +63,9 @@ class MBlazeAsmParser : public TargetAsmParser {
public: public:
MBlazeAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS, MBlazeAsmParser(StringRef TT, StringRef CPU, StringRef FS,
MCAsmParser &_Parser) MCAsmParser &_Parser)
: TargetAsmParser(T), Parser(_Parser) {} : TargetAsmParser(), Parser(_Parser) {}
virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc, virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc,
SmallVectorImpl<MCParsedAsmOperand*> &Operands); SmallVectorImpl<MCParsedAsmOperand*> &Operands);

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

@ -37,7 +37,7 @@ struct X86Operand;
class X86ATTAsmParser : public TargetAsmParser { class X86ATTAsmParser : public TargetAsmParser {
MCAsmParser &Parser; MCAsmParser &Parser;
MCSubtargetInfo *STI; const MCSubtargetInfo *STI;
private: private:
MCAsmParser &getParser() const { return Parser; } MCAsmParser &getParser() const { return Parser; }
@ -77,9 +77,9 @@ private:
/// } /// }
public: public:
X86ATTAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS, X86ATTAsmParser(StringRef TT, StringRef CPU, StringRef FS,
MCAsmParser &parser) MCAsmParser &parser)
: TargetAsmParser(T), Parser(parser) { : TargetAsmParser(), Parser(parser) {
STI = X86_MC::createX86MCSubtargetInfo(TT, CPU, FS); STI = X86_MC::createX86MCSubtargetInfo(TT, CPU, FS);
// Initialize the set of available features. // Initialize the set of available features.