mirror of https://github.com/rusefi/lua.git
Better comments about the use of 'k' in opcodes
This commit is contained in:
Roberto Ierusalimschy
parent
e174f43807
commit
490ecfcaa1
42
lopcodes.h
42
lopcodes.h
|
|
@ -217,7 +217,7 @@ OP_SETTABLE,/* A B C R[A][R[B]] := RK(C) */
|
|||
OP_SETI,/* A B C R[A][B] := RK(C) */
|
||||
OP_SETFIELD,/* A B C R[A][K[B]:string] := RK(C) */
|
||||
|
||||
OP_NEWTABLE,/* A B C R[A] := {} */
|
||||
OP_NEWTABLE,/* A B C k R[A] := {} */
|
||||
|
||||
OP_SELF,/* A B C R[A+1] := R[B]; R[A] := R[B][RK(C):string] */
|
||||
|
||||
|
|
@ -253,8 +253,8 @@ OP_SHL,/* A B C R[A] := R[B] << R[C] */
|
|||
OP_SHR,/* A B C R[A] := R[B] >> R[C] */
|
||||
|
||||
OP_MMBIN,/* A B C call C metamethod over R[A] and R[B] */
|
||||
OP_MMBINI,/* A sB C call C metamethod over R[A] and sB */
|
||||
OP_MMBINK,/* A B C call C metamethod over R[A] and K[B] */
|
||||
OP_MMBINI,/* A sB C k call C metamethod over R[A] and sB */
|
||||
OP_MMBINK,/* A B C k call C metamethod over R[A] and K[B] */
|
||||
|
||||
OP_UNM,/* A B R[A] := -R[B] */
|
||||
OP_BNOT,/* A B R[A] := ~R[B] */
|
||||
|
|
@ -266,24 +266,24 @@ OP_CONCAT,/* A B R[A] := R[A].. ... ..R[A + B - 1] */
|
|||
OP_CLOSE,/* A close all upvalues >= R[A] */
|
||||
OP_TBC,/* A mark variable A "to be closed" */
|
||||
OP_JMP,/* sJ pc += sJ */
|
||||
OP_EQ,/* A B if ((R[A] == R[B]) ~= k) then pc++ */
|
||||
OP_LT,/* A B if ((R[A] < R[B]) ~= k) then pc++ */
|
||||
OP_LE,/* A B if ((R[A] <= R[B]) ~= k) then pc++ */
|
||||
OP_EQ,/* A B k if ((R[A] == R[B]) ~= k) then pc++ */
|
||||
OP_LT,/* A B k if ((R[A] < R[B]) ~= k) then pc++ */
|
||||
OP_LE,/* A B k if ((R[A] <= R[B]) ~= k) then pc++ */
|
||||
|
||||
OP_EQK,/* A B if ((R[A] == K[B]) ~= k) then pc++ */
|
||||
OP_EQI,/* A sB if ((R[A] == sB) ~= k) then pc++ */
|
||||
OP_LTI,/* A sB if ((R[A] < sB) ~= k) then pc++ */
|
||||
OP_LEI,/* A sB if ((R[A] <= sB) ~= k) then pc++ */
|
||||
OP_GTI,/* A sB if ((R[A] > sB) ~= k) then pc++ */
|
||||
OP_GEI,/* A sB if ((R[A] >= sB) ~= k) then pc++ */
|
||||
OP_EQK,/* A B k if ((R[A] == K[B]) ~= k) then pc++ */
|
||||
OP_EQI,/* A sB k if ((R[A] == sB) ~= k) then pc++ */
|
||||
OP_LTI,/* A sB k if ((R[A] < sB) ~= k) then pc++ */
|
||||
OP_LEI,/* A sB k if ((R[A] <= sB) ~= k) then pc++ */
|
||||
OP_GTI,/* A sB k if ((R[A] > sB) ~= k) then pc++ */
|
||||
OP_GEI,/* A sB k if ((R[A] >= sB) ~= k) then pc++ */
|
||||
|
||||
OP_TEST,/* A if (not R[A] == k) then pc++ */
|
||||
OP_TESTSET,/* A B if (not R[B] == k) then pc++ else R[A] := R[B] */
|
||||
OP_TEST,/* A k if (not R[A] == k) then pc++ */
|
||||
OP_TESTSET,/* A B k if (not R[B] == k) then pc++ else R[A] := R[B] */
|
||||
|
||||
OP_CALL,/* A B C R[A], ... ,R[A+C-2] := R[A](R[A+1], ... ,R[A+B-1]) */
|
||||
OP_TAILCALL,/* A B C return R[A](R[A+1], ... ,R[A+B-1]) */
|
||||
OP_TAILCALL,/* A B C k return R[A](R[A+1], ... ,R[A+B-1]) */
|
||||
|
||||
OP_RETURN,/* A B C return R[A], ... ,R[A+B-2] (see note) */
|
||||
OP_RETURN,/* A B C k return R[A], ... ,R[A+B-2] (see note) */
|
||||
OP_RETURN0,/* return */
|
||||
OP_RETURN1,/* A return R[A] */
|
||||
|
||||
|
|
@ -295,7 +295,7 @@ OP_TFORPREP,/* A Bx create upvalue for R[A + 3]; pc+=Bx */
|
|||
OP_TFORCALL,/* A C R[A+4], ... ,R[A+3+C] := R[A](R[A+1], R[A+2]); */
|
||||
OP_TFORLOOP,/* A Bx if R[A+2] ~= nil then { R[A]=R[A+2]; pc -= Bx } */
|
||||
|
||||
OP_SETLIST,/* A B C R[A][(C-1)*FPF+i] := R[A+i], 1 <= i <= B */
|
||||
OP_SETLIST,/* A B C k R[A][(C-1)*FPF+i] := R[A+i], 1 <= i <= B */
|
||||
|
||||
OP_CLOSURE,/* A Bx R[A] := closure(KPROTO[Bx]) */
|
||||
|
||||
|
|
@ -323,7 +323,7 @@ OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
|
|||
(*) In OP_RETURN, if (B == 0) then return up to 'top'.
|
||||
|
||||
(*) In OP_LOADKX and OP_NEWTABLE, the next instruction is always
|
||||
EXTRAARG.
|
||||
OP_EXTRAARG.
|
||||
|
||||
(*) In OP_SETLIST, if (B == 0) then real B = 'top'; if k, then
|
||||
real C = EXTRAARG _ C (the bits of EXTRAARG concatenated with the
|
||||
|
|
@ -336,6 +336,9 @@ OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
|
|||
(*) For comparisons, k specifies what condition the test should accept
|
||||
(true or false).
|
||||
|
||||
(*) In OP_MMBINI/OP_MMBINK, k means the arguments were flipped
|
||||
(the constant is the first operand).
|
||||
|
||||
(*) All 'skips' (pc++) assume that next instruction is a jump.
|
||||
|
||||
(*) In instructions OP_RETURN/OP_TAILCALL, 'k' specifies that the
|
||||
|
|
@ -344,7 +347,8 @@ OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
|
|||
returning; in this case, (C - 1) is its number of fixed parameters.
|
||||
|
||||
(*) In comparisons with an immediate operand, C signals whether the
|
||||
original operand was a float.
|
||||
original operand was a float. (It must be corrected in case of
|
||||
metamethods.)
|
||||
|
||||
===========================================================================*/
|
||||
|
||||
|
|
|
|||
22
lvm.c
22
lvm.c
|
|
@ -890,9 +890,9 @@ void luaV_finishOp (lua_State *L) {
|
|||
/*
|
||||
** Auxiliary macro for arithmetic operations over floats and others
|
||||
** with immediate operand. 'fop' is the float operation; 'tm' is the
|
||||
** corresponding metamethod; 'flip' is true if operands were flipped.
|
||||
** corresponding metamethod.
|
||||
*/
|
||||
#define op_arithfI_aux(L,v1,imm,fop,tm,flip) { \
|
||||
#define op_arithfI_aux(L,v1,imm,fop,tm) { \
|
||||
lua_Number nb; \
|
||||
if (tonumberns(v1, nb)) { \
|
||||
lua_Number fimm = cast_num(imm); \
|
||||
|
|
@ -912,14 +912,14 @@ void luaV_finishOp (lua_State *L) {
|
|||
** Arithmetic operations with immediate operands. 'iop' is the integer
|
||||
** operation.
|
||||
*/
|
||||
#define op_arithI(L,iop,fop,tm,flip) { \
|
||||
#define op_arithI(L,iop,fop,tm) { \
|
||||
TValue *v1 = vRB(i); \
|
||||
int imm = GETARG_sC(i); \
|
||||
if (ttisinteger(v1)) { \
|
||||
lua_Integer iv1 = ivalue(v1); \
|
||||
pc++; setivalue(s2v(ra), iop(L, iv1, imm)); \
|
||||
} \
|
||||
else op_arithfI_aux(L, v1, imm, fop, tm, flip); }
|
||||
else op_arithfI_aux(L, v1, imm, fop, tm); }
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -958,7 +958,7 @@ void luaV_finishOp (lua_State *L) {
|
|||
/*
|
||||
** Arithmetic operations with K operands.
|
||||
*/
|
||||
#define op_arithK(L,iop,fop,flip) { \
|
||||
#define op_arithK(L,iop,fop) { \
|
||||
TValue *v1 = vRB(i); \
|
||||
TValue *v2 = KC(i); \
|
||||
if (ttisinteger(v1) && ttisinteger(v2)) { \
|
||||
|
|
@ -1367,23 +1367,23 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
|
|||
vmbreak;
|
||||
}
|
||||
vmcase(OP_ADDI) {
|
||||
op_arithI(L, l_addi, luai_numadd, TM_ADD, GETARG_k(i));
|
||||
op_arithI(L, l_addi, luai_numadd, TM_ADD);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_ADDK) {
|
||||
op_arithK(L, l_addi, luai_numadd, GETARG_k(i));
|
||||
op_arithK(L, l_addi, luai_numadd);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_SUBK) {
|
||||
op_arithK(L, l_subi, luai_numsub, 0);
|
||||
op_arithK(L, l_subi, luai_numsub);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_MULK) {
|
||||
op_arithK(L, l_muli, luai_nummul, GETARG_k(i));
|
||||
op_arithK(L, l_muli, luai_nummul);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_MODK) {
|
||||
op_arithK(L, luaV_mod, luaV_modf, 0);
|
||||
op_arithK(L, luaV_mod, luaV_modf);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_POWK) {
|
||||
|
|
@ -1395,7 +1395,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
|
|||
vmbreak;
|
||||
}
|
||||
vmcase(OP_IDIVK) {
|
||||
op_arithK(L, luaV_idiv, luai_numidiv, 0);
|
||||
op_arithK(L, luaV_idiv, luai_numidiv);
|
||||
vmbreak;
|
||||
}
|
||||
vmcase(OP_BANDK) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue