Deploying to gh-pages from @ ee67aeb 🚀

Author: lovasoa

dist/sql-asm-debug.js

@@ -110,19 +110,15 @@ if (ENVIRONMENT_IS_NODE) {
     _malloc
     _free
     getValue
-    intArrayFromString
     setValue
     stackAlloc
     stackRestore
     stackSave
     UTF8ToString
-    stringToUTF8
-    lengthBytesUTF8
-    allocate
-    ALLOC_NORMAL
-    allocateUTF8OnStack
+    stringToNewUTF8
     removeFunction
     addFunction
+    writeArrayToMemory
 */
 
 "use strict";
@@ -650,14 +646,13 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             pos = this.pos;
             this.pos += 1;
         }
-        var bytes = intArrayFromString(string);
-        var strptr = allocate(bytes, ALLOC_NORMAL);
+        var strptr = stringToNewUTF8(string);
         this.allocatedmem.push(strptr);
         this.db.handleError(sqlite3_bind_text(
             this.stmt,
             pos,
             strptr,
-            bytes.length - 1,
+            -1,
             0
         ));
         return true;
@@ -668,7 +663,8 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             pos = this.pos;
             this.pos += 1;
         }
-        var blobptr = allocate(array, ALLOC_NORMAL);
+        var blobptr = _malloc(array.length);
+        writeArrayToMemory(array, blobptr);
         this.allocatedmem.push(blobptr);
         this.db.handleError(sqlite3_bind_blob(
             this.stmt,
@@ -839,12 +835,10 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
      */
     function StatementIterator(sql, db) {
         this.db = db;
-        var sz = lengthBytesUTF8(sql) + 1;
-        this.sqlPtr = _malloc(sz);
+        this.sqlPtr = stringToNewUTF8(sql);
         if (this.sqlPtr === null) {
             throw new Error("Unable to allocate memory for the SQL string");
         }
-        stringToUTF8(sql, this.sqlPtr, sz);
         this.nextSqlPtr = this.sqlPtr;
         this.nextSqlString = null;
         this.activeStatement = null;
@@ -1057,25 +1051,27 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
         if (!this.db) {
             throw "Database closed";
         }
-        var stack = stackSave();
         var stmt = null;
+        var originalSqlPtr = null;
+        var currentSqlPtr = null;
         try {
-            var nextSqlPtr = allocateUTF8OnStack(sql);
+            originalSqlPtr = stringToNewUTF8(sql);
+            currentSqlPtr = originalSqlPtr;
             var pzTail = stackAlloc(4);
             var results = [];
-            while (getValue(nextSqlPtr, "i8") !== NULL) {
+            while (getValue(currentSqlPtr, "i8") !== NULL) {
                 setValue(apiTemp, 0, "i32");
                 setValue(pzTail, 0, "i32");
                 this.handleError(sqlite3_prepare_v2_sqlptr(
                     this.db,
-                    nextSqlPtr,
+                    currentSqlPtr,
                     -1,
                     apiTemp,
                     pzTail
                 ));
                 // pointer to a statement, or null
                 var pStmt = getValue(apiTemp, "i32");
-                nextSqlPtr = getValue(pzTail, "i32");
+                currentSqlPtr = getValue(pzTail, "i32");
                 // Empty statement
                 if (pStmt !== NULL) {
                     var curresult = null;
@@ -1101,7 +1097,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             if (stmt) stmt["free"]();
             throw errCaught;
         } finally {
-            stackRestore(stack);
+            if (originalSqlPtr) _free(originalSqlPtr);
         }
     };
 
@@ -1309,7 +1305,8 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
                 if (result === null) {
                     sqlite3_result_null(cx);
                 } else if (result.length != null) {
-                    var blobptr = allocate(result, ALLOC_NORMAL);
+                    var blobptr = _malloc(result.length);
+                    writeArrayToMemory(result, blobptr);
                     sqlite3_result_blob(cx, blobptr, result.length, -1);
                     _free(blobptr);
                 } else {
@@ -139922,34 +139919,16 @@ var tempI64;
 
 
 
-  var ALLOC_NORMAL = 0;
-  
-  var ALLOC_STACK = 1;
-  
 
 
-  var allocate = (slab, allocator) => {
-      var ret;
-      assert(typeof allocator == 'number', 'allocate no longer takes a type argument')
-      assert(typeof slab != 'number', 'allocate no longer takes a number as arg0')
-  
-      if (allocator == ALLOC_STACK) {
-        ret = stackAlloc(slab.length);
-      } else {
-        ret = _malloc(slab.length);
-      }
-  
-      if (!slab.subarray && !slab.slice) {
-        slab = new Uint8Array(slab);
-      }
-      HEAPU8.set(slab, ret);
+  var stringToNewUTF8 = (str) => {
+      var size = lengthBytesUTF8(str) + 1;
+      var ret = _malloc(size);
+      if (ret) stringToUTF8(str, ret, size);
       return ret;
     };
 
 
-  
-  var allocateUTF8OnStack = stringToUTF8OnStack;
-
   var functionsInTableMap;
 
   var freeTableIndexes = [];
@@ -140297,9 +140276,8 @@ Module['cwrap'] = cwrap;
 Module['addFunction'] = addFunction;
 Module['removeFunction'] = removeFunction;
 Module['UTF8ToString'] = UTF8ToString;
-Module['ALLOC_NORMAL'] = ALLOC_NORMAL;
-Module['allocate'] = allocate;
-Module['allocateUTF8OnStack'] = allocateUTF8OnStack;
+Module['stringToNewUTF8'] = stringToNewUTF8;
+Module['writeArrayToMemory'] = writeArrayToMemory;
 var missingLibrarySymbols = [
   'writeI53ToI64',
   'writeI53ToI64Clamped',
@@ -140357,7 +140335,6 @@ var missingLibrarySymbols = [
   'UTF32ToString',
   'stringToUTF32',
   'lengthBytesUTF32',
-  'stringToNewUTF8',
   'registerKeyEventCallback',
   'maybeCStringToJsString',
   'findEventTarget',
@@ -140446,6 +140423,9 @@ var missingLibrarySymbols = [
   'writeGLArray',
   'registerWebGlEventCallback',
   'runAndAbortIfError',
+  'ALLOC_NORMAL',
+  'ALLOC_STACK',
+  'allocate',
   'writeStringToMemory',
   'writeAsciiToMemory',
   'setErrNo',
@@ -140515,7 +140495,6 @@ var unexportedSymbols = [
   'stringToAscii',
   'UTF16Decoder',
   'stringToUTF8OnStack',
-  'writeArrayToMemory',
   'JSEvents',
   'specialHTMLTargets',
   'findCanvasEventTarget',
@@ -140573,8 +140552,8 @@ var unexportedSymbols = [
   'IDBStore',
   'SDL',
   'SDL_gfx',
-  'ALLOC_STACK',
   'allocateUTF8',
+  'allocateUTF8OnStack',
   'print',
   'printErr',
 ];