Remove NaClMode

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142338 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Meyer 2011-10-18 05:29:23 +00:00
parent fe04757f5e
commit 928698b14e
10 changed files with 4 additions and 42 deletions

View File

@ -23,9 +23,6 @@ include "llvm/Target/Target.td"
def ModeThumb : SubtargetFeature<"thumb-mode", "InThumbMode", "true",
"Thumb mode">;
def ModeNaCl : SubtargetFeature<"nacl-mode", "InNaClMode", "true",
"Native client mode">;
//===----------------------------------------------------------------------===//
// ARM Subtarget features.
//

View File

@ -213,8 +213,7 @@ def IsARM : Predicate<"!Subtarget->isThumb()">,
AssemblerPredicate<"!ModeThumb">;
def IsDarwin : Predicate<"Subtarget->isTargetDarwin()">;
def IsNotDarwin : Predicate<"!Subtarget->isTargetDarwin()">;
def IsNaCl : Predicate<"Subtarget->isTargetNaCl()">,
AssemblerPredicate<"ModeNaCl">;
def IsNaCl : Predicate<"Subtarget->isTargetNaCl()">;
// FIXME: Eventually this will be just "hasV6T2Ops".
def UseMovt : Predicate<"Subtarget->useMovt()">;

View File

@ -53,7 +53,6 @@ ARMSubtarget::ARMSubtarget(const std::string &TT, const std::string &CPU,
, HasVMLxForwarding(false)
, SlowFPBrcc(false)
, InThumbMode(false)
, InNaClMode(false)
, HasThumb2(false)
, IsMClass(false)
, NoARM(false)

View File

@ -70,9 +70,6 @@ protected:
/// InThumbMode - True if compiling for Thumb, false for ARM.
bool InThumbMode;
/// InNaClMode - True if targeting Native Client
bool InNaClMode;
/// HasThumb2 - True if Thumb2 instructions are supported.
bool HasThumb2;

View File

@ -89,14 +89,6 @@ std::string ARM_MC::ParseARMTriple(StringRef TT) {
ARMArchFeature += ",+thumb-mode";
}
Triple TheTriple(TT);
if (TheTriple.getOS() == Triple::NativeClient) {
if (ARMArchFeature.empty())
ARMArchFeature = "+nacl-mode";
else
ARMArchFeature += ",+nacl-mode";
}
return ARMArchFeature;
}

View File

@ -45,10 +45,6 @@ std::string X86_MC::ParseX86Triple(StringRef TT) {
FS = "+64bit-mode";
else
FS = "-64bit-mode";
if (TheTriple.getOS() == Triple::NativeClient)
FS += ",+nacl-mode";
else
FS += ",-nacl-mode";
return FS;
}

View File

@ -23,9 +23,6 @@ include "llvm/Target/Target.td"
def Mode64Bit : SubtargetFeature<"64bit-mode", "In64BitMode", "true",
"64-bit mode (x86_64)">;
def ModeNaCl : SubtargetFeature<"nacl-mode", "InNaClMode", "true",
"Native Client mode">;
//===----------------------------------------------------------------------===//
// X86 Subtarget features.
//===----------------------------------------------------------------------===//

View File

@ -490,14 +490,8 @@ def In64BitMode : Predicate<"Subtarget->is64Bit()">,
AssemblerPredicate<"Mode64Bit">;
def IsWin64 : Predicate<"Subtarget->isTargetWin64()">;
def NotWin64 : Predicate<"!Subtarget->isTargetWin64()">;
def IsNaCl : Predicate<"Subtarget->isTargetNaCl()">,
AssemblerPredicate<"ModeNaCl">;
def IsNaCl32 : Predicate<"Subtarget->isTargetNaCl32()">,
AssemblerPredicate<"ModeNaCl,!Mode64Bit">;
def IsNaCl64 : Predicate<"Subtarget->isTargetNaCl64()">,
AssemblerPredicate<"ModeNaCl,Mode64Bit">;
def NotNaCl : Predicate<"!Subtarget->isTargetNaCl()">,
AssemblerPredicate<"!ModeNaCl">;
def IsNaCl : Predicate<"Subtarget->isTargetNaCl()">;
def NotNaCl : Predicate<"!Subtarget->isTargetNaCl()">;
def SmallCode : Predicate<"TM.getCodeModel() == CodeModel::Small">;
def KernelCode : Predicate<"TM.getCodeModel() == CodeModel::Kernel">;
def FarData : Predicate<"TM.getCodeModel() != CodeModel::Small &&"

View File

@ -321,8 +321,7 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU,
// FIXME: this is a known good value for Yonah. How about others?
, MaxInlineSizeThreshold(128)
, TargetTriple(TT)
, In64BitMode(is64Bit)
, InNaClMode(false) {
, In64BitMode(is64Bit) {
// Determine default and user specified characteristics
if (!FS.empty() || !CPU.empty()) {
std::string CPUName = CPU;
@ -368,11 +367,6 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU,
if (In64BitMode)
ToggleFeature(X86::Mode64Bit);
if (isTargetNaCl()) {
InNaClMode = true;
ToggleFeature(X86::ModeNaCl);
}
if (HasAVX)
X86SSELevel = NoMMXSSE;

View File

@ -137,9 +137,6 @@ private:
/// In64BitMode - True if compiling for 64-bit, false for 32-bit.
bool In64BitMode;
/// InNaClMode - True if compiling for Native Client target.
bool InNaClMode;
public:
/// This constructor initializes the data members to match that