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

more opcodes in VM for arrays

Browse Source
bandhu 9 years ago
parent 90b3d3f6b6
commit 21bb3c8f86
3 changed files with 44 additions and 196 deletions
Show Stats Download Patch File Download Diff File

8
include/lopcodes.h
Unescape View File

@ -333,9 +333,13 @@ OP_RAVI_LEIIRR,/* A B C if ((R(B) <= R(C)) ~= A) then pc++ */
OP_RAVI_TOINT, /* A R(A) := toint(R(A)) */
OP_RAVI_TOFLT, /* A R(A) := tofloat(R(A)) */
OP_RAVI_TOARRAYI, /* A R(A) := to_arrayi(R(A)) */
OP_RAVI_TOARRAYF, /* A R(A) := to_arrayf(R(A)) */
OP_RAVI_MOVEI, /* A B R(A) := R(B) */
OP_RAVI_MOVEF, /* A B R(A) := R(B) */
OP_RAVI_MOVEI, /* A B R(A) := R(B), check R(B) is int */
OP_RAVI_MOVEF, /* A B R(A) := R(B), check R(B) is float */
OP_RAVI_MOVEAI, /* A B R(A) := R(B), check R(B) is array of int */
OP_RAVI_MOVEAF, /* A B R(A) := R(B), check R(B) is array of floats */
OP_RAVI_ARRAYGET_SIK,/* A B C R(A) := R(B)[Kst(C)] */
OP_RAVI_ARRAYGET_SIR,/* A B C R(A) := R(B)[R(C)] */

208
src/lopcodes.c
Unescape View File

@ -171,9 +171,13 @@ LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
"TOINT", /* A R(A) := toint(R(A)) */
"TOFLT", /* A R(A) := tofloat(R(A)) */
"TOARRAYI", /* A R(A) := to_arrayi(R(A)) */
"TOARRAYF", /* A R(A) := to_arrayf(R(A)) */
"MOVEI", /* A B R(A) := R(B) */
"MOVEF", /* A B R(A) := R(B) */
"MOVEI", /* A B R(A) := R(B) */
"MOVEF", /* A B R(A) := R(B) */
"MOVEAI", /* A B R(A) := R(B), check R(B) is array of int */
"MOVEAF", /* A B R(A) := R(B), check R(B) is array of floats */
"ARRAYGET_SIK",/* A B C R(A) := R(B)[Kst(C)] */
"ARRAYGET_SIR",/* A B C R(A) := R(B)[R(C)] */
@ -361,11 +365,15 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
,opmode(1, 0, OpArgR, OpArgK, iABC) /*RAVI_LEIIRK A B C if ((R(B) <= Kst(C)) ~= A) then pc++ */
,opmode(1, 0, OpArgR, OpArgR, iABC) /*RAVI_LEIIRR A B C if ((R(B) <= R(C)) ~= A) then pc++ */
, opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_RAVI_TOINT A R(A) := toint(R(A)) */
, opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_RAVI_TOFLT A R(A) := tonumber(R(A)) */
, opmode(0, 1, OpArgN, OpArgN, iABC) /* OP_RAVI_TOINT A R(A) := toint(R(A)) */
, opmode(0, 1, OpArgN, OpArgN, iABC) /* OP_RAVI_TOFLT A R(A) := tonumber(R(A)) */
, opmode(0, 1, OpArgN, OpArgN, iABC) /* A R(A) := to_arrayi(R(A)) */
, opmode(0, 1, OpArgN, OpArgN, iABC) /* A R(A) := to_arrayf(R(A)) */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_RAVI_MOVEI A B R(A) := tointeger(R(B)) */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_RAVI_MOVEF A B R(A) := tonumber(R(B)) */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_RAVI_MOVEI A B R(A) := tointeger(R(B)) */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_RAVI_MOVEF A B R(A) := tonumber(R(B)) */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* A B R(A) := R(B), check R(B) is array of int */
, opmode(0, 1, OpArgR, OpArgN, iABC) /* A B R(A) := R(B), check R(B) is array of floats */
,opmode(0, 1, OpArgR, OpArgK, iABC) /*RAVI_ARRAYGET_SIK A B C R(A) := R(B)[Kst(C)] */
,opmode(0, 1, OpArgR, OpArgR, iABC) /*RAVI_ARRAYGET_SIR A B C R(A) := R(B)[R(C)] */
@ -395,194 +403,6 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
};
#if 0
LUAI_DDEF const lu_byte luaP_optypes[NUM_OPCODES] = {
LUA_TNONE /* OP_MOVE */
, LUA_TNONE /* OP_LOADK */
, LUA_TNONE /* OP_LOADKX */
, LUA_TNONE /* OP_LOADBOOL */
, LUA_TNONE /* OP_LOADNIL */
, LUA_TNONE /* OP_GETUPVAL */
, LUA_TNONE /* OP_GETTABUP */
, LUA_TNONE /* OP_GETTABLE */
, LUA_TNONE /* OP_SETTABUP */
, LUA_TNONE /* OP_SETUPVAL */
, LUA_TNONE /* OP_SETTABLE */
, LUA_TNONE /* OP_NEWTABLE */
, LUA_TNONE /* OP_SELF */
, LUA_TNONE /* OP_ADD */
, LUA_TNONE /* OP_SUB */
, LUA_TNONE /* OP_MUL */
, LUA_TNONE /* OP_MOD */
, LUA_TNONE /* OP_POW */
, LUA_TNONE /* OP_DIV */
, LUA_TNONE /* OP_IDIV */
, LUA_TNONE /* OP_BAND */
, LUA_TNONE /* OP_BOR */
, LUA_TNONE /* OP_BXOR */
, LUA_TNONE /* OP_SHL */
, LUA_TNONE /* OP_SHR */
, LUA_TNONE /* OP_UNM */
, LUA_TNONE /* OP_BNOT */
, LUA_TNONE /* OP_NOT */
, LUA_TNONE /* OP_LEN */
, LUA_TNONE /* OP_CONCAT */
, LUA_TNONE /* OP_JMP */
, LUA_TNONE /* OP_EQ */
, LUA_TNONE /* OP_LT */
, LUA_TNONE /* OP_LE */
, LUA_TNONE /* OP_TEST */
, LUA_TNONE /* OP_TESTSET */
, LUA_TNONE /* OP_CALL */
, LUA_TNONE /* OP_TAILCALL */
, LUA_TNONE /* OP_RETURN */
, LUA_TNONE /* OP_FORLOOP */
, LUA_TNONE /* OP_FORPREP */
, LUA_TNONE /* OP_TFORCALL */
, LUA_TNONE /* OP_TFORLOOP */
, LUA_TNONE /* OP_SETLIST */
, LUA_TNONE /* OP_CLOSURE */
, LUA_TNONE /* OP_VARARG */
, LUA_TNONE /* OP_EXTRAARG */
, LUA_TNUMINT, /* A R(A) := array of int */
, LUA_TNUMFLT, /* A R(A) := array of float */
, LUA_TNUMINT /* OP_RAVI_LOADIZ A R(A) := tointeger(0) */
, LUA_TNUMFLT /* OP_RAVI_LOADFZ A R(A) := tonumber(0) */
, LUA_TNUMFLT/* OP_RAVI_UNMF A B R(A) := -R(B) floating point */
, LUA_TNUMINT/* OP_RAVI_UNMI A B R(A) := -R(B) integer */
, LUA_TNUMFLT /*RAVI_ADDFFKK A B C R(A) := Kst(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDFFKR A B C R(A) := Kst(B) + R(C) */
, LUA_TNUMFLT /*RAVI_ADDFFRK A B C R(A) := R(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDFFRR A B C R(A) := R(B) + R(C) */
, LUA_TNUMFLT /*RAVI_ADDFIKK A B C R(A) := Kst(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDFIKR A B C R(A) := Kst(B) + R(C) */
, LUA_TNUMFLT /*RAVI_ADDFIRK A B C R(A) := R(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDFIRR A B C R(A) := R(B) + R(C) */
, LUA_TNUMFLT /*RAVI_ADDIFKK A B C R(A) := Kst(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDIFKR A B C R(A) := Kst(B) + R(C) */
, LUA_TNUMFLT /*RAVI_ADDIFRK A B C R(A) := R(B) + Kst(C) */
, LUA_TNUMFLT /*RAVI_ADDIFRR A B C R(A) := R(B) + R(C) */
, LUA_TNUMINT /*RAVI_ADDIIKK A B C R(A) := Kst(B) + Kst(C) */
, LUA_TNUMINT /*RAVI_ADDIIKR A B C R(A) := Kst(B) + R(C) */
, LUA_TNUMINT /*RAVI_ADDIIRK A B C R(A) := R(B) + Kst(C) */
, LUA_TNUMINT /*RAVI_ADDIIRR A B C R(A) := R(B) + R(C) */
, LUA_TNUMFLT /*RAVI_SUBFFKK A B C R(A) := Kst(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBFFKR A B C R(A) := Kst(B) - R(C) */
, LUA_TNUMFLT /*RAVI_SUBFFRK A B C R(A) := R(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBFFRR A B C R(A) := R(B) - R(C) */
, LUA_TNUMFLT /*RAVI_SUBFIKK A B C R(A) := Kst(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBFIKR A B C R(A) := Kst(B) - R(C) */
, LUA_TNUMFLT /*RAVI_SUBFIRK A B C R(A) := R(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBFIRR A B C R(A) := R(B) - R(C) */
, LUA_TNUMFLT /*RAVI_SUBIFKK A B C R(A) := Kst(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBIFKR A B C R(A) := Kst(B) - R(C) */
, LUA_TNUMFLT /*RAVI_SUBIFRK A B C R(A) := R(B) - Kst(C) */
, LUA_TNUMFLT /*RAVI_SUBIFRR A B C R(A) := R(B) - R(C) */
, LUA_TNUMINT /*RAVI_SUBIIKK A B C R(A) := Kst(B) - Kst(C) */
, LUA_TNUMINT /*RAVI_SUBIIKR A B C R(A) := Kst(B) - R(C) */
, LUA_TNUMINT /*RAVI_SUBIIRK A B C R(A) := R(B) - Kst(C) */
, LUA_TNUMINT /*RAVI_SUBIIRR A B C R(A) := R(B) - R(C) */
, LUA_TNUMFLT /*RAVI_MULFFKK A B C R(A) := Kst(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULFFKR A B C R(A) := Kst(B) * R(C) */
, LUA_TNUMFLT /*RAVI_MULFFRK A B C R(A) := R(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULFFRR A B C R(A) := R(B) * R(C) */
, LUA_TNUMFLT /*RAVI_MULFIKK A B C R(A) := Kst(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULFIKR A B C R(A) := Kst(B) * R(C) */
, LUA_TNUMFLT /*RAVI_MULFIRK A B C R(A) := R(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULFIRR A B C R(A) := R(B) * R(C) */
, LUA_TNUMFLT /*RAVI_MULIFKK A B C R(A) := Kst(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULIFKR A B C R(A) := Kst(B) * R(C) */
, LUA_TNUMFLT /*RAVI_MULIFRK A B C R(A) := R(B) * Kst(C) */
, LUA_TNUMFLT /*RAVI_MULIFRR A B C R(A) := R(B) * R(C) */
, LUA_TNUMINT /*RAVI_MULIIKK A B C R(A) := Kst(B) * Kst(C) */
, LUA_TNUMINT /*RAVI_MULIIKR A B C R(A) := Kst(B) * R(C) */
, LUA_TNUMINT /*RAVI_MULIIRK A B C R(A) := R(B) * Kst(C) */
, LUA_TNUMINT /*RAVI_MULIIRR A B C R(A) := R(B) * R(C) */
, LUA_TNUMFLT /*RAVI_DIVFFKK A B C R(A) := Kst(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVFFKR A B C R(A) := Kst(B) / R(C) */
, LUA_TNUMFLT /*RAVI_DIVFFRK A B C R(A) := R(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVFFRR A B C R(A) := R(B) / R(C) */
, LUA_TNUMFLT /*RAVI_DIVFIKK A B C R(A) := Kst(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVFIKR A B C R(A) := Kst(B) / R(C) */
, LUA_TNUMFLT /*RAVI_DIVFIRK A B C R(A) := R(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVFIRR A B C R(A) := R(B) / R(C) */
, LUA_TNUMFLT /*RAVI_DIVIFKK A B C R(A) := Kst(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVIFKR A B C R(A) := Kst(B) / R(C) */
, LUA_TNUMFLT /*RAVI_DIVIFRK A B C R(A) := R(B) / Kst(C) */
, LUA_TNUMFLT /*RAVI_DIVIFRR A B C R(A) := R(B) / R(C) */
, LUA_TNUMINT /*RAVI_DIVIIKK A B C R(A) := Kst(B) / Kst(C) */
, LUA_TNUMINT /*RAVI_DIVIIKR A B C R(A) := Kst(B) / R(C) */
, LUA_TNUMINT /*RAVI_DIVIIRK A B C R(A) := R(B) / Kst(C) */
, LUA_TNUMINT /*RAVI_DIVIIRR A B C R(A) := R(B) / R(C) */
, LUA_TNONE /*RAVI_EQFFKK A B C if ((Kst(B) == Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQFFKR A B C if ((Kst(B) == R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQFFRK A B C if ((R(B) == Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQFFRR A B C if ((R(B) == R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQIIKK A B C if ((Kst(B) == Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQIIKR A B C if ((Kst(B) == R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQIIRK A B C if ((R(B) == Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_EQIIRR A B C if ((R(B) == R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTFFKK A B C if ((Kst(B) < Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTFFKR A B C if ((Kst(B) < R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTFFRK A B C if ((R(B) < Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTFFRR A B C if ((R(B) < R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTIIKK A B C if ((Kst(B) < Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTIIKR A B C if ((Kst(B) < R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTIIRK A B C if ((R(B) < Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LTIIRR A B C if ((R(B) < R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEFFKK A B C if ((Kst(B) <= Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEFFKR A B C if ((Kst(B) <= R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEFFRK A B C if ((R(B) <= Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEFFRR A B C if ((R(B) <= R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEIIKK A B C if ((Kst(B) <= Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEIIKR A B C if ((Kst(B) <= R(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEIIRK A B C if ((R(B) <= Kst(C)) ~= A) then pc++ */
, LUA_TNONE /*RAVI_LEIIRR A B C if ((R(B) <= R(C)) ~= A) then pc++ */
, LUA_TNUMINT /* OP_RAVI_TOINT A R(A) := toint(R(A)) */
, LUA_TNUMFLT /* OP_RAVI_TOFLT A R(A) := tofloat(R(A)) */
, LUA_TNUMINT /* OP_RAVI_MOVEI A B R(A) := tointeger(R(B)) */
, LUA_TNUMFLT /* OP_RAVI_MOVEF A B R(A) := tonumber(R(B)) */
, LUA_TSTRING /*RAVI_ARRAYGET_SIK A B C R(A) := R(B)[Kst(C)] */
, LUA_TSTRING /*RAVI_ARRAYGET_SIR A B C R(A) := R(B)[R(C)] */
, LUA_TNUMINT /*RAVI_ARRAYGET_IIK A B C R(A) := R(B)[Kst(C)] */
, LUA_TNUMINT /*RAVI_ARRAYGET_IIR A B C R(A) := R(B)[R(C)] */
, LUA_TNUMFLT /*RAVI_ARRAYGET_FIK A B C R(A) := R(B)[Kst(C)] */
, LUA_TNUMFLT /*RAVI_ARRAYGET_FIR A B C R(A) := R(B)[R(C)] */
, LUA_TFUNCTION /*RAVI_ARRAYGET_LIK A B C R(A) := R(B)[Kst(C)] */
, LUA_TFUNCTION /*RAVI_ARRAYGET_LIR A B C R(A) := R(B)[R(C)] */
, LUA_TNONE /*RAVI_ARRAYSET_ISKK A B C R(A)[Kst(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ISKR A B C R(A)[Kst(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ISRK A B C R(A)[R(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ISRR A B C R(A)[R(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IIKK A B C R(A)[Kst(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IIKR A B C R(A)[Kst(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IIRK A B C R(A)[R(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IIRR A B C R(A)[R(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IFKK A B C R(A)[Kst(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IFKR A B C R(A)[Kst(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IFRK A B C R(A)[R(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_IFRR A B C R(A)[R(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ILKK A B C R(A)[Kst(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ILKR A B C R(A)[Kst(B)] := R(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ILRK A B C R(A)[R(B)] := Kst(C) */
, LUA_TNONE /*RAVI_ARRAYSET_ILRR A B C R(A)[R(B)] := R(C) */
};
#endif
#define MYK(x) (-1-(x))

24
src/lvm.c
Unescape View File

@ -1824,6 +1824,14 @@ newframe: /* reentry point when frame changes (call/return) */
else
luaG_runerror(L, "TOFLT: double type expected");
} break;
case OP(OP_RAVI_TOARRAYI): {
if (!ttistable(ra) || hvalue(ra)->ravi_array_type != RAVI_TARRAYINT)
luaG_runerror(L, "TOARRAYI: int[] expected");
} break;
case OP(OP_RAVI_TOARRAYF): {
if (!ttistable(ra) || hvalue(ra)->ravi_array_type != RAVI_TARRAYFLT)
luaG_runerror(L, "TOARRAYF: double[] expected");
} break;
case OP(OP_RAVI_MOVEI): {
lua_Integer i;
TValue *rb = base + b;
@ -1842,6 +1850,22 @@ newframe: /* reentry point when frame changes (call/return) */
else
luaG_runerror(L, "MOVEF: double type expected");
} break;
case OP(OP_RAVI_MOVEAI): {
TValue *rb = base + b;
if (ttistable(rb) && hvalue(rb)->ravi_array_type == RAVI_TARRAYINT) {
setobjs2s(L, ra, rb);
}
else
luaG_runerror(L, "MOVEAI: int[] expected");
} break;
case OP(OP_RAVI_MOVEAF): {
TValue *rb = base + b;
if (ttistable(rb) && hvalue(rb)->ravi_array_type == RAVI_TARRAYFLT) {
setobjs2s(L, ra, rb);
}
else
luaG_runerror(L, "MOVEAF: double[] expected");
} break;
}

Write Preview
Loading…
Cancel
Save