X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FAlpha%2FAlphaSubtarget.cpp;h=d5a9365d75c11f351a91612c2beaed761ef7ac57;hb=a9aa3523bfbf048c33eb52d44dd0449a10cc9c26;hp=794ecb304ac84a86ede9b89fdb442154bf7205e5;hpb=ac35cd207f3f186aef469cb834eca6ca2f1228f2;p=oota-llvm.git

diff --git a/lib/Target/Alpha/AlphaSubtarget.cpp b/lib/Target/Alpha/AlphaSubtarget.cpp
index 794ecb304ac..d5a9365d75c 100644
--- a/lib/Target/Alpha/AlphaSubtarget.cpp
+++ b/lib/Target/Alpha/AlphaSubtarget.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Andrew Lenharth and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,49 +13,13 @@
 
 #include "AlphaSubtarget.h"
 #include "Alpha.h"
-#include "llvm/Module.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Target/SubtargetFeature.h"
-#include "llvm/Support/Debug.h"
-
+#include "AlphaGenSubtarget.inc"
 using namespace llvm;
 
-enum AlphaFeature {
-  AlphaFeatureCIX   = 1 << 0,
-  AlphaFeatureFIX = 1 << 1,
-};
-
-/// Sorted (by key) array of values for CPU subtype.
-static const SubtargetFeatureKV AlphaSubTypeKV[] = {
-  { "ev56"    , "Select the Alpha EV56 processor", 0 },
-  { "ev6"    , "Select the Alpha EV6 processor", AlphaFeatureFIX },
-  { "ev67"    , "Select the Alpha EV67 processor", AlphaFeatureFIX | AlphaFeatureCIX },
-  { "pca56"    , "Select the Alpha PCA56 processor", 0 },
-  { "generic", "Select instructions for a generic Alpha processor (EV56)", 0 }
-};
-
-/// Length of AlphaSubTypeKV.
-static const unsigned AlphaSubTypeKVSize = sizeof(AlphaSubTypeKV)
-                                             / sizeof(SubtargetFeatureKV);
-
-/// Sorted (by key) array of values for CPU features.
-static SubtargetFeatureKV AlphaFeatureKV[] = {
-  { "FIX"  , "Should FIX extentions be used"  , AlphaFeatureFIX },
-  { "CIX", "Should CIX extentions be used" , AlphaFeatureCIX }
- };
-/// Length of AlphaFeatureKV.
-static const unsigned AlphaFeatureKVSize = sizeof(AlphaFeatureKV)
-                                          / sizeof(SubtargetFeatureKV);
-
 AlphaSubtarget::AlphaSubtarget(const Module &M, const std::string &FS)
-  :HasF2I(false), HasCT(false)
-{
+  : HasCT(false) {
   std::string CPU = "generic";
-  uint32_t Bits =
-  SubtargetFeatures::Parse(FS, CPU,
-                           AlphaSubTypeKV, AlphaSubTypeKVSize,
-                           AlphaFeatureKV, AlphaFeatureKVSize);
-  HasF2I = (Bits & AlphaFeatureFIX) != 0;
-  HasCT  = (Bits & AlphaFeatureCIX) != 0;
 
+  // Parse features string.
+  ParseSubtargetFeatures(FS, CPU);
 }