From 51ffdbeb0cfc206692ea4e5f71d1fe6d10f61455 Mon Sep 17 00:00:00 2001
From: Benoit Giannangeli <giann008@gmail.com>
Date: Sat, 11 Feb 2017 16:10:47 +0100
Subject: SETLIST

---
 src/lopcodes.js | 48 ++++++++++++++++++++++++++----------------------
 src/lvm.js      | 18 ++++++++++++++++++
 2 files changed, 44 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/lopcodes.js b/src/lopcodes.js
index 05eb0d5..383e9c5 100644
--- a/src/lopcodes.js
+++ b/src/lopcodes.js
@@ -80,27 +80,31 @@ const INDEXK = function (r) {
     return r & ~BITRK;
 }
 
+/* number of list items to accumulate before a SETLIST instruction */
+const LFIELDS_PER_FLUSH = 50
+
 module.exports = {
-    OpCodes:    OpCodes,
-    SIZE_C:     SIZE_C,
-    SIZE_B:     SIZE_B,
-    SIZE_Bx:    SIZE_Bx,
-    SIZE_A:     SIZE_A,
-    SIZE_Ax:    SIZE_Ax,
-    SIZE_OP:    SIZE_OP,
-    POS_OP:     POS_OP,
-    POS_A:      POS_A,
-    POS_C:      POS_C,
-    POS_B:      POS_B,
-    POS_Bx:     POS_Bx,
-    POS_Ax:     POS_Ax,
-    MAXARG_Bx:  MAXARG_Bx,
-    MAXARG_sBx: MAXARG_sBx,
-    MAXARG_Ax:  MAXARG_Ax,
-    MAXARG_A:   MAXARG_A,
-    MAXARG_B:   MAXARG_B,
-    MAXARG_C:   MAXARG_C,
-    BITRK:      BITRK,
-    ISK:        ISK,
-    INDEXK:     INDEXK
+    OpCodes:           OpCodes,
+    SIZE_C:            SIZE_C,
+    SIZE_B:            SIZE_B,
+    SIZE_Bx:           SIZE_Bx,
+    SIZE_A:            SIZE_A,
+    SIZE_Ax:           SIZE_Ax,
+    SIZE_OP:           SIZE_OP,
+    POS_OP:            POS_OP,
+    POS_A:             POS_A,
+    POS_C:             POS_C,
+    POS_B:             POS_B,
+    POS_Bx:            POS_Bx,
+    POS_Ax:            POS_Ax,
+    MAXARG_Bx:         MAXARG_Bx,
+    MAXARG_sBx:        MAXARG_sBx,
+    MAXARG_Ax:         MAXARG_Ax,
+    MAXARG_A:          MAXARG_A,
+    MAXARG_B:          MAXARG_B,
+    MAXARG_C:          MAXARG_C,
+    BITRK:             BITRK,
+    ISK:               ISK,
+    INDEXK:            INDEXK,
+    LFIELDS_PER_FLUSH: LFIELDS_PER_FLUSH
 };
\ No newline at end of file
diff --git a/src/lvm.js b/src/lvm.js
index 7ca6921..bd3e2c4 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -559,6 +559,24 @@ class LuaVM {
                     break;
                 }
                 case "OP_SETLIST": {
+                    let n = i.B;
+                    let c = i.C;
+
+                    if (n === 0) n = L.top - ra - 1;
+
+                    if (c === 0) {
+                        assert(OC.OpCodes[ci.u.l.savedpc[ci.pcOff].opcode] === "OP_EXTRAARG");
+                        c = ci.u.l.savedpc[ci.pcOff++].Ax;
+                    }
+
+                    let table = L.stack[ra].value;
+                    let last = ((c - 1) * OC.LFIELDS_PER_FLUSH) + n;
+
+                    for (; n > 0; n--) {
+                        table.array[last--] = L.stack[ra + n];
+                    }
+
+                    L.top = ci.top; /* correct top (in case of previous open call) */
                     break;
                 }
                 case "OP_CLOSURE": {
-- 
cgit v1.2.3-70-g09d2