No longer run atExit functions from run()
rename run to runFunction
Genericize the runFunction code a little bit, though it still stinks
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10610 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp
index d397414..6a067fd 100644
--- a/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/lib/ExecutionEngine/JIT/JIT.cpp
@@ -51,22 +51,31 @@
/// run - Start execution with the specified function and arguments.
///
-GenericValue JIT::run(Function *F, const std::vector<GenericValue> &ArgValues) {
+GenericValue JIT::runFunction(Function *F,
+ const std::vector<GenericValue> &ArgValues) {
assert (F && "Function *F was null at entry to run()");
+ GenericValue rv;
- 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");
+ if (ArgValues.size() == 3) {
+ int (*PF)(int, char **, const char **) =
+ (int(*)(int, char **, const char **))getPointerToFunction(F);
+ assert(PF && "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]));
+
+ rv.IntVal = ExitCode;
+ } else {
+ // FIXME: This code should handle a couple of common cases efficiently, but
+ // it should also implement the general case by code-gening a new anonymous
+ // nullary function to call.
+ assert(ArgValues.size() == 1);
+ void (*PF)(int) = (void(*)(int))getPointerToFunction(F);
+ assert(PF && "Pointer to fn's code was null after getPointerToFunction");
+ PF(ArgValues[0].IntVal);
+ }
- // Call the function.
- int ExitCode = PF(ArgValues[0].IntVal, (char **) GVTOP (ArgValues[1]),
- (const char **) GVTOP (ArgValues[2]));
-
- // Run any atexit handlers now!
- runAtExitHandlers();
-
- GenericValue rv;
- rv.IntVal = ExitCode;
return rv;
}