[llvm-commits] CVS: llvm/tools/lli/JIT/Intercept.cpp JIT.cpp VM.h

[Brian Gaeke]

Changes in directory llvm/tools/lli/JIT:

Intercept.cpp updated: 1.6 -> 1.7
JIT.cpp updated: 1.16 -> 1.17
VM.h updated: 1.11 -> 1.12

---
Log message:

Make CreateArgv part of lli rather than part of ExecutionEngine.
Switch Interpreter and JIT's "run" methods to take a Function and a vector of
 GenericValues.
Move (almost all of) the stuff that constructs a canonical call to main()
 into lli (new methods "callAsMain", "makeStringVector").
Nuke getCurrentExecutablePath(), enableTracing(), getCurrentFunction(),
 isStopped(), and many dead decls from interpreter.
Add linux strdup() support to interpreter.
Make interpreter's atexit handler runner and JIT's runAtExitHandlers() look
 more alike, in preparation for refactoring.
atexit() is spelled "atexit", not "at_exit".


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/Intercept.cpp
diff -u llvm/tools/lli/JIT/Intercept.cpp:1.6 llvm/tools/lli/JIT/Intercept.cpp:1.7
--- llvm/tools/lli/JIT/Intercept.cpp:1.6	Mon Jul 28 14:07:30 2003
+++ llvm/tools/lli/JIT/Intercept.cpp	Fri Sep  5 13:42:01 2003
@@ -12,33 +12,38 @@
 #include "Config/dlfcn.h"    // dlsym access
 #include <iostream>
 
-// AtExitList - List of functions registered with the at_exit function
-static std::vector<void (*)()> AtExitList;
+// AtExitHandlers - List of functions to call when the program exits,
+// registered with the atexit() library function.
+static std::vector<void (*)()> AtExitHandlers;
 
+/// runAtExitHandlers - Run any functions registered by the program's
+/// calls to atexit(3), which we intercept and store in
+/// AtExitHandlers.
+///
 void VM::runAtExitHandlers() {
-  while (!AtExitList.empty()) {
-    void (*Fn)() = AtExitList.back();
-    AtExitList.pop_back();
+  while (!AtExitHandlers.empty()) {
+    void (*Fn)() = AtExitHandlers.back();
+    AtExitHandlers.pop_back();
     Fn();
   }
 }
 
 //===----------------------------------------------------------------------===//
-// Function stubs that are invoked instead of raw system calls
+// Function stubs that are invoked instead of certain library calls
 //===----------------------------------------------------------------------===//
 
 // NoopFn - Used if we have nothing else to call...
 static void NoopFn() {}
 
-// jit_exit - Used to intercept the "exit" system call.
+// jit_exit - Used to intercept the "exit" library call.
 static void jit_exit(int Status) {
-  VM::runAtExitHandlers();   // Run at_exit handlers...
+  VM::runAtExitHandlers();   // Run atexit handlers...
   exit(Status);
 }
 
-// jit_atexit - Used to intercept the "at_exit" system call.
+// jit_atexit - Used to intercept the "atexit" library call.
 static int jit_atexit(void (*Fn)(void)) {
-  AtExitList.push_back(Fn);    // Take note of at_exit handler...
+  AtExitHandlers.push_back(Fn);    // Take note of atexit handler...
   return 0;  // Always successful
 }
 


Index: llvm/tools/lli/JIT/JIT.cpp
diff -u llvm/tools/lli/JIT/JIT.cpp:1.16 llvm/tools/lli/JIT/JIT.cpp:1.17
--- llvm/tools/lli/JIT/JIT.cpp:1.16	Wed Sep  3 15:34:19 2003
+++ llvm/tools/lli/JIT/JIT.cpp	Fri Sep  5 13:42:01 2003
@@ -6,6 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VM.h"
+#include "../GenericValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineImpls.h"
 #include "llvm/Module.h"
@@ -100,38 +101,24 @@
   emitGlobals();
 }
 
-/// VM::run - This method begins the execution of a program beginning at the
-/// specified function name.  The function is called with the specified
-/// arguments and array of environment variables (a la main()).
+/// run - Start execution with the specified function and arguments.
 ///
-/// Inputs:
-///	FnName - The name of the function as a C++ string.
-///	Args   - A vector of C++ strings containing the arguments.
-///	envp   - An array of C strings containing the environment.
-///
-/// Return value:
-///	1 - An error occurred.
-///	Otherwise, the return value from the specified function is returned.
-///
-int VM::run(const std::string &FnName, const std::vector<std::string> &Args,
-            const char **envp) {
-  Function *F = getModule().getNamedFunction(FnName);
-  if (F == 0) {
-    std::cerr << "Could not find function '" << FnName << "' in module!\n";
-    return 1;
-  }
-
-  int (*PF)(int, char**, const char**) =
-    (int(*)(int, char**, const char**))getPointerToFunction(F);
-  assert(PF != 0 && "Null pointer to function?");
-
-  // Build an argv vector...
-  char **Argv = (char**)CreateArgv(Args);
-
-  // Call the main function...
-  int Result = PF(Args.size(), Argv, envp);
+GenericValue VM::run(Function *F, const std::vector<GenericValue> &ArgValues)
+{
+  assert (F && "Function *F was null at entry to run()");
+
+  int (*PF)(int, char **, const char **) =
+    (int(*)(int, char **, const char **))getPointerToFunction(F);
+  assert(PF != 0 && "Pointer to fn's code was null after getPointerToFunction");
+
+  // Call the function.
+  int ExitCode = PF(ArgValues[0].IntVal, (char **) GVTOP (ArgValues[1]),
+		    (const char **) GVTOP (ArgValues[2]));
 
   // Run any atexit handlers now!
   runAtExitHandlers();
-  return Result;
+
+  GenericValue rv;
+  rv.IntVal = ExitCode;
+  return rv;
 }


Index: llvm/tools/lli/JIT/VM.h
diff -u llvm/tools/lli/JIT/VM.h:1.11 llvm/tools/lli/JIT/VM.h:1.12
--- llvm/tools/lli/JIT/VM.h:1.11	Wed Sep  3 15:34:19 2003
+++ llvm/tools/lli/JIT/VM.h	Fri Sep  5 13:42:01 2003
@@ -33,9 +33,8 @@
 
   /// run - Start execution with the specified function and arguments.
   ///
-  virtual int run(const std::string &FnName,
-                  const std::vector<std::string> &Args,
-                  const char ** envp);
+  virtual GenericValue run(Function *F,
+			   const std::vector<GenericValue> &ArgValues);
 
   /// getPointerToNamedFunction - This method returns the address of the
   /// specified function by using the dlsym function call.  As such it is only