X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FPowerPC%2FPPCSubtarget.cpp;h=606dfc09799f698a704c399ceee5c3615dc3449f;hb=4c1aa866578f7a358407a22fe55b454f52a24325;hp=3196f09ff25394d9bc08d803242a6cbd81d017fc;hpb=d401dff7966ca3ac644cddcda4f1e6d30074923e;p=oota-llvm.git

diff --git a/lib/Target/PowerPC/PPCSubtarget.cpp b/lib/Target/PowerPC/PPCSubtarget.cpp
index 3196f09ff25..606dfc09799 100644
--- a/lib/Target/PowerPC/PPCSubtarget.cpp
+++ b/lib/Target/PowerPC/PPCSubtarget.cpp
@@ -1,4 +1,4 @@
-//===- PowerPCSubtarget.cpp - PPC Subtarget Information ---------*- C++ -*-===//
+//===- PowerPCSubtarget.cpp - PPC Subtarget Information -------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,11 +11,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PowerPCSubtarget.h"
-#include "PowerPC.h"
+#include "PPCSubtarget.h"
+#include "PPC.h"
 #include "llvm/Module.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Target/SubtargetFeature.h"
+#include "PPCGenSubtarget.inc"
 
 using namespace llvm;
 PPCTargetEnum llvm::PPCTarget = TargetDefault;
@@ -28,60 +28,9 @@ namespace llvm {
                           clEnumValN(TargetDarwin,"darwin",
                                      "  Enable Darwin codegen"),
                           clEnumValEnd),
-               cl::location(PPCTarget), cl::init(TargetDefault));
-}
-
-enum PowerPCFeature {
-  PowerPCFeature64Bit   = 1 << 0,
-  PowerPCFeatureAltivec = 1 << 1,
-  PowerPCFeatureFSqrt   = 1 << 2,
-  PowerPCFeatureGPUL    = 1 << 3,
-};
-
-/// Sorted (by key) array of values for CPU subtype.
-static const SubtargetFeatureKV PowerPCSubTypeKV[] = {
-  { "601"    , "Select the PowerPC 601 processor", 0 },
-  { "602"    , "Select the PowerPC 602 processor", 0 },
-  { "603"    , "Select the PowerPC 603 processor", 0 },
-  { "603e"   , "Select the PowerPC 603e processor", 0 },
-  { "603ev"  , "Select the PowerPC 603ev processor", 0 },
-  { "604"    , "Select the PowerPC 604 processor", 0 },
-  { "604e"   , "Select the PowerPC 604e processor", 0 },
-  { "620"    , "Select the PowerPC 620 processor", 0 },
-  { "7400"   , "Select the PowerPC 7400 (G4) processor",
-               PowerPCFeatureAltivec },
-  { "7450"   , "Select the PowerPC 7450 (G4+) processor",
-               PowerPCFeatureAltivec },
-  { "750"    , "Select the PowerPC 750 (G3) processor", 0 },
-  { "970"    , "Select the PowerPC 970 (G5 - GPUL) processor",
-               PowerPCFeature64Bit | PowerPCFeatureAltivec |
-               PowerPCFeatureFSqrt | PowerPCFeatureGPUL },
-  { "g3"     , "Select the PowerPC G3 (750) processor", 0 },
-  { "g4"     , "Select the PowerPC G4 (7400) processor",
-               PowerPCFeatureAltivec },
-  { "g4+"    , "Select the PowerPC G4+ (7450) processor",
-               PowerPCFeatureAltivec },
-  { "g5"     , "Select the PowerPC g5 (970 - GPUL)  processor",
-               PowerPCFeature64Bit | PowerPCFeatureAltivec |
-               PowerPCFeatureFSqrt | PowerPCFeatureGPUL },
-  { "generic", "Select instructions for a generic PowerPC processor", 0 }
-};
-/// Length of PowerPCSubTypeKV.
-static const unsigned PowerPCSubTypeKVSize = sizeof(PowerPCSubTypeKV)
-                                             / sizeof(SubtargetFeatureKV);
-
-/// Sorted (by key) array of values for CPU features.
-static SubtargetFeatureKV PowerPCFeatureKV[] = {
-  { "64bit"  , "Should 64 bit instructions be used"  , PowerPCFeature64Bit   },
-  { "altivec", "Should Altivec instructions be used" , PowerPCFeatureAltivec },
-  { "fsqrt"  , "Should the fsqrt instruction be used", PowerPCFeatureFSqrt   },
-  { "gpul"   , "Should GPUL instructions be used"    , PowerPCFeatureGPUL    }
- };
-/// Length of PowerPCFeatureKV.
-static const unsigned PowerPCFeatureKVSize = sizeof(PowerPCFeatureKV)
-                                          / sizeof(SubtargetFeatureKV);
-
-
+               cl::location(PPCTarget), cl::init(TargetDefault));  
+} 
+ 
 #if defined(__APPLE__)
 #include <mach/mach.h>
 #include <mach/mach_host.h>
@@ -119,21 +68,26 @@ static const char *GetCurrentPowerPCCPU() {
 }
 #endif
 
+
 PPCSubtarget::PPCSubtarget(const Module &M, const std::string &FS)
-  : StackAlignment(16), IsGigaProcessor(false), IsAIX(false), IsDarwin(false) {
+  : StackAlignment(16)
+  , InstrItins()
+  , IsGigaProcessor(false)
+  , Is64Bit(false)
+  , Has64BitRegs(false)
+  , HasAltivec(false)
+  , HasFSQRT(false)
+  , IsAIX(false)
+  , IsDarwin(false) {
 
   // Determine default and user specified characteristics
-  std::string CPU;
+  std::string CPU = "generic";
 #if defined(__APPLE__)
   CPU = GetCurrentPowerPCCPU();
 #endif
-  uint32_t Bits =
-  SubtargetFeatures::Parse(FS, CPU,
-                           PowerPCSubTypeKV, PowerPCSubTypeKVSize,
-                           PowerPCFeatureKV, PowerPCFeatureKVSize);
-  IsGigaProcessor = (Bits & PowerPCFeatureGPUL ) != 0;
-  Is64Bit         = (Bits & PowerPCFeature64Bit) != 0;
-  HasFSQRT        = (Bits & PowerPCFeatureFSqrt) != 0;
+
+  // Parse features string.
+  ParseSubtargetFeatures(FS, CPU);
 
   // Set the boolean corresponding to the current target triple, or the default
   // if one cannot be determined, to true.