Scarfski/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2026-06-07 23:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning 'luaP_isIT' and 'luaP_isOT'

Browse Source 
- 'luaP_isOT' is only used for tests, so it is defined as a macro to avoid
wasting space with an unused function.
- 'luaP_isIT' must include OP_VARARGPREP.
This commit is contained in:
Roberto I
2026-05-28 15:10:17 -03:00
parent 53b41d0cdd
commit 0465c23b3e
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lcode.c
View File

@@ -1934,8 +1934,6 @@ void luaK_finish (FuncState *fs) {
p->flag &= cast_byte(~PF_VAHID); /* then it will not use hidden args. */ p->flag &= cast_byte(~PF_VAHID); /* then it will not use hidden args. */
for (i = 0; i < fs->pc; i++) { for (i = 0; i < fs->pc; i++) {
Instruction *pc = &p->code[i]; Instruction *pc = &p->code[i];
/* avoid "not used" warnings when assert is off (for 'onelua.c') */
(void)luaP_isOT; (void)luaP_isIT;
lua_assert(i == 0 || luaP_isOT(*(pc - 1)) == luaP_isIT(*pc)); lua_assert(i == 0 || luaP_isOT(*(pc - 1)) == luaP_isIT(*pc));
switch (GET_OPCODE(*pc)) { switch (GET_OPCODE(*pc)) {
case OP_RETURN0: case OP_RETURN1: { case OP_RETURN0: case OP_RETURN1: {

23
lopcodes.c
View File

@@ -109,30 +109,21 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
}; };
#define testITMode(m) (luaP_opmodes[m] & (1 << 5))
/*
** Check whether instruction sets top for next instruction, that is,
** it results in multiple values.
*/
int luaP_isOT (Instruction i) {
OpCode op = GET_OPCODE(i);
switch (op) {
case OP_TAILCALL: return 1;
default:
return testOTMode(op) && GETARG_C(i) == 0;
}
}
/* /*
** Check whether instruction uses top from previous instruction, that is, ** Check whether instruction uses top. That happens for OP_VARARGPREP
** it accepts multiple results. ** and for instructions that use multiple values set by the previous
** instruction.
*/ */
int luaP_isIT (Instruction i) { int luaP_isIT (Instruction i) {
OpCode op = GET_OPCODE(i); OpCode op = GET_OPCODE(i);
switch (op) { switch (op) {
case OP_SETLIST: case OP_SETLIST:
return testITMode(GET_OPCODE(i)) && GETARG_vB(i) == 0; return GETARG_vB(i) == 0;
case OP_VARARGPREP:
return 1;
default: default:
return testITMode(GET_OPCODE(i)) && GETARG_B(i) == 0; return testITMode(GET_OPCODE(i)) && GETARG_B(i) == 0;
} }

15
lopcodes.h
View File

@@ -417,8 +417,8 @@ OP_EXTRAARG/* Ax extra (larger) argument for previous opcode */
** bits 0-2: op mode ** bits 0-2: op mode
** bit 3: instruction set register A ** bit 3: instruction set register A
** bit 4: operator is a test (next instruction must be a jump) ** bit 4: operator is a test (next instruction must be a jump)
** bit 5: instruction uses 'L->top' set by previous instruction (when B == 0) ** bit 5: used by 'luaP_isIT'
** bit 6: instruction sets 'L->top' for next instruction (when C == 0) ** bit 6: used by 'luaP_isOT'
** bit 7: instruction is an MM instruction (call a metamethod) ** bit 7: instruction is an MM instruction (call a metamethod)
*/ */
@@ -427,12 +427,17 @@ LUAI_DDEC(const lu_byte luaP_opmodes[NUM_OPCODES];)
#define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 7)) #define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 7))
#define testAMode(m) (luaP_opmodes[m] & (1 << 3)) #define testAMode(m) (luaP_opmodes[m] & (1 << 3))
#define testTMode(m) (luaP_opmodes[m] & (1 << 4)) #define testTMode(m) (luaP_opmodes[m] & (1 << 4))
#define testITMode(m) (luaP_opmodes[m] & (1 << 5))
#define testOTMode(m) (luaP_opmodes[m] & (1 << 6))
#define testMMMode(m) (luaP_opmodes[m] & (1 << 7)) #define testMMMode(m) (luaP_opmodes[m] & (1 << 7))
LUAI_FUNC int luaP_isOT (Instruction i); /* Check whether instruction sets top for next instruction, that is,
** it results in multiple values. Used only for tests.
*/
#define luaP_isOT(i) \
(GET_OPCODE(i) == OP_TAILCALL || \
((luaP_opmodes[GET_OPCODE(i)] & (1 << 6)) && GETARG_C(i) == 0))
LUAI_FUNC int luaP_isIT (Instruction i); LUAI_FUNC int luaP_isIT (Instruction i);