diff options
| author | Dale Johannesen <dalej@apple.com> | 2008-02-14 23:35:16 +0000 |
|---|---|---|
| committer | Dale Johannesen <dalej@apple.com> | 2008-02-14 23:35:16 +0000 |
| commit | db01c8ba26f288636d3f574a96af3499ee6d2579 (patch) | |
| tree | dfe018bb9bdd766ec53dd61d3679b1c160f85cd8 | |
| parent | 9b03daa2a3a668e4313e0d869bb10aad5b08262a (diff) | |
| download | llvm-db01c8ba26f288636d3f574a96af3499ee6d2579.tar.gz llvm-db01c8ba26f288636d3f574a96af3499ee6d2579.tar.bz2 llvm-db01c8ba26f288636d3f574a96af3499ee6d2579.tar.xz | |
Rewrite tblgen handling of subtarget features so
it follows the order of the enum, not alphabetical.
The motivation is to make -mattr=+ssse3,+sse41
select SSE41 as it ought to. Added "ignored"
enum values of 0 to PPC and SPU to avoid compiler
warnings.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47143 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/CellSPU/SPUSubtarget.h | 1 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCAsmPrinter.cpp | 1 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCSubtarget.cpp | 1 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCSubtarget.h | 1 | ||||
| -rw-r--r-- | utils/TableGen/SubtargetEmitter.cpp | 8 |
5 files changed, 10 insertions, 2 deletions
diff --git a/lib/Target/CellSPU/SPUSubtarget.h b/lib/Target/CellSPU/SPUSubtarget.h index 2ee7bb8520..51dd44c5f9 100644 --- a/lib/Target/CellSPU/SPUSubtarget.h +++ b/lib/Target/CellSPU/SPUSubtarget.h @@ -26,6 +26,7 @@ namespace llvm { namespace SPU { enum { + PROC_NONE, DEFAULT_PROC }; } diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index 71ce14708c..605dc128db 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -849,6 +849,7 @@ bool DarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { bool DarwinAsmPrinter::doInitialization(Module &M) { static const char *CPUDirectives[] = { + "", "ppc", "ppc601", "ppc602", diff --git a/lib/Target/PowerPC/PPCSubtarget.cpp b/lib/Target/PowerPC/PPCSubtarget.cpp index dff53baa16..030dc7a17c 100644 --- a/lib/Target/PowerPC/PPCSubtarget.cpp +++ b/lib/Target/PowerPC/PPCSubtarget.cpp @@ -60,6 +60,7 @@ PPCSubtarget::PPCSubtarget(const TargetMachine &tm, const Module &M, const std::string &FS, bool is64Bit) : TM(tm) , StackAlignment(16) + , DarwinDirective(PPC::DIR_NONE) , IsGigaProcessor(false) , Has64BitSupport(false) , Use64BitRegs(false) diff --git a/lib/Target/PowerPC/PPCSubtarget.h b/lib/Target/PowerPC/PPCSubtarget.h index c55e09720b..be4c21cd44 100644 --- a/lib/Target/PowerPC/PPCSubtarget.h +++ b/lib/Target/PowerPC/PPCSubtarget.h @@ -27,6 +27,7 @@ namespace llvm { namespace PPC { // -m directive values. enum { + DIR_NONE, DIR_32, DIR_601, DIR_602, diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp index 1f34bcc217..5e7688a619 100644 --- a/utils/TableGen/SubtargetEmitter.cpp +++ b/utils/TableGen/SubtargetEmitter.cpp @@ -482,8 +482,12 @@ void SubtargetEmitter::ParseFeaturesFunction(std::ostream &OS) { const std::string &Value = R->getValueAsString("Value"); const std::string &Attribute = R->getValueAsString("Attribute"); - OS << " if ((Bits & " << Instance << ") != 0) " - << Attribute << " = " << Value << ";\n"; + if (Value=="true" || Value=="false") + OS << " if ((Bits & " << Instance << ") != 0) " + << Attribute << " = " << Value << ";\n"; + else + OS << " if ((Bits & " << Instance << ") != 0 && " << Attribute << + " < " << Value << ") " << Attribute << " = " << Value << ";\n"; } if (HasItineraries) { |