Changeset 623

Timestamp:

08/05/08 11:13:19 (4 months ago)

Author:

weyrick

Message:

add JIT execution for bitecode

Files:

• trunk/rphp/compiler/CMakeLists.txt (modified) (1 diff)
• trunk/rphp/compiler/pDriver.cpp (modified) (4 diffs)

trunk/rphp/compiler/CMakeLists.txt

@@ -3 +3 @@
-
-# TODO: move this to a FindLLVM in cmake/modules
-
+linker interpreter 
-EXECUTE_PROCESS(COMMAND llvm-config --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-EXECUTE_PROCESS(COMMAND llvm-config --cppflags OUTPUT_VARIABLE LLVM_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)

trunk/rphp/compiler/pDriver.cpp

@@ -35 +35 @@
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/ModuleProvider.h"
+#include "llvm/ExecutionEngine/JIT.h"
+#include "llvm/ExecutionEngine/Interpreter.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
-
-#include "parser/rphp_debug_visitor.h"
@@ -52 +57 @@
-    cout << "executing file: " << fileName << endl;
-    // TODO: determine file type, then run executeBC or executePHP
-
+
-}
-
@@ -59 +64 @@
- */
-void pDriver::executeBC(string fileName) {
+
-    cout << "executing compiled bytecode: " << fileName << endl;
+
+    // Now we create the JIT.
+    string* errMsg = new string();
+    llvm::MemoryBuffer* mb = llvm::MemoryBuffer::getFile(fileName.c_str(), errMsg);
+    if (errMsg->length()) {
+        cerr << "error loading file: " << fileName << endl;
+        delete errMsg;
+        return;
+    }
+    llvm::ModuleProvider* MP = llvm::getBitcodeModuleProvider(mb, errMsg);
+    if (errMsg->length()) {
+        cerr << "error parsing bitcode file: " << fileName << endl;
+        delete errMsg;
+        return;
+    }
+
+    // MP now owns mb and will delete
+    // errMsg isn't needed.
+    delete errMsg;
+
+    llvm::ExecutionEngine* EE = llvm::ExecutionEngine::create(MP, false);
+
+    // EE now owns MP
+
+    llvm::Function* rphpMain = MP->getModule()->getFunction("rphp_main");
+    if (!rphpMain) {
+        cerr << "error: rphp_main symbol not found" << endl;
+        MP->getModule()->dump();
+        delete EE;
+        return;
+    }
+
+    // Call the rphp_main function with no arguments:
+    std::vector<llvm::GenericValue> noargs;
+    llvm::GenericValue gv = EE->runFunction(rphpMain, noargs);
+
+    cout << "module ran, return value is: " << gv.IntVal.toStringSigned(10) << endl;
+
+    delete EE;
+
-}
-
@@ -123 +169 @@
-    // By passing a module as the last parameter to the Function constructor,
-    // it automatically gets appended to the Module.
-
+rphp_
-
-    // Add a basic block to the function... again, it automatically inserts