From f8f2afb8cc5f080b291faad678e0a256ea44d15f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 18 Oct 2001 21:55:32 +0000 Subject: [PATCH] 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 --- lib/ExecutionEngine/Interpreter/Execution.cpp | 2 + .../Interpreter/ExternalFunctions.cpp | 10 ++- lib/ExecutionEngine/Interpreter/Interpreter.h | 3 + lib/ExecutionEngine/Interpreter/UserInput.cpp | 61 +++++++++++++++++++ tools/lli/lli.cpp | 2 +- 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 315b9e8fb4a..b8cb4909342 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -777,6 +777,8 @@ void Interpreter::callMethod(Method *M, const vector &ArgVals) { // 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 7be3336c586..bcd584a6b5c 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -110,9 +110,10 @@ GenericValue lle_X_print(MethodType *M, const vector &ArgVals) { GenericValue lle_X_printVal(MethodType *M, const vector &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(M->getParamTypes()[0].get())) - if (const ArrayType *ATy = dyn_cast(PTy->getValueType())) { + if (PTy->getValueType() == Type::SByteTy || + isa(PTy->getValueType())) { return lle_VP_printstr(M, ArgVal); } @@ -132,4 +133,9 @@ GenericValue lle_VB_putchar(MethodType *M, const vector &Args) { return GenericValue(); } +// void "__main"() +GenericValue lle_V___main(MethodType *M, const vector &Args) { + return GenericValue(); +} + } // End extern "C" diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h index 82e7f1fc3fa..8c2f32566a5 100644 --- a/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -86,6 +86,9 @@ public: 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 4c2faf6ca16..f579ef1a9b4 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 enum CommandID { @@ -199,3 +200,63 @@ bool Interpreter::callMethod(const string &Name) { 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 Options = LookupMatchingNames(Name); + + for (unsigned i = 0; i < Options.size(); ++i) { // Remove nonmethod matches... + if (!isa(Options[i])) { + Options.erase(Options.begin()+i); + --i; + } + } + + Value *PickedMeth = ChooseOneOption(Name, Options); + if (PickedMeth == 0) + return true; + + Method *M = cast(PickedMeth); + const MethodType *MT = M->getMethodType(); + + vector 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; +} diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 9bb514e54e7..818931c5f79 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -49,7 +49,7 @@ int main(int argc, char** argv) { // Start interpreter into the main function... // - if (!I.callMethod(MainFunction) && !DebugMode) { + if (!I.callMainMethod(MainFunction, InputFilename) && !DebugMode) { // If not in debug mode and if the call succeeded, run the code now... I.run(); }