X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FPasses.cpp;h=6742146a3833aa5a63c469d661e3879230114e99;hb=a9407f593778c3eff02dbb1fa11129865a59c6d3;hp=37b4dde2a82e801b005ec58a6cb8f09648188064;hpb=c8dec2c23e7b31e4f7a40d686d95513a442a0b6e;p=oota-llvm.git

diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp
index 37b4dde2a82..6742146a383 100644
--- a/lib/CodeGen/Passes.cpp
+++ b/lib/CodeGen/Passes.cpp
@@ -1,10 +1,10 @@
 //===-- Passes.cpp - Target independent code generation passes ------------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group 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.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file defines interfaces to access the target independent code
@@ -12,36 +12,45 @@
 //
 //===---------------------------------------------------------------------===//
 
+#include "llvm/CodeGen/RegAllocRegistry.h"
 #include "llvm/CodeGen/Passes.h"
-#include "Support/CommandLine.h"
-#include <iostream>
+
 using namespace llvm;
 
-namespace {
-  enum RegAllocName { simple, local, linearscan };
+//===---------------------------------------------------------------------===//
+///
+/// RegisterRegAlloc class - Track the registration of register allocators.
+///
+//===---------------------------------------------------------------------===//
+MachinePassRegistry RegisterRegAlloc::Registry;
+
 
-  cl::opt<RegAllocName>
+//===---------------------------------------------------------------------===//
+///
+/// RegAlloc command line options.
+///
+//===---------------------------------------------------------------------===//
+namespace {
+  cl::opt<RegisterRegAlloc::FunctionPassCtor, false,
+          RegisterPassParser<RegisterRegAlloc> >
   RegAlloc("regalloc",
-           cl::desc("Register allocator to use: (default = simple)"),
-           cl::Prefix,
-           cl::values(clEnumVal(simple,      "  simple register allocator"),
-                      clEnumVal(local,       "  local register allocator"),
-                      clEnumVal(linearscan,  "  linear scan register allocator"),
-                      clEnumValEnd),
-           cl::init(local));
+           cl::init(&createLinearScanRegisterAllocator),
+           cl::desc("Register allocator to use: (default = linearscan)")); 
 }
 
+
+//===---------------------------------------------------------------------===//
+///
+/// createRegisterAllocator - choose the appropriate register allocator.
+///
+//===---------------------------------------------------------------------===//
 FunctionPass *llvm::createRegisterAllocator() {
-  switch (RegAlloc) {
-  default:
-    std::cerr << "no register allocator selected";
-    abort();
-  case simple:
-    return createSimpleRegisterAllocator();
-  case local:
-    return createLocalRegisterAllocator();
-  case linearscan:
-    return createLinearScanRegisterAllocator();
+  RegisterRegAlloc::FunctionPassCtor Ctor = RegisterRegAlloc::getDefault();
+  
+  if (!Ctor) {
+    Ctor = RegAlloc;
+    RegisterRegAlloc::setDefault(RegAlloc);
   }
+  
+  return Ctor();
 }
-