diff options
author | Evan Cheng <evan.cheng@apple.com> | 2011-07-09 05:47:46 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-09 05:47:46 +0000 |
commit | ffc0e73046f737d75e0a62b3a83ef19bcef111e3 (patch) | |
tree | 1f82f6a0b1c1a743dd4c10377858004988a47262 /lib/Target/ARM | |
parent | 4f4a6fcd165293c347a42b543e5e55aa42a09bb2 (diff) | |
download | llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.tar.gz llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.tar.bz2 llvm-ffc0e73046f737d75e0a62b3a83ef19bcef111e3.tar.xz |
Change createAsmParser to take a MCSubtargetInfo instead of triple,
CPU, and feature string. Parsing some asm directives can change
subtarget state (e.g. .code 16) and it must be reflected in other
modules (e.g. MCCodeEmitter). That is, the MCSubtargetInfo instance
must be shared.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134795 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM')
-rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 41 | ||||
-rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 13 |
2 files changed, 19 insertions, 35 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index f927abbeda..d8fd809c4b 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -41,12 +41,8 @@ namespace { class ARMOperand; class ARMAsmParser : public TargetAsmParser { + MCSubtargetInfo &STI; MCAsmParser &Parser; - /// STI, ARM_STI, Thumb_STI - Subtarget info for ARM and Thumb modes. STI - /// points to either ARM_STI or Thumb_STI depending on the mode. - const MCSubtargetInfo *STI; - OwningPtr<const MCSubtargetInfo> ARM_STI; - OwningPtr<const MCSubtargetInfo> Thumb_STI; MCAsmParser &getParser() const { return Parser; } MCAsmLexer &getLexer() const { return Parser.getLexer(); } @@ -91,14 +87,14 @@ class ARMAsmParser : public TargetAsmParser { bool isThumb() const { // FIXME: Can tablegen auto-generate this? - return (STI->getFeatureBits() & ARM::ModeThumb) != 0; + return (STI.getFeatureBits() & ARM::ModeThumb) != 0; } bool isThumbOne() const { - return isThumb() && (STI->getFeatureBits() & ARM::FeatureThumb2) == 0; + return isThumb() && (STI.getFeatureBits() & ARM::FeatureThumb2) == 0; } void SwitchMode() { - STI = isThumb() ? ARM_STI.get() : Thumb_STI.get(); - setAvailableFeatures(ComputeAvailableFeatures(STI->getFeatureBits())); + unsigned FB = ComputeAvailableFeatures(STI.ToggleFeature(ARM::ModeThumb)); + setAvailableFeatures(FB); } /// @name Auto-generated Match Functions @@ -135,27 +131,12 @@ class ARMAsmParser : public TargetAsmParser { const SmallVectorImpl<MCParsedAsmOperand*> &); public: - ARMAsmParser(StringRef TT, StringRef CPU, StringRef FS, MCAsmParser &_Parser) - : TargetAsmParser(), Parser(_Parser) { + ARMAsmParser(MCSubtargetInfo &_STI, MCAsmParser &_Parser) + : TargetAsmParser(), STI(_STI), Parser(_Parser) { MCAsmParserExtension::Initialize(_Parser); - STI = ARM_MC::createARMMCSubtargetInfo(TT, CPU, FS); - // FIXME: Design a better way to create two subtargets with only difference - // being a feature change. - if (isThumb()) { - Thumb_STI.reset(STI); - assert(TT.startswith("thumb") && "Unexpected Triple string for Thumb!"); - Twine ARM_TT = "arm" + TT.substr(5); - ARM_STI.reset(ARM_MC::createARMMCSubtargetInfo(ARM_TT.str(), CPU, FS)); - } else { - ARM_STI.reset(STI); - assert(TT.startswith("arm") && "Unexpected Triple string for ARM!"); - Twine Thumb_TT = "thumb" + TT.substr(3); - Thumb_STI.reset(ARM_MC::createARMMCSubtargetInfo(Thumb_TT.str(),CPU, FS)); - } - // Initialize the set of available features. - setAvailableFeatures(ComputeAvailableFeatures(STI->getFeatureBits())); + setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits())); } virtual bool ParseInstruction(StringRef Name, SMLoc NameLoc, @@ -2237,10 +2218,12 @@ bool ARMAsmParser::ParseDirectiveCode(SMLoc L) { Parser.Lex(); if (Val == 16) { - if (!isThumb()) SwitchMode(); + if (!isThumb()) + SwitchMode(); getParser().getStreamer().EmitAssemblerFlag(MCAF_Code16); } else { - if (isThumb()) SwitchMode(); + if (isThumb()) + SwitchMode(); getParser().getStreamer().EmitAssemblerFlag(MCAF_Code32); } diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index 0a8e3b171d..1139cac394 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -112,17 +112,18 @@ MCRegisterInfo *createARMMCRegisterInfo() { // Force static initialization. extern "C" void LLVMInitializeARMMCInstrInfo() { - RegisterMCInstrInfo<MCInstrInfo> X(TheARMTarget); - RegisterMCInstrInfo<MCInstrInfo> Y(TheThumbTarget); - TargetRegistry::RegisterMCInstrInfo(TheARMTarget, createARMMCInstrInfo); TargetRegistry::RegisterMCInstrInfo(TheThumbTarget, createARMMCInstrInfo); } extern "C" void LLVMInitializeARMMCRegInfo() { - RegisterMCRegInfo<MCRegisterInfo> X(TheARMTarget); - RegisterMCRegInfo<MCRegisterInfo> Y(TheThumbTarget); - TargetRegistry::RegisterMCRegInfo(TheARMTarget, createARMMCRegisterInfo); TargetRegistry::RegisterMCRegInfo(TheThumbTarget, createARMMCRegisterInfo); } + +extern "C" void LLVMInitializeARMMCSubtargetInfo() { + TargetRegistry::RegisterMCSubtargetInfo(TheARMTarget, + ARM_MC::createARMMCSubtargetInfo); + TargetRegistry::RegisterMCSubtargetInfo(TheThumbTarget, + ARM_MC::createARMMCSubtargetInfo); +} |