Merge pull request #94 from ltratt/promote_i

Promote instructions.
ykjit · Oct 30, 2024 · deab5b5 · deab5b5
2 parents fc1df20 + bc8d54d
commit deab5b5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/lvm.c b/src/lvm.c
@@ -1168,13 +1168,23 @@ void luaV_finishOp (lua_State *L) {
 
 
 /* fetch an instruction and prepare its execution */
-#define vmfetch()	{ \
+#ifdef USE_YK
+#  define vmfetch()	{ \
+  if (l_unlikely(trap)) {  /* stack reallocation or hooks? */ \
+    trap = luaG_traceexec(L, pc);  /* handle hooks */ \
+    updatebase(ci);  /* correct stack */ \
+  } \
+  i = (Instruction) yk_promote(*(pc++)); \
+}
+#else
+#  define vmfetch()	{ \
   if (l_unlikely(trap)) {  /* stack reallocation or hooks? */ \
     trap = luaG_traceexec(L, pc);  /* handle hooks */ \
     updatebase(ci);  /* correct stack */ \
   } \
-  i = *(pc++); \
+  i = (Instruction) *(pc++); \
 }
+#endif
 
 #define vmdispatch(o)	switch(o)
 #define vmcase(l)	case l: