diff options
Diffstat (limited to 'lib/ExecutionEngine/Interpreter/Interpreter.h')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Interpreter.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h index 44b382bd9f..ffe1001597 100644 --- a/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -41,7 +41,7 @@ union GenericValue { PointerTy PointerVal; }; -typedef vector<GenericValue> ValuePlaneTy; +typedef std::vector<GenericValue> ValuePlaneTy; // ExecutionContext struct - This struct represents one stack frame currently // executing. @@ -51,7 +51,7 @@ struct ExecutionContext { BasicBlock *CurBB; // The currently executing BB BasicBlock::iterator CurInst; // The next instruction to execute MethodInfo *MethInfo; // The MethInfo annotation for the method - vector<ValuePlaneTy> Values; // ValuePlanes for each type + std::vector<ValuePlaneTy> Values;// ValuePlanes for each type BasicBlock *PrevBB; // The previous BB or null if in first BB CallInst *Caller; // Holds the call that called subframes. @@ -69,7 +69,7 @@ class Interpreter { // The runtime stack of executing code. The top of the stack is the current // method record. - vector<ExecutionContext> ECStack; + std::vector<ExecutionContext> ECStack; public: Interpreter(); @@ -86,24 +86,24 @@ public: void handleUserInput(); // User Interation Methods... - void loadModule(const string &Filename); + void loadModule(const std::string &Filename); bool flushModule(); - bool callMethod(const string &Name); // return true on failure - void setBreakpoint(const string &Name); - void infoValue(const string &Name); - void print(const string &Name); + bool callMethod(const std::string &Name); // return true on failure + void setBreakpoint(const std::string &Name); + void infoValue(const std::string &Name); + void print(const std::string &Name); 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 vector<string> &InputFilename); + bool callMainMethod(const std::string &MainName, + const std::vector<std::string> &InputFilename); void list(); // Do the 'list' command void printStackTrace(); // Do the 'backtrace' command // Code execution methods... - void callMethod (Method *Meth, const vector<GenericValue> &ArgVals); + void callMethod(Method *Meth, const std::vector<GenericValue> &ArgVals); bool executeInstruction(); // Execute one instruction... void stepInstruction(); // Do the 'step' command @@ -117,7 +117,7 @@ public: void executeBrInst(BranchInst *I, ExecutionContext &SF); void executeAllocInst(AllocationInst *I, ExecutionContext &SF); GenericValue callExternalMethod(Method *Meth, - const vector<GenericValue> &ArgVals); + const std::vector<GenericValue> &ArgVals); void exitCalled(GenericValue GV); // getCurrentMethod - Return the currently executing method @@ -134,7 +134,7 @@ private: // Helper functions // getCurrentExecutablePath() - Return the directory that the lli executable // lives in. // - string getCurrentExecutablePath() const; + std::string getCurrentExecutablePath() const; // printCurrentInstruction - Print out the instruction that the virtual PC is // at, or fail silently if no program is running. @@ -151,13 +151,14 @@ private: // Helper functions // matches to that name. This is obviously slow, and should only be used for // user interaction. // - vector<Value*> LookupMatchingNames(const string &Name); + std::vector<Value*> LookupMatchingNames(const std::string &Name); // ChooseOneOption - Prompt the user to choose among the specified options to // pick one value. If no options are provided, emit an error. If a single // option is provided, just return that option. // - Value *ChooseOneOption(const string &Name, const vector<Value*> &Opts); + Value *ChooseOneOption(const std::string &Name, + const std::vector<Value*> &Opts); void initializeExecutionEngine(); |