Merge pull request #651 from undingen/inc_jit_rewriter2

Add a new JIT tier which is tightly coupled to the AST Interpreter
pyston · Jul 6, 2015 · dbe7866 · dbe7866
2 parents 1ef88c1 + 5358470
commit dbe7866
Show file tree

Hide file tree

Showing 20 changed files with 1,825 additions and 345 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ add_library(PYSTON_OBJECTS OBJECT ${OPTIONAL_SRCS}
 		capi/object.cpp
 		capi/typeobject.cpp
 		codegen/ast_interpreter.cpp
+		codegen/baseline_jit.cpp
 		codegen/codegen.cpp
 		codegen/compvars.cpp
 		codegen/entry.cpp

diff --git a/src/asm_writing/icinfo.cpp b/src/asm_writing/icinfo.cpp
@@ -109,7 +109,6 @@ void ICSlotRewrite::commit(CommitHook* hook) {
     if (!do_commit)
         return;
 
-    assert(assembler->isExactlyFull());
     assert(!assembler->hasFailed());
 
     for (int i = 0; i < dependencies.size(); i++) {

diff --git a/src/asm_writing/icinfo.h b/src/asm_writing/icinfo.h
@@ -62,9 +62,8 @@ class ICSlotRewrite {
 
     ICSlotInfo* ic_entry;
 
-    ICSlotRewrite(ICInfo* ic, const char* debug_name);
-
 public:
+    ICSlotRewrite(ICInfo* ic, const char* debug_name);
     ~ICSlotRewrite();
 
     assembler::Assembler* getAssembler() { return assembler; }

diff --git a/src/asm_writing/rewriter.cpp b/src/asm_writing/rewriter.cpp
@@ -958,7 +958,7 @@ void Rewriter::_call(RewriterVar* result, bool has_side_effects, void* func_addr
         assembler->callq(r);
     } else {
         assembler->call(assembler::Immediate(offset));
-        assert(asm_address == (uint64_t)assembler->curInstPointer());
+        assert(assembler->hasFailed() || asm_address == (uint64_t)assembler->curInstPointer());
     }
 
     assert(vars_by_location.count(assembler::RAX) == 0);