X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FPluginLoader.cpp;h=3c9de89a4265d2b8ea513b768496a16c20471c7f;hb=cd6f2bfc268add3dd54cbdf98b2a2c4862fe4ba5;hp=be8833d0096dd303c38704e0379a09b0e3c5cf5a;hpb=2cdd21c2e4d855500dfb53f77aa74da53ccf9de6;p=oota-llvm.git

diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index be8833d0096..3c9de89a426 100644
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -1,41 +1,44 @@
 //===-- PluginLoader.cpp - Implement -load command line option ------------===//
-// 
+//
 //                     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 implements the -load <plugin> command line option processor.  When
-// linked into a program, this new command line option is available that allows
-// users to load shared objects into the running program.
+//===----------------------------------------------------------------------===//
 //
-// Note that there are no symbols exported by the .o file generated for this
-// .cpp file.  Because of this, a program must link against support.o instead of
-// support.a: otherwise this translation unit will not be included.
+// This file implements the -load <plugin> command line option handler.
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DynamicLinker.h"
-#include "Support/CommandLine.h"
-#include "Config/dlfcn.h"
-#include "Config/link.h"
-#include <iostream>
+#define DONT_GET_PLUGIN_LOADER_OPTION
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/System/DynamicLibrary.h"
+#include <ostream>
+#include <vector>
 using namespace llvm;
 
-namespace {
-  struct PluginLoader {
-    void operator=(const std::string &Filename) {
-      std::string ErrorMessage;
-      if (LinkDynamicObject (Filename.c_str (), &ErrorMessage))
-        std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
-                  << "\n  -load request ignored.\n";	
-    }
-  };
+static std::vector<std::string> *Plugins;
+
+void PluginLoader::operator=(const std::string &Filename) {
+  if (!Plugins)
+    Plugins = new std::vector<std::string>();
+
+  std::string Error;
+  if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
+    cerr << "Error opening '" << Filename << "': " << Error
+         << "\n  -load request ignored.\n";
+  } else {
+    Plugins->push_back(Filename);
+  }
+}
+
+unsigned PluginLoader::getNumPlugins() {
+  return Plugins ? Plugins->size() : 0;
 }
 
-// This causes operator= above to be invoked for every -load option.
-static cl::opt<PluginLoader, false, cl::parser<std::string> >
-LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"),
-        cl::desc("Load the specified plugin"));
+std::string &PluginLoader::getPlugin(unsigned num) {
+  assert(Plugins && num < Plugins->size() && "Asking for an out of bounds plugin");
+  return (*Plugins)[num];
+}