[llvm-commits] [llvm] r134721 - in /llvm/trunk: include/llvm/Target/TargetAsmParser.h include/llvm/Target/TargetRegistry.h lib/MC/MCParser/TargetAsmParser.cpp lib/Target/ARM/AsmParser/ARMAsmParser.cpp lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp lib/Target/X86/AsmParser/X86AsmParser.cpp
Evan Cheng
evan.cheng at apple.com
Fri Jul 8 12:33:14 PDT 2011
Author: evancheng
Date: Fri Jul 8 14:33:14 2011
New Revision: 134721
URL: http://llvm.org/viewvc/llvm-project?rev=134721&view=rev
Log:
TargetAsmParser doesn't need reference to Target.
Modified:
llvm/trunk/include/llvm/Target/TargetAsmParser.h
llvm/trunk/include/llvm/Target/TargetRegistry.h
llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp
llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/trunk/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
Modified: llvm/trunk/include/llvm/Target/TargetAsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmParser.h?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmParser.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmParser.h Fri Jul 8 14:33:14 2011
@@ -15,7 +15,6 @@
namespace llvm {
class MCStreamer;
class StringRef;
-class Target;
class SMLoc;
class AsmToken;
class MCParsedAsmOperand;
@@ -26,23 +25,19 @@
TargetAsmParser(const TargetAsmParser &); // DO NOT IMPLEMENT
void operator=(const TargetAsmParser &); // DO NOT IMPLEMENT
protected: // Can only create subclasses.
- TargetAsmParser(const Target &);
+ TargetAsmParser();
- /// The Target that this machine was created for.
- const Target &TheTarget;
-
- /// The current set of available features.
+ /// AvailableFeatures - The current set of available features.
unsigned AvailableFeatures;
public:
virtual ~TargetAsmParser();
- const Target &getTarget() const { return TheTarget; }
-
unsigned getAvailableFeatures() const { return AvailableFeatures; }
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.
///
Modified: llvm/trunk/include/llvm/Target/TargetRegistry.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegistry.h?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetRegistry.h (original)
+++ llvm/trunk/include/llvm/Target/TargetRegistry.h Fri Jul 8 14:33:14 2011
@@ -79,7 +79,7 @@
const std::string &TT);
typedef TargetAsmLexer *(*AsmLexerCtorTy)(const Target &T,
const MCAsmInfo &MAI);
- typedef TargetAsmParser *(*AsmParserCtorTy)(const Target &T, StringRef TT,
+ typedef TargetAsmParser *(*AsmParserCtorTy)(StringRef TT,
StringRef CPU, StringRef Features,
MCAsmParser &P);
typedef MCDisassembler *(*MCDisassemblerCtorTy)(const Target &T);
@@ -300,10 +300,11 @@
/// \arg Parser - The target independent parser implementation to use for
/// parsing and lexing.
TargetAsmParser *createAsmParser(StringRef Triple, StringRef CPU,
- StringRef Features, MCAsmParser &Parser) const {
+ StringRef Features,
+ MCAsmParser &Parser) const {
if (!AsmParserCtorFn)
return 0;
- return AsmParserCtorFn(*this, Triple, CPU, Features, Parser);
+ return AsmParserCtorFn(Triple, CPU, Features, Parser);
}
/// createAsmPrinter - Create a target specific assembly printer pass. This
@@ -858,10 +859,9 @@
}
private:
- static TargetAsmParser *Allocator(const Target &T, StringRef TT,
- StringRef CPU, StringRef FS,
- MCAsmParser &P) {
- return new AsmParserImpl(T, TT, CPU, FS, P);
+ static TargetAsmParser *Allocator(StringRef TT, StringRef CPU,
+ StringRef FS, MCAsmParser &P) {
+ return new AsmParserImpl(TT, CPU, FS, P);
}
};
Modified: llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp Fri Jul 8 14:33:14 2011
@@ -10,8 +10,8 @@
#include "llvm/Target/TargetAsmParser.h"
using namespace llvm;
-TargetAsmParser::TargetAsmParser(const Target &T)
- : TheTarget(T), AvailableFeatures(0)
+TargetAsmParser::TargetAsmParser()
+ : AvailableFeatures(0)
{
}
Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Jul 8 14:33:14 2011
@@ -41,7 +41,7 @@
class ARMAsmParser : public TargetAsmParser {
MCAsmParser &Parser;
- MCSubtargetInfo *STI;
+ const MCSubtargetInfo *STI;
MCAsmParser &getParser() const { return Parser; }
MCAsmLexer &getLexer() const { return Parser.getLexer(); }
@@ -127,9 +127,8 @@
const SmallVectorImpl<MCParsedAsmOperand*> &);
public:
- ARMAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS,
- MCAsmParser &_Parser)
- : TargetAsmParser(T), Parser(_Parser) {
+ ARMAsmParser(StringRef TT, StringRef CPU, StringRef FS, MCAsmParser &_Parser)
+ : TargetAsmParser(), Parser(_Parser) {
STI = ARM_MC::createARMMCSubtargetInfo(TT, CPU, FS);
MCAsmParserExtension::Initialize(_Parser);
Modified: llvm/trunk/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp Fri Jul 8 14:33:14 2011
@@ -63,9 +63,9 @@
public:
- MBlazeAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS,
+ MBlazeAsmParser(StringRef TT, StringRef CPU, StringRef FS,
MCAsmParser &_Parser)
- : TargetAsmParser(T), Parser(_Parser) {}
+ : TargetAsmParser(), Parser(_Parser) {}
virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc,
SmallVectorImpl<MCParsedAsmOperand*> &Operands);
Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=134721&r1=134720&r2=134721&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Fri Jul 8 14:33:14 2011
@@ -37,7 +37,7 @@
class X86ATTAsmParser : public TargetAsmParser {
MCAsmParser &Parser;
- MCSubtargetInfo *STI;
+ const MCSubtargetInfo *STI;
private:
MCAsmParser &getParser() const { return Parser; }
@@ -77,9 +77,9 @@
/// }
public:
- X86ATTAsmParser(const Target &T, StringRef TT, StringRef CPU, StringRef FS,
+ X86ATTAsmParser(StringRef TT, StringRef CPU, StringRef FS,
MCAsmParser &parser)
- : TargetAsmParser(T), Parser(parser) {
+ : TargetAsmParser(), Parser(parser) {
STI = X86_MC::createX86MCSubtargetInfo(TT, CPU, FS);
// Initialize the set of available features.
More information about the llvm-commits
mailing list