aboutsummaryrefslogtreecommitdiff
path: root/src/vm_x86.dasc
diff options
context:
space:
mode:
authorMike Pall <mike>2012-09-12 11:20:47 +0200
committerMike Pall <mike>2012-09-12 11:20:47 +0200
commit23932a6c8b7ef434bc963139b4160b1058fa6f7f (patch)
tree37a8396d51de634046efe72bff36d9a6fb1324c4 /src/vm_x86.dasc
parent039bf85e2610927119254b9c922eab484820e6a7 (diff)
downloadluajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.tar.gz
luajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.tar.bz2
luajit-23932a6c8b7ef434bc963139b4160b1058fa6f7f.zip
Use 0/1 macro for Lua 5.2 compatibility.
Diffstat (limited to 'src/vm_x86.dasc')
-rw-r--r--src/vm_x86.dasc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index c455795e..8fe07a65 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -1184,7 +1184,7 @@ static void build_subroutines(BuildCtx *ctx)
1184 | call extern lj_meta_len@8 // (lua_State *L, TValue *o) 1184 | call extern lj_meta_len@8 // (lua_State *L, TValue *o)
1185 | // NULL (retry) or TValue * (metamethod) returned in eax (RC). 1185 | // NULL (retry) or TValue * (metamethod) returned in eax (RC).
1186 | mov BASE, L:RB->base 1186 | mov BASE, L:RB->base
1187#ifdef LUAJIT_ENABLE_LUA52COMPAT 1187#if LJ_52
1188 | test RC, RC 1188 | test RC, RC
1189 | jne ->vmeta_binop // Binop call for compatibility. 1189 | jne ->vmeta_binop // Binop call for compatibility.
1190 | movzx RD, PC_RD 1190 | movzx RD, PC_RD
@@ -1600,7 +1600,7 @@ static void build_subroutines(BuildCtx *ctx)
1600 |.ffunc_1 pairs 1600 |.ffunc_1 pairs
1601 | mov TAB:RB, [BASE] 1601 | mov TAB:RB, [BASE]
1602 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback 1602 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback
1603#ifdef LUAJIT_ENABLE_LUA52COMPAT 1603#if LJ_52
1604 | cmp dword TAB:RB->metatable, 0; jne ->fff_fallback 1604 | cmp dword TAB:RB->metatable, 0; jne ->fff_fallback
1605#endif 1605#endif
1606 | mov CFUNC:RB, [BASE-8] 1606 | mov CFUNC:RB, [BASE-8]
@@ -1674,7 +1674,7 @@ static void build_subroutines(BuildCtx *ctx)
1674 |.ffunc_1 ipairs 1674 |.ffunc_1 ipairs
1675 | mov TAB:RB, [BASE] 1675 | mov TAB:RB, [BASE]
1676 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback 1676 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback
1677#ifdef LUAJIT_ENABLE_LUA52COMPAT 1677#if LJ_52
1678 | cmp dword TAB:RB->metatable, 0; jne ->fff_fallback 1678 | cmp dword TAB:RB->metatable, 0; jne ->fff_fallback
1679#endif 1679#endif
1680 | mov CFUNC:RB, [BASE-8] 1680 | mov CFUNC:RB, [BASE-8]
@@ -4315,7 +4315,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
4315 |2: 4315 |2:
4316 | checktab RD, ->vmeta_len 4316 | checktab RD, ->vmeta_len
4317 | mov TAB:FCARG1, [BASE+RD*8] 4317 | mov TAB:FCARG1, [BASE+RD*8]
4318#ifdef LUAJIT_ENABLE_LUA52COMPAT 4318#if LJ_52
4319 | mov TAB:RB, TAB:FCARG1->metatable 4319 | mov TAB:RB, TAB:FCARG1->metatable
4320 | cmp TAB:RB, 0 4320 | cmp TAB:RB, 0
4321 | jnz >9 4321 | jnz >9
@@ -4336,7 +4336,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
4336 | mov BASE, RB // Restore BASE. 4336 | mov BASE, RB // Restore BASE.
4337 | movzx RA, PC_RA 4337 | movzx RA, PC_RA
4338 | jmp <1 4338 | jmp <1
4339#ifdef LUAJIT_ENABLE_LUA52COMPAT 4339#if LJ_52
4340 |9: // Check for __len. 4340 |9: // Check for __len.
4341 | test byte TAB:RB->nomm, 1<<MM_len 4341 | test byte TAB:RB->nomm, 1<<MM_len
4342 | jnz <3 4342 | jnz <3