aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2015-05-25 16:31:52 +0200
committerMike Pall <mike>2015-05-25 16:31:52 +0200
commit5de95edf4c03296f65ff435c587719a7dff5e6f5 (patch)
tree1a5144fad04294d8361720cae1379ea2d9996702 /src
parent60fb3fe2b2f91b9e6f053004fd1118891a3e885f (diff)
downloadluajit-5de95edf4c03296f65ff435c587719a7dff5e6f5.tar.gz
luajit-5de95edf4c03296f65ff435c587719a7dff5e6f5.tar.bz2
luajit-5de95edf4c03296f65ff435c587719a7dff5e6f5.zip
x64/LJ_GC64: Fix setmetatable().
Diffstat (limited to 'src')
-rw-r--r--src/vm_x64.dasc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm_x64.dasc b/src/vm_x64.dasc
index bcd3184d..bc55d909 100644
--- a/src/vm_x64.dasc
+++ b/src/vm_x64.dasc
@@ -1247,9 +1247,9 @@ static void build_subroutines(BuildCtx *ctx)
1247 | checktab TAB:RB, ->fff_fallback 1247 | checktab TAB:RB, ->fff_fallback
1248 | // Fast path: no mt for table yet and not clearing the mt. 1248 | // Fast path: no mt for table yet and not clearing the mt.
1249 | cmp aword TAB:RB->metatable, 0; jne ->fff_fallback 1249 | cmp aword TAB:RB->metatable, 0; jne ->fff_fallback
1250 | mov TAB:RC, [BASE+8] 1250 | mov TAB:RA, [BASE+8]
1251 | checktab TAB:RC, ->fff_fallback 1251 | checktab TAB:RA, ->fff_fallback
1252 | mov TAB:RB->metatable, TAB:RC 1252 | mov TAB:RB->metatable, TAB:RA
1253 | mov PC, [BASE-8] 1253 | mov PC, [BASE-8]
1254 | mov [BASE-16], TAB:TMPR // Return original table. 1254 | mov [BASE-16], TAB:TMPR // Return original table.
1255 | test byte TAB:RB->marked, LJ_GC_BLACK // isblack(table) 1255 | test byte TAB:RB->marked, LJ_GC_BLACK // isblack(table)