Skip to content

Modify code to use BytecodeBuilder instead of ILBuilder #32

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.

Sign up for GitHub

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

Open
charliegracie wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Modify code to use BytecodeBuilder instead of ILBuilder #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions lvjit/LuaFunctionBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,6 @@ bool Lua::FunctionBuilder::buildIL() {
if (GET_OPCODE(instructions[instructionIndex + 1]) != OP_TFORLOOP) return false;
break;
case OP_TFORLOOP:
bytecodeBuilders[instructionIndex + 1 + GETARG_sBx(instruction)]->setVMState(new OMR::VirtualMachineState{});
addBytecodeBuilderToWorklist(bytecodeBuilders[instructionIndex + 1 + GETARG_sBx(instruction)]);
do_tforloop(builder, bytecodeBuilders[instructionIndex + 1 + GETARG_sBx(instruction)], instruction);
break;
Expand Down Expand Up @@ -2113,25 +2112,21 @@ bool Lua::FunctionBuilder::do_tforcall(TR::BytecodeBuilder* builder, Instruction
return true;
}

bool Lua::FunctionBuilder::do_tforloop(TR::BytecodeBuilder* builder, TR::IlBuilder* loopStart, Instruction instruction) {
bool Lua::FunctionBuilder::do_tforloop(TR::BytecodeBuilder* builder, TR::BytecodeBuilder* loopStart, Instruction instruction) {
// ra = RA(i);
TR::IlValue *ra = jit_R(builder, GETARG_A(instruction));
// if (!ttisnil(ra + 1)) /* continue loop? */
TR::IlBuilder* continueLoop = nullptr;
//builder->Call("printInt", 1,
//builder-> );
builder->IfThen(&continueLoop,
jit_ttnotnil(builder,
builder-> IndexAt(luaTypes.StkId,
ra,
builder-> Const(1))));
TR::BytecodeBuilder* continueLoop = nullptr;

TR::IlValue *one = builder->Const(1);
TR::IlValue *raOne = builder->IndexAt(luaTypes.StkId, ra, one);

builder->IfCmpNotEqual(&continueLoop,
builder-> LoadIndirect("TValue", "tt_", raOne),
builder-> Const(LUA_TNIL));

// setobjs2s(L, ra, ra + 1); /* save control variable */
jit_setobj(continueLoop,
ra,
continueLoop-> IndexAt(luaTypes.StkId,
ra,
continueLoop-> Const(1)));
jit_setobj(continueLoop, ra, raOne);

// jump back
continueLoop->Goto(&loopStart);
Expand Down Expand Up @@ -2411,12 +2406,6 @@ TR::IlValue* Lua::FunctionBuilder::jit_isnumber(TR::IlBuilder* builder, TR::IlVa
return builder->And(type, numType);
}

TR::IlValue* Lua::FunctionBuilder::jit_ttnotnil(TR::IlBuilder* builder, TR::IlValue* value) {
return builder->NotEqualTo(
builder-> LoadIndirect("TValue", "tt_", value),
builder-> Const(LUA_TNIL));
}

TR::IlValue* Lua::FunctionBuilder::jit_isstring(TR::IlBuilder* builder, TR::IlValue* type) {
return builder->And(type, strType);
}
Expand Down
3 changes: 1 addition & 2 deletions lvjit/LuaFunctionBuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Lua::FunctionBuilder : public TR::MethodBuilder {
bool do_forprep(TR::BytecodeBuilder* builder, Instruction instruction);

bool do_tforcall(TR::BytecodeBuilder* builder, Instruction instruction);
bool do_tforloop(TR::BytecodeBuilder* builder, TR::IlBuilder* loopStart, Instruction instruction);
bool do_tforloop(TR::BytecodeBuilder* builder, TR::BytecodeBuilder* loopStart, Instruction instruction);

bool do_setlist(TR::BytecodeBuilder* builder, Instruction instruction);

Expand All @@ -116,7 +116,6 @@ class Lua::FunctionBuilder : public TR::MethodBuilder {
TR::IlValue* jit_isinteger(TR::IlBuilder* builder, TR::IlValue* type);
TR::IlValue* jit_isfloat(TR::IlBuilder* builder, TR::IlValue* type);
TR::IlValue* jit_isnumber(TR::IlBuilder* builder, TR::IlValue* type);
TR::IlValue* jit_ttnotnil(TR::IlBuilder* builder, TR::IlValue* value);
TR::IlValue* jit_isstring(TR::IlBuilder* builder, TR::IlValue* type);

// jitbuilder extensions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down