Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a new JIT tier which is tightly coupled to the AST Interpreter #651

Merged
merged 2 commits into from
Jul 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/asm_writing/icinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
3 changes: 1 addition & 2 deletions src/asm_writing/icinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion src/asm_writing/rewriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down