X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-extract%2Fllvm-extract.cpp;h=360630b41dc049013915707fb2748ddcbde0d690;hb=56867520990a4fea1353d55f71bb74a0126554e6;hp=441063848cac3f3acb2275ff256c94e91bdcc044;hpb=065344dfd5a7b3502098810b981eb0077e5d81f3;p=oota-llvm.git

diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index 441063848ca..360630b41dc 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -2,8 +2,8 @@
 //
 //                     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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -28,7 +28,7 @@ using namespace llvm;
 
 // InputFilename - The filename to read from.
 static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
+InputFilename(cl::Positional, cl::desc("<input bitcode file>"),
               cl::init("-"), cl::value_desc("filename"));
 
 static cl::opt<std::string>
@@ -39,27 +39,32 @@ static cl::opt<bool>
 Force("f", cl::desc("Overwrite output files"));
 
 static cl::opt<bool>
-DeleteFn("delete", cl::desc("Delete specified function from Module"));
+DeleteFn("delete", cl::desc("Delete specified Globals from Module"));
 
 static cl::opt<bool>
 Relink("relink",
        cl::desc("Turn external linkage for callees of function to delete"));
 
-// ExtractFunc - The function to extract from the module... defaults to main.
+// ExtractFunc - The function to extract from the module... 
 static cl::opt<std::string>
-ExtractFunc("func", cl::desc("Specify function to extract"), cl::init("main"),
+ExtractFunc("func", cl::desc("Specify function to extract"), cl::init(""),
             cl::value_desc("function"));
 
+// ExtractGlobal - The global to extract from the module...
+static cl::opt<std::string>
+ExtractGlobal("glob", cl::desc("Specify global to extract"), cl::init(""),
+              cl::value_desc("global"));
+
 int main(int argc, char **argv) {
   llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
-  cl::ParseCommandLineOptions(argc, argv, " llvm extractor\n");
+  cl::ParseCommandLineOptions(argc, argv, "llvm extractor\n");
   sys::PrintStackTraceOnErrorSignal();
 
   std::auto_ptr<Module> M;
   
   MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename);
   if (Buffer == 0) {
-    cerr << "Error reading file '" + InputFilename + "'";
+    cerr << argv[0] << ": Error reading file '" + InputFilename + "'\n";
     return 1;
   } else {
     M.reset(ParseBitcodeFile(Buffer));
@@ -67,15 +72,21 @@ int main(int argc, char **argv) {
   delete Buffer;
   
   if (M.get() == 0) {
-    cerr << argv[0] << ": bytecode didn't read correctly.\n";
+    cerr << argv[0] << ": bitcode didn't read correctly.\n";
     return 1;
   }
 
   // Figure out which function we should extract
+  GlobalVariable *G = ExtractGlobal.size() ? 
+    M.get()->getNamedGlobal(ExtractGlobal) : 0;
+
+  // Figure out which function we should extract
+  if (!ExtractFunc.size() && !ExtractGlobal.size()) ExtractFunc = "main";
   Function *F = M.get()->getFunction(ExtractFunc);
-  if (F == 0) {
+
+  if (F == 0 && G == 0) {
     cerr << argv[0] << ": program doesn't contain function named '"
-         << ExtractFunc << "'!\n";
+         << ExtractFunc << "' or a global named '" << ExtractGlobal << "'!\n";
     return 1;
   }
 
@@ -84,7 +95,11 @@ int main(int argc, char **argv) {
   PassManager Passes;
   Passes.add(new TargetData(M.get())); // Use correct TargetData
   // Either isolate the function or delete it from the Module
-  Passes.add(createFunctionExtractionPass(F, DeleteFn, Relink));
+  std::vector<GlobalValue*> GVs;
+  if (F) GVs.push_back(F);
+  if (G) GVs.push_back(G);
+
+  Passes.add(createGVExtractionPass(GVs, DeleteFn, Relink));
   if (!DeleteFn)
     Passes.add(createGlobalDCEPass());           // Delete unreachable globals
   Passes.add(createDeadTypeEliminationPass());   // Remove dead types...