summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2014-12-20 01:48:17 +0100
committerMike Pall <mike>2014-12-20 01:48:17 +0100
commitecaa4eae88b16d647cc3bd2456916a35d90cadce (patch)
tree80f34e4d0674ab3ec3ff16908c5b3588dcbc27b8 /src
parent5cb6e2eaaf860045daa30208b21ae6aa88a0503c (diff)
parent10caad02619c81bf4bf9ee453bee51d2b4473916 (diff)
downloadluajit-ecaa4eae88b16d647cc3bd2456916a35d90cadce.tar.gz
luajit-ecaa4eae88b16d647cc3bd2456916a35d90cadce.tar.bz2
luajit-ecaa4eae88b16d647cc3bd2456916a35d90cadce.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r--src/vm_x86.dasc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index 290054dc..7b5abdd5 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -1647,7 +1647,7 @@ static void build_subroutines(BuildCtx *ctx)
1647 | mov RD, 1+3 1647 | mov RD, 1+3
1648 | jmp ->fff_res 1648 | jmp ->fff_res
1649 | 1649 |
1650 |.ffunc_1 ipairs_aux 1650 |.ffunc_2 ipairs_aux
1651 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback 1651 | cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback
1652 | cmp dword [BASE+12], LJ_TISNUM 1652 | cmp dword [BASE+12], LJ_TISNUM
1653 |.if DUALNUM 1653 |.if DUALNUM