Enhancements to pass argc & argv to main if required
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@909 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 315b9e8..b8cb490 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -777,6 +777,8 @@
// Run through the method arguments and initialize their values...
+ assert(ArgVals.size() == M->getArgumentList().size() &&
+ "Invalid number of values passed to method invocation!");
unsigned i = 0;
for (Method::ArgumentListType::iterator MI = M->getArgumentList().begin(),
ME = M->getArgumentList().end(); MI != ME; ++MI, ++i) {
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 7be3336..bcd584a 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -110,9 +110,10 @@
GenericValue lle_X_printVal(MethodType *M, const vector<GenericValue> &ArgVal) {
assert(ArgVal.size() == 1 && "generic print only takes one argument!");
- // Specialize print([ubyte {x N} ] *)
+ // Specialize print([ubyte {x N} ] *) and print(sbyte *)
if (PointerType *PTy = dyn_cast<PointerType>(M->getParamTypes()[0].get()))
- if (const ArrayType *ATy = dyn_cast<ArrayType>(PTy->getValueType())) {
+ if (PTy->getValueType() == Type::SByteTy ||
+ isa<ArrayType>(PTy->getValueType())) {
return lle_VP_printstr(M, ArgVal);
}
@@ -132,4 +133,9 @@
return GenericValue();
}
+// void "__main"()
+GenericValue lle_V___main(MethodType *M, const vector<GenericValue> &Args) {
+ return GenericValue();
+}
+
} // End extern "C"
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h
index 82e7f1f..8c2f325 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -86,6 +86,9 @@
static void print(const Type *Ty, GenericValue V);
static void printValue(const Type *Ty, GenericValue V);
+ // Hack until we can parse command line args...
+ bool callMainMethod(const string &MainName,
+ const string &InputFilename);
void list(); // Do the 'list' command
void printStackTrace(); // Do the 'backtrace' command
diff --git a/lib/ExecutionEngine/Interpreter/UserInput.cpp b/lib/ExecutionEngine/Interpreter/UserInput.cpp
index 4c2faf6..f579ef1 100644
--- a/lib/ExecutionEngine/Interpreter/UserInput.cpp
+++ b/lib/ExecutionEngine/Interpreter/UserInput.cpp
@@ -7,6 +7,7 @@
#include "Interpreter.h"
#include "llvm/Bytecode/Reader.h"
#include "llvm/Assembly/Writer.h"
+#include "llvm/DerivedTypes.h"
#include <algorithm>
enum CommandID {
@@ -199,3 +200,63 @@
return false;
}
+
+
+// callMainMethod - This is a nasty gross hack that will dissapear when
+// callMethod can parse command line options and stuff for us.
+//
+bool Interpreter::callMainMethod(const string &Name,
+ const string &InputFilename) {
+ vector<Value*> Options = LookupMatchingNames(Name);
+
+ for (unsigned i = 0; i < Options.size(); ++i) { // Remove nonmethod matches...
+ if (!isa<Method>(Options[i])) {
+ Options.erase(Options.begin()+i);
+ --i;
+ }
+ }
+
+ Value *PickedMeth = ChooseOneOption(Name, Options);
+ if (PickedMeth == 0)
+ return true;
+
+ Method *M = cast<Method>(PickedMeth);
+ const MethodType *MT = M->getMethodType();
+
+ vector<GenericValue> Args;
+ switch (MT->getParamTypes().size()) {
+ default:
+ cout << "Unknown number of arguments to synthesize for '" << Name << "'!\n";
+ return true;
+ case 2: {
+ PointerType *SPP = PointerType::get(PointerType::get(Type::SByteTy));
+ if (MT->getParamTypes()[1] != SPP) {
+ cout << "Second argument of '" << Name << "' should have type: '"
+ << SPP->getDescription() << "'!\n";
+ return true;
+ }
+ // TODO:
+ GenericValue GV; GV.PointerVal = 0;
+ Args.push_back(GV);
+ }
+ // fallthrough
+ case 1:
+ if (!MT->getParamTypes()[0]->isIntegral()) {
+ cout << "First argument of '" << Name << "' should be integral!\n";
+ return true;
+ } else {
+ GenericValue GV; GV.IntVal = 1;
+ Args.insert(Args.begin(), GV);
+ }
+ // fallthrough
+ case 0:
+ break;
+ }
+
+ callMethod(M, Args); // Start executing it...
+
+ // Reset the current frame location to the top of stack
+ CurFrame = ECStack.size()-1;
+
+ return false;
+}