Skip to content

Move the remaining pc loads to use load_inst. #161

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

Merged
ltratt merged 1 commit into from
Sep 22, 2026
Merged

Move the remaining pc loads to use load_inst. #161

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
15 changes: 15 additions & 0 deletions src/lvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,12 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
vmcase(OP_LOADKX) {
StkId ra = RA(i);
TValue *rb;
#ifdef USE_YK
Instruction ni = yk_is_interpreting() ? *pc : load_inst(cl_proto_version, pc); \
rb = k + GETARG_Ax(ni); pc++;
#else
rb = k + GETARG_Ax(*pc); pc++;
#endif
setobj2s(L, ra, rb);
vmbreak;
}
Expand Down Expand Up @@ -1539,7 +1544,12 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
if (TESTARG_k(i)) { /* non-zero extra argument? */
lua_assert(GETARG_Ax(*pc) != 0);
/* add it to array size */
#ifdef USE_YK
Instruction ni = yk_is_interpreting() ? *pc : load_inst(cl_proto_version, pc); \
c += cast_uint(GETARG_Ax(ni)) * (MAXARG_vC + 1);
#else
c += cast_uint(GETARG_Ax(*pc)) * (MAXARG_vC + 1);
#endif
}
pc++; /* skip extra argument */
L->top.p = ra + 1; /* correct top in case of emergency GC */
Expand Down Expand Up @@ -2050,7 +2060,12 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
L->top.p = ci->top.p; /* correct top in case of emergency GC */
last += n;
if (TESTARG_k(i)) {
#ifdef USE_YK
Instruction ni = yk_is_interpreting() ? *pc : load_inst(cl_proto_version, pc); \
last += cast_uint(GETARG_Ax(ni)) * (MAXARG_vC + 1);
#else
last += cast_uint(GETARG_Ax(*pc)) * (MAXARG_vC + 1);
#endif
pc++;
}
/* when 'n' is known, table should have proper size */
Expand Down
Loading