Rework runtime

.travis.yml

@@ -3,9 +3,6 @@ notifications:
   email: false
 before_install: npm config set progress=false && npm i -g npm@latest --no-audit
 install: npm ci --no-audit
-cache:
-  directories:
-  - node_modules
 jobs:
   include:
   - node_js: lts/*

cli/asc.js

@@ -387,11 +387,34 @@ exports.main = function main(argv, options, callback) {
     stats.parseTime += measure(() => {
       parser = assemblyscript.parseFile(sourceText, sourcePath, true, parser);
     });
+  }
+
+  // Include runtime template
+  {
+    let templateName = String(args.runtime);
+    let templateText = exports.libraryFiles["runtime/" + templateName];
+    if (templateText == null) {
+      templateText = readFile(templateName + ".ts", baseDir);
+      if (templateText == null) {
+        return callback(Error("Runtime template '" + templateName + " not found."));
+      }
+    }
+    stats.parseCount++;
+    stats.parseTime += measure(() => {
+      parser = assemblyscript.parseFile(templateText, templateName, true, parser);
+    });
+  }
+
+  // Parse entry files
+  {
     let code = parseBacklog();
     if (code) return code;
   }
 
+  // Call afterParse transform hook
   applyTransform("afterParse", parser);
+
+  // Parse additional files, if any
   {
     let code = parseBacklog();
     if (code) return code;
@@ -431,8 +454,8 @@ exports.main = function main(argv, options, callback) {
     // Initialize default aliases
     assemblyscript.setGlobalAlias(compilerOptions, "Math", "NativeMath");
     assemblyscript.setGlobalAlias(compilerOptions, "Mathf", "NativeMathf");
-    assemblyscript.setGlobalAlias(compilerOptions, "abort", "~lib/env/abort");
-    assemblyscript.setGlobalAlias(compilerOptions, "trace", "~lib/env/trace");
+    assemblyscript.setGlobalAlias(compilerOptions, "abort", "~lib/builtins/abort");
+    assemblyscript.setGlobalAlias(compilerOptions, "trace", "~lib/builtins/trace");
   }
 
   // Add or override aliases if specified
@@ -463,15 +486,13 @@ exports.main = function main(argv, options, callback) {
 
   var module;
   stats.compileCount++;
-  (() => {
-    try {
-      stats.compileTime += measure(() => {
-        module = assemblyscript.compileProgram(program, compilerOptions);
-      });
-    } catch (e) {
-      return callback(e);
-    }
-  })();
+  try {
+    stats.compileTime += measure(() => {
+      module = assemblyscript.compileProgram(program, compilerOptions);
+    });
+  } catch (e) {
+    return callback(e);
+  }
   if (checkDiagnostics(parser, stderr)) {
     if (module) module.dispose();
     return callback(Error("Compile error"));

cli/asc.json

@@ -81,6 +81,18 @@
     ],
     "type": "s"
   },
+  "runtime": {
+    "description": [
+      "Specifies the runtime template to include in the program.",
+      "",
+      " none   No allocator/GC or compose your own. [default]",
+      " trace  TLSF memory allocator and ITCM garbage collector.",
+      " arena  Just the arena memory allocator. No free/GC.",
+      ""
+    ],
+    "type": "s",
+    "default": "none"
+  },
   "debug": {
     "description": "Enables debug information in emitted binaries.",
     "type": "b",

examples/game-of-life/build/optimized.wat

@@ -8,13 +8,10 @@
  (import "config" "BGR_ALIVE" (global $assembly/config/BGR_ALIVE i32))
  (import "config" "BIT_ROT" (global $assembly/config/BIT_ROT i32))
  (import "Math" "random" (func $~lib/bindings/Math/random (result f64)))
- (table $0 1 funcref)
- (elem (i32.const 0) $null)
  (global $assembly/index/w (mut i32) (i32.const 0))
  (global $assembly/index/h (mut i32) (i32.const 0))
  (global $assembly/index/s (mut i32) (i32.const 0))
  (export "memory" (memory $0))
- (export "table" (table $0))
  (export "init" (func $assembly/index/init))
  (export "step" (func $assembly/index/step))
  (export "fill" (func $assembly/index/fill))
@@ -136,7 +133,7 @@
       local.get $7
       local.get $1
       select
-      local.tee $2
+      local.tee $3
       global.get $assembly/index/w
       local.get $4
       i32.mul
@@ -165,7 +162,7 @@
       local.get $7
       i32.eq
       select
-      local.tee $3
+      local.tee $2
       global.get $assembly/index/w
       local.get $4
       i32.mul
@@ -179,7 +176,7 @@
       global.get $assembly/index/w
       local.get $0
       i32.mul
-      local.get $2
+      local.get $3
       i32.add
       i32.const 2
       i32.shl
@@ -190,7 +187,7 @@
       global.get $assembly/index/w
       local.get $0
       i32.mul
-      local.get $3
+      local.get $2
       i32.add
       i32.const 2
       i32.shl
@@ -201,7 +198,7 @@
       global.get $assembly/index/w
       local.get $5
       i32.mul
-      local.get $2
+      local.get $3
       i32.add
       i32.const 2
       i32.shl
@@ -223,7 +220,7 @@
       global.get $assembly/index/w
       local.get $5
       i32.mul
-      local.get $3
+      local.get $2
       i32.add
       i32.const 2
       i32.shl