Reverted back to previous revision - this was previously merged

[oota-llvm.git] / tools / lli / lli.cpp

diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 0283b5da8cb6ddbf37b1f969212e2839fa32001d..0547c433cb9f1cc6394ff27a97c8f438e4f1bb5e 100644 (file)
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -1,4 +1,11 @@
 //===- lli.cpp - LLVM Interpreter / Dynamic compiler ----------------------===//
+// 
+//                     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 utility provides a way to execute LLVM bytecode without static
 // compilation.  This consists of a very simple and slow (but portable)
@@ -11,6 +18,7 @@
 
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
+#include "llvm/ModuleProvider.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
@@ -18,6 +26,9 @@
 #include "llvm/Target/TargetData.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
+#include "Support/SystemUtils.h"
+
+using namespace llvm;
 
 namespace {
   cl::opt<std::string>
@@ -30,14 +41,17 @@ namespace {
   MainFunction("f", cl::desc("Function to execute"), cl::init("main"),
                cl::value_desc("function name"));
 
-  cl::opt<bool> TraceMode("trace", cl::desc("Enable Tracing"));
-
   cl::opt<bool> ForceInterpreter("force-interpreter",
                                  cl::desc("Force interpretation: disable JIT"),
                                  cl::init(false));
+
+  cl::opt<std::string>
+  FakeArgv0("fake-argv0",
+            cl::desc("Override the 'argv[0]' value passed into the executing"
+                     " program"), cl::value_desc("executable"));
 }
 
-static std::vector<std::string> makeStringVector(const char **envp) {
+static std::vector<std::string> makeStringVector(char * const *envp) {
   std::vector<std::string> rv;
   for (unsigned i = 0; envp[i]; ++i)
     rv.push_back(envp[i]);
@@ -92,10 +106,11 @@ static void *CreateArgv(ExecutionEngine *EE,
 /// from calling FnName, or -1 and prints an error msg. if the named
 /// function cannot be found.
 ///
-int callAsMain(ExecutionEngine *EE, Module *M, const std::string &FnName,
+int callAsMain(ExecutionEngine *EE, ModuleProvider *MP,
+               const std::string &FnName,
                const std::vector<std::string> &Args,
                const std::vector<std::string> &EnvVars) {
-  Function *Fn = M->getNamedFunction(FnName);
+  Function *Fn = MP->getModule()->getNamedFunction(FnName);
   if (!Fn) {
     std::cerr << "Function '" << FnName << "' not found in module.\n";
     return -1;
@@ -105,6 +120,7 @@ int callAsMain(ExecutionEngine *EE, Module *M, const std::string &FnName,
   GVArgc.IntVal = Args.size();
   GVArgs.push_back(GVArgc); // Arg #0 = argc.
   GVArgs.push_back(PTOGV(CreateArgv(EE, Args))); // Arg #1 = argv.
+  assert(((char **)GVTOP(GVArgs[1]))[0] && "argv[0] was null after CreateArgv");
   GVArgs.push_back(PTOGV(CreateArgv(EE, EnvVars))); // Arg #2 = envp.
   return EE->run(Fn, GVArgs).IntVal;
 }
@@ -112,35 +128,40 @@ int callAsMain(ExecutionEngine *EE, Module *M, const std::string &FnName,
 //===----------------------------------------------------------------------===//
 // main Driver function
 //
-int main(int argc, char **argv, const char **envp) {
+int main(int argc, char **argv, char * const *envp) {
   cl::ParseCommandLineOptions(argc, argv,
                               " llvm interpreter & dynamic compiler\n");
 
   // Load the bytecode...
   std::string ErrorMsg;
-  Module *M = ParseBytecodeFile(InputFile, &ErrorMsg);
-  if (M == 0) {
-    std::cout << "Error parsing '" << InputFile << "': "
-              << ErrorMsg << "\n";
+  ModuleProvider *MP = 0;
+  try {
+    MP = getBytecodeModuleProvider(InputFile);
+  } catch (std::string &err) {
+    std::cerr << "Error loading program '" << InputFile << "': " << err << "\n";
     exit(1);
   }
 
   ExecutionEngine *EE =
-    ExecutionEngine::create(M, ForceInterpreter, TraceMode);
+    ExecutionEngine::create(MP, ForceInterpreter);
   assert(EE && "Couldn't create an ExecutionEngine, not even an interpreter?");
 
-  // Add the module's name to the start of the vector of arguments to main().
-  // But delete .bc first, since programs (and users) might not expect to
-  // see it.
-  const std::string ByteCodeFileSuffix(".bc");
-  if (InputFile.rfind(ByteCodeFileSuffix) ==
-      InputFile.length() - ByteCodeFileSuffix.length()) {
-    InputFile.erase(InputFile.length() - ByteCodeFileSuffix.length());
+  // If the user specifically requested an argv[0] to pass into the program, do
+  // it now.
+  if (!FakeArgv0.empty()) {
+    InputFile = FakeArgv0;
+  } else {
+    // Otherwise, if there is a .bc suffix on the executable strip it off, it
+    // might confuse the program.
+    if (InputFile.rfind(".bc") == InputFile.length() - 3)
+      InputFile.erase(InputFile.length() - 3);
   }
+
+  // Add the module's name to the start of the vector of arguments to main().
   InputArgv.insert(InputArgv.begin(), InputFile);
 
   // Run the main function!
-  int ExitCode = callAsMain(EE, M, MainFunction, InputArgv,
+  int ExitCode = callAsMain(EE, MP, MainFunction, InputArgv,
                             makeStringVector(envp)); 
 
   // Now that we are done executing the program, shut down the execution engine