Rename memory instructions; Rework constant handling (AssemblyScript#177)

* Rename memory instructions as proposed by the bulk-memory-operations spec.
* Rename memory manager functions to memory.* as well
* Remove automatic inlining of constant globals (Binaryen does this now)
* Improve 'const' enum compatibility
* Improve module-level export generation
* Enable the inline decorator for constant variables
* Add ERROR, WARNING and INFO macros that emit a user-defined diagnostic
* Reintroduce builtin decorator so these can appear anywhere in stdlib again
* Inline isNaN and isFinite by default
* Make an interface around gc.* similar to memory.*
* Emit an error when trying to inline a mutable variable
* Slim down CI stages
* Add a more convenient tracing utility for debugging
* Implement some prequesites for an eventual bundled GC

Author: dcodeIO

.travis.yml

@@ -1,46 +1,24 @@
 language: node_js
 notifications:
   email: false
-before_install: npm i -g npm@latest --no-audit
-install: npm config set progress=false && npm i --no-audit
+before_install: npm config set progress=false && npm i -g npm@latest --no-audit
+install: npm i --no-audit
 cache:
   directories:
   - node_modules
-stages:
-- name: check-pr
-  if: type = pull_request
 jobs:
   include:
-
-  - stage: check-pr
-    node_js: lts/*
-    script: ./scripts/check-pr.sh
-    env: Checks contributing guidelines before testing pull requests
-
-  - stage: lint
-    node_js: node
-    script: npm run lint
-    env: Checks the sources with TSLint
-
-  - stage: test
-    node_js: lts/*
-    script: npm run clean && node bin/asc -v && npm test
-    env: Tests the sources on latest node.js LTS
-  - node_js: node
-    script: npm run clean && node bin/asc -v && npm test
-    env: Tests the sources on latest stable node.js
   - node_js: lts/*
     script:
-    - npm run clean
-    - cd $TRAVIS_BUILD_DIR/tests/allocators/arena && npm run build && cd .. && npm test arena
-    - cd $TRAVIS_BUILD_DIR/tests/allocators/buddy && npm run build && cd .. && npm test buddy
-    - cd $TRAVIS_BUILD_DIR/tests/allocators/tlsf  && npm run build && cd .. && npm test tlsf
-    env: Tests the allocators on latest node.js LTS
-
-  - stage: build
-    node_js: lts/*
-    script: npm run build && node bin/asc -v && npm test
-    env: Builds and tests the bundle on latest node.js LTS
+    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./scripts/check-pr.sh; fi
+    - npm run all
+    - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+        cd $TRAVIS_BUILD_DIR/tests/allocators/arena && npm run build && cd .. && npm test arena &&
+        cd $TRAVIS_BUILD_DIR/tests/allocators/buddy && npm run build && cd .. && npm test buddy &&
+        cd $TRAVIS_BUILD_DIR/tests/allocators/tlsf  && npm run build && cd .. && npm test tlsf;
+      fi
+    env: Runs the tests on node.js LTS
   - node_js: node
-    script: npm run build && node bin/asc -v && npm test
-    env: Builds and tests the bundle on latest stable node.js
+    script:
+    - npm run all
+    env: Runs the tests on node.js stable

cli/asc.js

@@ -414,7 +414,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"); // to disable: --use abort=
+  assemblyscript.setGlobalAlias(compilerOptions, "abort", "~lib/env/abort");
+  assemblyscript.setGlobalAlias(compilerOptions, "trace", "~lib/env/trace");
 
   // Add or override aliases if specified
   if (args.use) {

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

@@ -11,10 +11,10 @@
  (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 "init" (func $assembly/index/init))
  (export "step" (func $assembly/index/step))
  (export "fill" (func $assembly/index/fill))
- (export "memory" (memory $0))
  (func $assembly/index/init (; 1 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   ;;@ assembly/index.ts:29:2

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

@@ -12,10 +12,10 @@
  (global $assembly/index/h (mut i32) (i32.const 0))
  (global $assembly/index/s (mut i32) (i32.const 0))
  (global $HEAP_BASE i32 (i32.const 8))
+ (export "memory" (memory $0))
  (export "init" (func $assembly/index/init))
  (export "step" (func $assembly/index/step))
  (export "fill" (func $assembly/index/fill))
- (export "memory" (memory $0))
  (func $assembly/index/init (; 1 ;) (type $iiv) (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)

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

@@ -4,7 +4,8 @@
  (type $iiiiv (func (param i32 i32 i32 i32)))
  (global $assembly/i64/lo (mut i32) (i32.const 0))
  (global $assembly/i64/hi (mut i32) (i32.const 0))
- (memory $0 1)
+ (memory $0 0)
+ (export "memory" (memory $0))
  (export "getLo" (func $assembly/i64/getLo))
  (export "getHi" (func $assembly/i64/getHi))
  (export "clz" (func $assembly/i64/clz))
@@ -36,7 +37,6 @@
  (export "gt_u" (func $assembly/i64/gt_u))
  (export "ge_s" (func $assembly/i64/ge_s))
  (export "ge_u" (func $assembly/i64/ge_u))
- (export "memory" (memory $0))
  (func $assembly/i64/getLo (; 0 ;) (type $i) (result i32)
   ;;@ assembly/i64.ts:4:9
   (get_global $assembly/i64/lo)

examples/i64-polyfill/build/optimized.wat

@@ -7,7 +7,8 @@
  (global $NaN f64 (f64.const nan:0x8000000000000))
  (global $Infinity f64 (f64.const inf))
  (global $HEAP_BASE i32 (i32.const 8))
- (memory $0 1)
+ (memory $0 0)
+ (export "memory" (memory $0))
  (export "getLo" (func $assembly/i64/getLo))
  (export "getHi" (func $assembly/i64/getHi))
  (export "clz" (func $assembly/i64/clz))
@@ -39,7 +40,6 @@
  (export "gt_u" (func $assembly/i64/gt_u))
  (export "ge_s" (func $assembly/i64/ge_s))
  (export "ge_u" (func $assembly/i64/ge_u))
- (export "memory" (memory $0))
  (func $assembly/i64/getLo (; 0 ;) (type $i) (result i32)
   ;;@ assembly/i64.ts:4:9
   (get_global $assembly/i64/lo)

examples/i64-polyfill/build/untouched.wat

@@ -5,8 +5,8 @@
  (import "JSMath" "log" (func $~lib/math/JSMath.log (param f64) (result f64)))
  (import "JSMath" "LN2" (global $~lib/math/JSMath.LN2 f64))
  (import "env" "memory" (memory $0 0))
- (export "computeLine" (func $assembly/index/computeLine))
  (export "memory" (memory $0))
+ (export "computeLine" (func $assembly/index/computeLine))
  (func $assembly/index/computeLine (; 2 ;) (type $iiiiv) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
   (local $4 f64)
   (local $5 f64)

examples/mandelbrot/build/optimized.wasm

@@ -9,18 +9,18 @@
  (import "env" "memory" (memory $0 0))
  (global $assembly/index/NUM_COLORS i32 (i32.const 2048))
  (global $HEAP_BASE i32 (i32.const 8))
- (export "computeLine" (func $assembly/index/computeLine))
  (export "memory" (memory $0))
- (func $isFinite<f64> (; 2 ;) (type $Fi) (param $0 f64) (result i32)
-  ;;@ ~lib/builtins.ts:22:26
+ (export "computeLine" (func $assembly/index/computeLine))
+ (func $~lib/builtins/isFinite<f64> (; 2 ;) (type $Fi) (param $0 f64) (result i32)
+  ;;@ ~lib/builtins.ts:16:70
   (f64.eq
-   ;;@ ~lib/builtins.ts:22:9
+   ;;@ ~lib/builtins.ts:16:53
    (f64.sub
     (get_local $0)
-    ;;@ ~lib/builtins.ts:22:17
+    ;;@ ~lib/builtins.ts:16:61
     (get_local $0)
    )
-   ;;@ ~lib/builtins.ts:22:26
+   ;;@ ~lib/builtins.ts:16:70
    (f64.const 0)
   )
  )
@@ -375,7 +375,7 @@
      (set_local $17
       ;;@ assembly/index.ts:37:15
       (if (result i32)
-       (call $isFinite<f64>
+       (call $~lib/builtins/isFinite<f64>
         ;;@ assembly/index.ts:37:24
         (get_local $15)
        )
@@ -386,7 +386,7 @@
          (f64.convert_s/i32
           (i32.sub
            ;;@ assembly/index.ts:38:15
-           (i32.const 2048)
+           (get_global $assembly/index/NUM_COLORS)
            ;;@ assembly/index.ts:38:28
            (i32.const 1)
           )
@@ -421,7 +421,7 @@
        )
        ;;@ assembly/index.ts:39:8
        (i32.sub
-        (i32.const 2048)
+        (get_global $assembly/index/NUM_COLORS)
         ;;@ assembly/index.ts:39:21
         (i32.const 1)
        )

examples/mandelbrot/build/optimized.wat

@@ -24,9 +24,8 @@ function asmFunc(global, env, buffer) {
  var $lib_allocator_arena_startOffset = 0;
  var $lib_allocator_arena_offset = 0;
  var assembly_index_system = 0;
- var HEAP_BASE = 40;
  var i64toi32_i32$HIGH_BITS = 0;
- function $lib_allocator_arena_allocate_memory($0) {
+ function $lib_allocator_arena___memory_allocate($0) {
   $0 = $0 | 0;
   var $1 = 0, $2 = 0, $3 = 0, wasm2asm_i32$0 = 0, wasm2asm_i32$1 = 0, wasm2asm_i32$2 = 0;
   if ($0) {
@@ -55,7 +54,7 @@ function asmFunc(global, env, buffer) {
   $7 = +$7;
   var wasm2asm_i32$0 = 0, wasm2asm_f64$0 = 0.0;
   if (($0 | 0) == (0 | 0)) {
-   $0 = $lib_allocator_arena_allocate_memory(56 | 0) | 0;
+   $0 = $lib_allocator_arena___memory_allocate(56 | 0) | 0;
    wasm2asm_i32$0 = $0;
    wasm2asm_f64$0 = $1;
    HEAPF64[wasm2asm_i32$0 >> 3] = wasm2asm_f64$0;
@@ -81,7 +80,7 @@ function asmFunc(global, env, buffer) {
   return $0 | 0;
  }
 
- function $lib_memory_set_memory($0, $1, $2) {
+ function $lib_memory_memset($0, $1, $2) {
   $0 = $0 | 0;
   $1 = $1 | 0;
   $2 = $2 | 0;
@@ -253,12 +252,12 @@ function asmFunc(global, env, buffer) {
    abort();
   }
   $2 = $1 << 2 | 0;
-  $3 = $lib_allocator_arena_allocate_memory(1 << (32 - Math_clz32($2 + 7 | 0) | 0) | 0 | 0) | 0;
+  $3 = $lib_allocator_arena___memory_allocate(1 << (32 - Math_clz32($2 + 7 | 0) | 0) | 0 | 0) | 0;
   wasm2asm_i32$0 = $3;
   wasm2asm_i32$1 = $2;
   HEAP32[wasm2asm_i32$0 >> 2] = wasm2asm_i32$1;
   if (($0 | 0) == (0 | 0)) {
-   $0 = $lib_allocator_arena_allocate_memory(8 | 0) | 0;
+   $0 = $lib_allocator_arena___memory_allocate(8 | 0) | 0;
    wasm2asm_i32$0 = $0;
    wasm2asm_i32$1 = 0;
    HEAP32[wasm2asm_i32$0 >> 2] = wasm2asm_i32$1;
@@ -272,7 +271,7 @@ function asmFunc(global, env, buffer) {
   wasm2asm_i32$0 = $0;
   wasm2asm_i32$1 = $1;
   HEAP32[(wasm2asm_i32$0 + 4 | 0) >> 2] = wasm2asm_i32$1;
-  $lib_memory_set_memory($3 + 8 | 0 | 0, 0 | 0, $2 | 0);
+  $lib_memory_memset($3 + 8 | 0 | 0, 0 | 0, $2 | 0);
   return $0 | 0;
  }
 
@@ -307,7 +306,7 @@ function asmFunc(global, env, buffer) {
   wasm2asm_f64$0 = -$7 / 39.47841760435743;
   HEAPF64[(wasm2asm_i32$0 + 40 | 0) >> 3] = wasm2asm_f64$0;
   if (($0 | 0) == (0 | 0)) {
-   $2 = $lib_allocator_arena_allocate_memory(4 | 0) | 0;
+   $2 = $lib_allocator_arena___memory_allocate(4 | 0) | 0;
    wasm2asm_i32$0 = $2;
    wasm2asm_i32$1 = $1;
    HEAP32[wasm2asm_i32$0 >> 2] = wasm2asm_i32$1;
@@ -492,7 +491,7 @@ function asmFunc(global, env, buffer) {
  }
 
  function start() {
-  $lib_allocator_arena_startOffset = (HEAP_BASE + 7 | 0) & 4294967288 | 0;
+  $lib_allocator_arena_startOffset = 40;
   $lib_allocator_arena_offset = $lib_allocator_arena_startOffset;
  }
 
@@ -522,10 +521,6 @@ function asmFunc(global, env, buffer) {
  }
 
  return {
-  init: assembly_index_init, 
-  getBody: assembly_index_getBody, 
-  step: assembly_index_step, 
-  bench: assembly_index_bench, 
   memory: Object.create(Object.prototype, {
    grow: {
     value: __wasm_grow_memory
@@ -536,6 +531,10 @@ function asmFunc(global, env, buffer) {
     }
 
    }
-  })
+  }), 
+  init: assembly_index_init, 
+  getBody: assembly_index_getBody, 
+  step: assembly_index_step, 
+  bench: assembly_index_bench
  };
 }

examples/mandelbrot/build/untouched.wat

@@ -13,16 +13,15 @@
  (global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
  (global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
  (global $assembly/index/system (mut i32) (i32.const 0))
- (global $HEAP_BASE i32 (i32.const 40))
  (memory $0 1)
  (data (i32.const 8) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s")
+ (export "memory" (memory $0))
  (export "init" (func $assembly/index/init))
  (export "getBody" (func $assembly/index/getBody))
  (export "step" (func $assembly/index/step))
  (export "bench" (func $assembly/index/bench))
- (export "memory" (memory $0))
  (start $start)
- (func $~lib/allocator/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
+ (func $~lib/allocator/arena/__memory_allocate (; 1 ;) (type $ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -116,7 +115,7 @@
    (block
     (f64.store
      (tee_local $0
-      (call $~lib/allocator/arena/allocate_memory
+      (call $~lib/allocator/arena/__memory_allocate
        (i32.const 56)
       )
      )
@@ -150,7 +149,7 @@
   )
   (get_local $0)
  )
- (func $~lib/memory/set_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
+ (func $~lib/memory/memset (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i64)
   (if
@@ -500,7 +499,7 @@
   )
   (i32.store
    (tee_local $3
-    (call $~lib/allocator/arena/allocate_memory
+    (call $~lib/allocator/arena/__memory_allocate
      (i32.shl
       (i32.const 1)
       (i32.sub
@@ -529,7 +528,7 @@
    (block
     (i32.store
      (tee_local $0
-      (call $~lib/allocator/arena/allocate_memory
+      (call $~lib/allocator/arena/__memory_allocate
        (i32.const 8)
       )
      )
@@ -549,7 +548,7 @@
    (get_local $0)
    (get_local $1)
   )
-  (call $~lib/memory/set_memory
+  (call $~lib/memory/memset
    (i32.add
     (get_local $3)
     (i32.const 8)
@@ -693,7 +692,7 @@
    (block
     (i32.store
      (tee_local $2
-      (call $~lib/allocator/arena/allocate_memory
+      (call $~lib/allocator/arena/__memory_allocate
        (i32.const 4)
       )
      )
@@ -1403,13 +1402,7 @@
  )
  (func $start (; 12 ;) (type $v)
   (set_global $~lib/allocator/arena/startOffset
-   (i32.and
-    (i32.add
-     (get_global $HEAP_BASE)
-     (i32.const 7)
-    )
-    (i32.const -8)
-   )
+   (i32.const 40)
   )
   (set_global $~lib/allocator/arena/offset
    (get_global $~lib/allocator/arena/startOffset)