narayana
/
ravi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add prototype for luaD_call

Browse Source
Dibyendu Majumdar 9 years ago
parent 476375db4f
commit ff6493c71e
4 changed files with 72 additions and 42 deletions
Show Stats Download Patch File Download Diff File

93
include/ravi_llvmcodegen.h
Unescape View File

@ -188,6 +188,7 @@ struct LuaLLVMTypes {
llvm::FunctionType *luaD_poscallT;
llvm::FunctionType *luaD_precallT;
llvm::FunctionType *luaD_callT;
llvm::FunctionType *luaF_closeT;
llvm::FunctionType *luaG_runerrorT;
llvm::FunctionType *luaV_equalobjT;
@ -337,9 +338,10 @@ public:
// we use computed gotos to specialised
// jmp labels. Hence the 4 jmp targets.
// For other instructions only the first jump
// targetis used
// target is used
struct RaviBranchDef {
// main or int step > 0
// this field is used for all branches
// forloop int step > 0
llvm::BasicBlock *jmp1;
// forloop int step < 0
llvm::BasicBlock *jmp2;
@ -379,6 +381,7 @@ struct RaviFunctionDef {
// Lua function declarations
llvm::Constant *luaD_poscallF;
llvm::Constant *luaD_precallF;
llvm::Constant *luaD_callF;
llvm::Constant *luaF_closeF;
llvm::Constant *luaG_runerrorF;
llvm::Constant *luaV_equalobjF;
@ -467,7 +470,7 @@ public:
llvm::Value *emit_gep_ra(RaviFunctionDef *def, llvm::Instruction *base,
int A);
// emit code to obtain address of register or constant at locaton B
// emit code to obtain address of register or constant at location B
llvm::Value *emit_gep_rkb(RaviFunctionDef *def, llvm::Instruction *base,
int B);
@ -490,7 +493,7 @@ public:
// emit code to store bool value into register
void emit_store_reg_b(RaviFunctionDef *def, llvm::Value *value,
llvm::Value *dest_ptr);
llvm::Value *dest_ptr);
// emit code to set the type in the register
void emit_store_type(RaviFunctionDef *def, llvm::Value *value, int type);
@ -498,9 +501,13 @@ public:
// emit code to load the type from a register
llvm::Instruction *emit_load_type(RaviFunctionDef *def, llvm::Value *value);
// TValue assign
void emit_assign(RaviFunctionDef *def, llvm::Value *ra, llvm::Value *rb);
llvm::Value *emit_boolean_testfalse(RaviFunctionDef *def, llvm::Value *reg, bool not);
// isnil(reg) || isboolean(reg) && reg.value == 0
// !(isnil(reg) || isboolean(reg) && reg.value == 0)
llvm::Value *emit_boolean_testfalse(RaviFunctionDef *def, llvm::Value *reg,
bool not);
// Look for Lua bytecodes that are jump targets and allocate
// a BasicBlock for each such target in def->jump_targets.
@ -509,6 +516,9 @@ public:
// branch instructions
void scan_jump_targets(RaviFunctionDef *def, Proto *p);
// Should be called before processing a Lua OpCode
// This function checks if a new block should be started
// and links in the new block
void link_block(RaviFunctionDef *def, int pc);
void emit_LOADNIL(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
@ -520,8 +530,8 @@ public:
void emit_LOADIZ(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A);
void emit_LOADBOOL(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C, int j);
void emit_LOADBOOL(RaviFunctionDef *def, llvm::Value *L_ci,
llvm::Value *proto, int A, int B, int C, int j);
void emit_UNMF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B);
@ -539,61 +549,61 @@ public:
int A, int B, int C);
void emit_ADDFN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_ADDIN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
void emit_SUBFF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBFI(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBIF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBII(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBFN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBNF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBIN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_SUBNI(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_MULFF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_MULFI(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_MULII(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_MULFN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_MULIN(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_DIVFF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_DIVFI(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_DIVIF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_DIVII(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_LOADK(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int Bx);
@ -602,7 +612,7 @@ public:
int A, int B);
void emit_CALL(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
int A, int B, int C);
void emit_JMP(RaviFunctionDef *def, int j);
@ -622,22 +632,22 @@ public:
int A, int B);
void emit_MOVEI(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B);
int A, int B);
void emit_MOVEF(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B);
int A, int B);
void emit_TOINT(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A);
int A);
void emit_TOFLT(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A);
int A);
void emit_SETTABLE(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
void emit_SETTABLE(RaviFunctionDef *def, llvm::Value *L_ci,
llvm::Value *proto, int A, int B, int C);
void emit_GETTABLE(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C);
void emit_GETTABLE(RaviFunctionDef *def, llvm::Value *L_ci,
llvm::Value *proto, int A, int B, int C);
// Emit code for OP_EQ, OP_LT and OP_LE
// The callee parameter should be luaV_equalobj, luaV_lessthan and
@ -649,12 +659,21 @@ public:
void emit_EQ(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C, int j, int jA, llvm::Constant *callee);
// OP_TEST is followed by a OP_JMP instruction - both are handled
// together
// A, B, C must be operands of the OP_TEST instruction
// j must be the jump target (offset of the code to which we need to jump to)
// jA must be the A operand of the jump instruction
void emit_TEST(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C, int j, int jA);
int A, int B, int C, int j, int jA);
// OP_TESTSET is followed by a OP_JMP instruction - both are handled
// together
// A, B, C must be operands of the OP_TESTSET instruction
// j must be the jump target (offset of the code to which we need to jump to)
// jA must be the A operand of the jump instruction
void emit_TESTSET(RaviFunctionDef *def, llvm::Value *L_ci, llvm::Value *proto,
int A, int B, int C, int j, int jA);
int A, int B, int C, int j, int jA);
private:
RaviJITStateImpl *jitState_;

2
lua-5.3.0-tests/all.lua
Unescape View File

@ -148,7 +148,7 @@ report"gc.lua"
local f = assert(loadfile('gc.lua'))
f()
dofile('db.lua')
--dofile('db.lua')
assert(dofile('calls.lua') == deep and deep)
olddofile('strings.lua')
olddofile('literals.lua')

10
src/ravi_llvmcodegen.cpp
Unescape View File

@ -87,7 +87,7 @@ void RaviCodeGenerator::emit_JMP(RaviFunctionDef *def, int j) {
}
def->builder->CreateBr(def->jmp_targets[j].jmp1);
llvm::BasicBlock *block =
llvm::BasicBlock::Create(def->jitState->context(), "postjump", def->f);
llvm::BasicBlock::Create(def->jitState->context(), "postjump", def->f);
def->builder->SetInsertPoint(block);
}
@ -131,9 +131,8 @@ llvm::Instruction *RaviCodeGenerator::emit_load_reg_i(RaviFunctionDef *def,
}
llvm::Instruction *RaviCodeGenerator::emit_load_reg_b(RaviFunctionDef *def,
llvm::Value *rb) {
llvm::Value *rb_n =
def->builder->CreateBitCast(rb, def->types->C_pintT);
llvm::Value *rb) {
llvm::Value *rb_n = def->builder->CreateBitCast(rb, def->types->C_pintT);
llvm::Instruction *lhs = def->builder->CreateLoad(rb_n);
lhs->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_nT);
return lhs;
@ -313,6 +312,9 @@ RaviCodeGenerator::create_function(llvm::IRBuilder<> &builder,
void RaviCodeGenerator::emit_extern_declarations(RaviFunctionDef *def) {
// Add extern declarations for Lua functions that we need to call
def->luaD_callF = def->raviF->addExternFunction(
def->types->luaD_callT, reinterpret_cast<void *>(&luaD_call),
"luaD_call");
def->luaD_poscallF = def->raviF->addExternFunction(
def->types->luaD_poscallT, reinterpret_cast<void *>(&luaD_poscall),
"luaD_poscall");

9
src/ravi_llvmtypes.cpp
Unescape View File

@ -628,6 +628,15 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
elements.push_back(C_intT);
luaD_precallT = llvm::FunctionType::get(C_intT, elements, false);
// void luaD_call (lua_State *L, StkId func, int nResults,
// int allowyield);
elements.clear();
elements.push_back(plua_StateT);
elements.push_back(StkIdT);
elements.push_back(C_intT);
elements.push_back(C_intT);
luaD_callT = llvm::FunctionType::get(llvm::Type::getVoidTy(context), elements, false);
// void luaV_execute(lua_State L);
elements.clear();
elements.push_back(plua_StateT);

Write Preview
Loading…
Cancel
Save