[llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp ExecutionEngine.h lli.cpp

[Brian Gaeke]

Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.24 -> 1.25
ExecutionEngine.h updated: 1.9 -> 1.10
lli.cpp updated: 1.23 -> 1.24

---
Log message:

Interpreter cleanups:

Get rid of support for DebugMode (make it always off).
Mung some comments.
Get rid of interpreter's PROFILE_STRUCTURE_FIELDS and PerformExitStuff
 which have been disabled forever.
Get rid of -abort-on-exception (make it always on).
Get rid of user interaction stuff (debug mode innards).
Simplify Interpreter's callMainFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.24 llvm/tools/lli/ExecutionEngine.cpp:1.25
--- llvm/tools/lli/ExecutionEngine.cpp:1.24	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Thu Sep  4 17:21:22 2003
@@ -21,16 +21,16 @@
 Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
 
 ExecutionEngine *ExecutionEngine::create (Module *M, bool ForceInterpreter,
-					  bool DebugMode, bool TraceMode) {
+					  bool TraceMode) {
   ExecutionEngine *EE = 0;
 
   // If there is nothing that is forcing us to use the interpreter, make a JIT.
-  if (!ForceInterpreter && !DebugMode && !TraceMode)
+  if (!ForceInterpreter && !TraceMode)
     EE = VM::create(M);
 
   // If we can't make a JIT, make an interpreter instead.
   if (EE == 0)
-    EE = Interpreter::create(M, DebugMode, TraceMode);
+    EE = Interpreter::create(M, TraceMode);
   return EE;
 }
 


Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.9 llvm/tools/lli/ExecutionEngine.h:1.10
--- llvm/tools/lli/ExecutionEngine.h:1.9	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/ExecutionEngine.h	Thu Sep  4 17:21:22 2003
@@ -49,7 +49,7 @@
                   const char ** envp) = 0;
 
   static ExecutionEngine *create (Module *M, bool ForceInterpreter,
-				  bool DebugMode, bool TraceMode);
+				  bool TraceMode);
 
   /// createJIT - Create an return a new JIT compiler if there is one available
   /// for the current target.  Otherwise it returns null.
@@ -58,8 +58,7 @@
 
   /// createInterpreter - Create a new interpreter object.  This can never fail.
   ///
-  static ExecutionEngine *createInterpreter(Module *M, bool DebugMode,
-                                            bool TraceMode);
+  static ExecutionEngine *createInterpreter(Module *M, bool TraceMode);
 
   void addGlobalMapping(const Function *F, void *Addr) {
     void *&CurVal = GlobalAddress[(const GlobalValue*)F];


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.23 llvm/tools/lli/lli.cpp:1.24
--- llvm/tools/lli/lli.cpp:1.23	Wed Sep  3 15:34:17 2003
+++ llvm/tools/lli/lli.cpp	Thu Sep  4 17:21:22 2003
@@ -26,8 +26,6 @@
   MainFunction ("f", cl::desc("Function to execute"), cl::init("main"),
 		cl::value_desc("function name"));
 
-  cl::opt<bool> DebugMode("d", cl::desc("Start program in debugger"));
-
   cl::opt<bool> TraceMode("trace", cl::desc("Enable Tracing"));
 
   cl::opt<bool> ForceInterpreter("force-interpreter",
@@ -60,10 +58,10 @@
   }
 
   ExecutionEngine *EE =
-    ExecutionEngine::create (M, ForceInterpreter, DebugMode, TraceMode);
+    ExecutionEngine::create (M, ForceInterpreter, TraceMode);
   assert (EE && "Couldn't create an ExecutionEngine, not even an interpreter?");
 
-  // Add the module name to the start of the argv vector...
+  // Add the module's name to the start of the vector of arguments to main().
   // But delete .bc first, since programs (and users) might not expect to
   // see it.
   const std::string ByteCodeFileSuffix (".bc");