From 813d2e33c8c8ef46f9acfa60f228a258b9abcbc7 Mon Sep 17 00:00:00 2001
From: Max Graey <maxgraey@gmail.com>
Date: Sat, 21 Jul 2018 15:11:39 +0300
Subject: [PATCH] Update n-body sources and binary for rust. Add bench results
 (#172)

---
 README.md                                 |    5 +
 examples/n-body/README.md                 |   20 +
 examples/n-body/assembly/index.js         |    1 +
 examples/n-body/assembly/index.ts         |   49 +-
 examples/n-body/build/index.asm.js        |   14 -
 examples/n-body/build/index.js            |   15 +-
 examples/n-body/build/optimized.wasm      |  Bin 2280 -> 2220 bytes
 examples/n-body/build/optimized.wat       |   56 +-
 examples/n-body/build/rust.optimized.wasm |  Bin 1147 -> 15188 bytes
 examples/n-body/build/untouched.wat       | 1243 ++++++++++-----------
 examples/n-body/package.json              |    4 +-
 examples/n-body/rust/Cargo.toml           |    2 +-
 examples/n-body/rust/index.js             |    1 +
 examples/n-body/rust/src/lib.rs           |   20 +-
 examples/n-body/tests/index.js            |   53 +-
 15 files changed, 704 insertions(+), 779 deletions(-)

diff --git a/README.md b/README.md
index 68b681d9..1c9e22cd 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,11 @@ Examples
 * **[WASM parser](./lib/parse)**<br />
   A WebAssembly binary parser in WebAssembly.
 
+Benchmarks
+---------
+* **[n-body](./examples/n-body)**<br />
+  Compare performance and produced binary size with n-body example from Computer Language Benchmarks Game.
+
 Building
 --------
 
diff --git a/examples/n-body/README.md b/examples/n-body/README.md
index 26110320..7bf3a18c 100644
--- a/examples/n-body/README.md
+++ b/examples/n-body/README.md
@@ -25,3 +25,23 @@ To run the benchmark:
 ```
 $> npm run test [steps=1000000]
 ```
+
+Benchmark
+=========
+
+***Environment:***
+- MacBook Pro (Retina, 15-inch, Late 2013)
+- macOS 10.13.5
+- node.js v10.6.0
+- rustc 1.29.0-nightly (254f8796b 2018-07-13)
+
+***Results:***
+
+|        Target           |  Time, ***ms*** | Size, ***KB*** |
+|-------------------------|-----------------|----------------|
+| **AssemblyScript WASM** | **3167**        | **2**          |
+| AssemblyScript ASMJS    | 3633            | 21*            |
+| JavaScript              | 2628            | 5*             |
+| Rust WASM               | 3876            | 15             |
+
+___* unminified___
diff --git a/examples/n-body/assembly/index.js b/examples/n-body/assembly/index.js
index b25d0e4a..11c076b2 100644
--- a/examples/n-body/assembly/index.js
+++ b/examples/n-body/assembly/index.js
@@ -7,6 +7,7 @@ const compiled = new WebAssembly.Module(
 
 const imports = {
   env: {
+    memory: new WebAssembly.Memory({ initial: 10 }),
     abort: (filename, line, column) => {
       throw Error("abort called at " + line + ":" + colum);
     }
diff --git a/examples/n-body/assembly/index.ts b/examples/n-body/assembly/index.ts
index e3d5a7a3..8a10f304 100644
--- a/examples/n-body/assembly/index.ts
+++ b/examples/n-body/assembly/index.ts
@@ -36,62 +36,60 @@ function Sun(): Body {
 
 function Jupiter(): Body {
   return new Body(
-    4.84143144246472090e+00,
+     4.84143144246472090e+00,
     -1.16032004402742839e+00,
     -1.03622044471123109e-01,
-    1.66007664274403694e-03 * DAYS_PER_YEAR,
-    7.69901118419740425e-03 * DAYS_PER_YEAR,
+     1.66007664274403694e-03 * DAYS_PER_YEAR,
+     7.69901118419740425e-03 * DAYS_PER_YEAR,
     -6.90460016972063023e-05 * DAYS_PER_YEAR,
-    9.54791938424326609e-04 * SOLAR_MASS
+     9.54791938424326609e-04 * SOLAR_MASS
   );
 }
 
 function Saturn(): Body {
   return new Body(
-    8.34336671824457987e+00,
-    4.12479856412430479e+00,
+     8.34336671824457987e+00,
+     4.12479856412430479e+00,
     -4.03523417114321381e-01,
     -2.76742510726862411e-03 * DAYS_PER_YEAR,
-    4.99852801234917238e-03 * DAYS_PER_YEAR,
-    2.30417297573763929e-05 * DAYS_PER_YEAR,
-    2.85885980666130812e-04 * SOLAR_MASS
+     4.99852801234917238e-03 * DAYS_PER_YEAR,
+     2.30417297573763929e-05 * DAYS_PER_YEAR,
+     2.85885980666130812e-04 * SOLAR_MASS
   );
 }
 
 function Uranus(): Body {
   return new Body(
-    1.28943695621391310e+01,
+     1.28943695621391310e+01,
     -1.51111514016986312e+01,
     -2.23307578892655734e-01,
-    2.96460137564761618e-03 * DAYS_PER_YEAR,
-    2.37847173959480950e-03 * DAYS_PER_YEAR,
+     2.96460137564761618e-03 * DAYS_PER_YEAR,
+     2.37847173959480950e-03 * DAYS_PER_YEAR,
     -2.96589568540237556e-05 * DAYS_PER_YEAR,
-    4.36624404335156298e-05 * SOLAR_MASS
+     4.36624404335156298e-05 * SOLAR_MASS
   );
 }
 
 function Neptune(): Body {
   return new Body(
-    1.53796971148509165e+01,
+     1.53796971148509165e+01,
     -2.59193146099879641e+01,
-    1.79258772950371181e-01,
-    2.68067772490389322e-03 * DAYS_PER_YEAR,
-    1.62824170038242295e-03 * DAYS_PER_YEAR,
+     1.79258772950371181e-01,
+     2.68067772490389322e-03 * DAYS_PER_YEAR,
+     1.62824170038242295e-03 * DAYS_PER_YEAR,
     -9.51592254519715870e-05 * DAYS_PER_YEAR,
-    5.15138902046611451e-05 * SOLAR_MASS
+     5.15138902046611451e-05 * SOLAR_MASS
   );
 }
 
 class NBodySystem {
 
-  constructor(
-    public bodies: Body[]
-  ) {
+  constructor(public bodies: Body[]) {
     var px: float = 0.0;
     var py: float = 0.0;
     var pz: float = 0.0;
     var size = bodies.length;
-    for (let i = 0; i < size; i++) {
+    for (let i = 0; i < size; ++i) {
       let b = unchecked(bodies[i]);
       let m = b.mass;
       px += b.vx * m;
@@ -197,16 +195,11 @@ export function init(): void {
   ]);
 }
 
-export function getBody(index: i32): Body | null {
-  var bodies = system.bodies;
-  return <u32>index < <u32>bodies.length ? bodies[index] : null;
-}
-
 export function step(): float {
   system.advance(0.01);
   return system.energy();
 }
 
 export function bench(steps: u32): void {
-  for (let i: u32 = 0; i < steps; i++) system.advance(0.01);
+  for (let i: u32 = 0; i < steps; ++i) system.advance(0.01);
 }
diff --git a/examples/n-body/build/index.asm.js b/examples/n-body/build/index.asm.js
index 3797ab4d..1b93834c 100644
--- a/examples/n-body/build/index.asm.js
+++ b/examples/n-body/build/index.asm.js
@@ -341,19 +341,6 @@ function asmFunc(global, env, buffer) {
   assembly_index_system = assembly_index_NBodySystem_constructor(0 | 0, $1 | 0) | 0;
  }
  
- function assembly_index_getBody($0) {
-  $0 = $0 | 0;
-  var $1 = 0, $22 = 0, $20 = 0;
-  $1 = HEAPU32[assembly_index_system >> 2] | 0;
-  if ($0 >>> 0 < (HEAP32[($1 + 4 | 0) >> 2] | 0) >>> 0) {
-   $1 = HEAPU32[$1 >> 2] | 0;
-   if ($0 >>> 0 < ((HEAP32[$1 >> 2] | 0) >>> 2 | 0) >>> 0) $20 = HEAPU32[(($1 + ($0 << 2 | 0) | 0) + 8 | 0) >> 2] | 0; else abort();
-   $22 = $20;
-  } else $22 = 0;
-  $0 = $22;
-  return $0 | 0;
- }
- 
  function assembly_index_NBodySystem_advance($0, $1) {
   $0 = $0 | 0;
   $1 = +$1;
@@ -533,7 +520,6 @@ function asmFunc(global, env, buffer) {
    }
   }), 
   init: assembly_index_init, 
-  getBody: assembly_index_getBody, 
   step: assembly_index_step, 
   bench: assembly_index_bench
  };
diff --git a/examples/n-body/build/index.js b/examples/n-body/build/index.js
index dbf083c7..bd91ac1f 100644
--- a/examples/n-body/build/index.js
+++ b/examples/n-body/build/index.js
@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("allocator/arena");
-// From The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org
-const SOLAR_MASS = 4.0 * Math.PI * Math.PI;
+const SOLAR_MASS = (4.0 * Math.PI * Math.PI);
 const DAYS_PER_YEAR = 365.24;
 class Body {
     constructor(x, y, z, vx, vy, vz, mass) {
@@ -44,7 +42,7 @@ class NBodySystem {
         var py = 0.0;
         var pz = 0.0;
         var size = bodies.length;
-        for (let i = 0; i < size; i++) {
+        for (let i = 0; i < size; ++i) {
             let b = unchecked(bodies[i]);
             let m = b.mass;
             px += b.vx * m;
@@ -107,7 +105,7 @@ class NBodySystem {
             let bim = bodyi.mass;
             e += 0.5 * bim * (vx * vx + vy * vy + vz * vz);
             for (let j = i + 1; j < size; ++j) {
-                let bodyj = bodies[j];
+                let bodyj = unchecked(bodies[j]);
                 let dx = ix - bodyj.x;
                 let dy = iy - bodyj.y;
                 let dz = iz - bodyj.z;
@@ -129,18 +127,13 @@ function init() {
     ]);
 }
 exports.init = init;
-function getBody(index) {
-    var bodies = system.bodies;
-    return index < bodies.length ? bodies[index] : null;
-}
-exports.getBody = getBody;
 function step() {
     system.advance(0.01);
     return system.energy();
 }
 exports.step = step;
 function bench(steps) {
-    for (let i = 0; i < steps; i++)
+    for (let i = 0; i < steps; ++i)
         system.advance(0.01);
 }
 exports.bench = bench;
diff --git a/examples/n-body/build/optimized.wasm b/examples/n-body/build/optimized.wasm
index f71046780cb82a9925ef42ab9dbef571e33a7a3a..ac96f82a25e5e7f603d8c5bb80f559c35e3d71ad 100644
GIT binary patch
delta 133
zcmaDMxJGb-YpOI8b8220YhqG<Q3(SJh|QLpnwwu#$;80O%)`yZ$jZ#jz|O(O$-pMS
zT+ispz>Of-6<FYkSu*o7OBmQ#ic3-p7&uvzQuC5C7`QkXxw-D~b8lQ@#kyI6Et83r
TU71OMV{#vd3?uvG)f~0}t0o+s

delta 216
zcmZ1@_(E`kYdS9@b8220YhqG<Q3(SJGcOMlBP%mA0~0$38z%!RGa~~dn*eh?qay=1
zf?(HTWy?*?%`d8CVqnS4%Pe7FV^2>lamr7rWMF40E=et5;9^Zm%}dT;;O1cD;hG`9
zvvHLbtED9)W4!`{GLr@qgA$_#6N@JckgEV>fw>HhOl2SuMg<_NBuj&dgO!1s6=<;%
v!{*1VSxibC%1i>B+!{bbm>ifLK<fN?8I_q_szuhhKdfr87vPwj&tVGy$>}G0

diff --git a/examples/n-body/build/optimized.wat b/examples/n-body/build/optimized.wat
index 40bcbe76..48dcdcc9 100644
--- a/examples/n-body/build/optimized.wat
+++ b/examples/n-body/build/optimized.wat
@@ -10,14 +10,13 @@
  (type $iF (func (param i32) (result f64)))
  (type $iv (func (param i32)))
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (import "env" "memory" (memory $0 1))
  (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))
- (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))
  (start $start)
@@ -823,50 +822,7 @@
    )
   )
  )
- (func $assembly/index/getBody (; 7 ;) (type $ii) (param $0 i32) (result i32)
-  (local $1 i32)
-  (tee_local $0
-   (if (result i32)
-    (i32.lt_u
-     (get_local $0)
-     (i32.load offset=4
-      (tee_local $1
-       (i32.load
-        (get_global $assembly/index/system)
-       )
-      )
-     )
-    )
-    (if (result i32)
-     (i32.lt_u
-      (get_local $0)
-      (i32.shr_u
-       (i32.load
-        (tee_local $1
-         (i32.load
-          (get_local $1)
-         )
-        )
-       )
-       (i32.const 2)
-      )
-     )
-     (i32.load offset=8
-      (i32.add
-       (get_local $1)
-       (i32.shl
-        (get_local $0)
-        (i32.const 2)
-       )
-      )
-     )
-     (unreachable)
-    )
-    (i32.const 0)
-   )
-  )
- )
- (func $assembly/index/NBodySystem#advance (; 8 ;) (type $iFv) (param $0 i32) (param $1 f64)
+ (func $assembly/index/NBodySystem#advance (; 7 ;) (type $iFv) (param $0 i32) (param $1 f64)
   (local $2 i32)
   (local $3 f64)
   (local $4 i32)
@@ -1170,7 +1126,7 @@
    )
   )
  )
- (func $assembly/index/NBodySystem#energy (; 9 ;) (type $iF) (param $0 i32) (result f64)
+ (func $assembly/index/NBodySystem#energy (; 8 ;) (type $iF) (param $0 i32) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -1367,7 +1323,7 @@
   )
   (get_local $1)
  )
- (func $assembly/index/step (; 10 ;) (type $F) (result f64)
+ (func $assembly/index/step (; 9 ;) (type $F) (result f64)
   (call $assembly/index/NBodySystem#advance
    (get_global $assembly/index/system)
    (f64.const 0.01)
@@ -1376,7 +1332,7 @@
    (get_global $assembly/index/system)
   )
  )
- (func $assembly/index/bench (; 11 ;) (type $iv) (param $0 i32)
+ (func $assembly/index/bench (; 10 ;) (type $iv) (param $0 i32)
   (local $1 i32)
   (block $break|0
    (loop $repeat|0
@@ -1400,7 +1356,7 @@
    )
   )
  )
- (func $start (; 12 ;) (type $v)
+ (func $start (; 11 ;) (type $v)
   (set_global $~lib/allocator/arena/startOffset
    (i32.const 40)
   )
diff --git a/examples/n-body/build/rust.optimized.wasm b/examples/n-body/build/rust.optimized.wasm
index 2e06fd9e65cb0f9877456412272dea5bdbe883e9..8e3fadeecfbb6492873d4114d7c185e3543ca5a8 100644
GIT binary patch
literal 15188
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

delta 488
zcmY*Vze~eF6u!H6Nv=%`9R-(nnS?GKTM+D_t^bEoG^vfEMGz|S4{)$_2`;AT;wZX^
zpg8K_BCh@z9UR<Uyi2U;E${ojd%wQ-wEHEFytaef?sa;b+k1>~KlJ;A@|}KXi!f`Y
z6RxfkC|=n73YZ&N17%674umAoM5>}d3M8r?$igsg(8BQXnU|PLM(4C26(m6+DT*?2
z-9yS~#0TnqKPv@Ybyp0kKs>JDZ3fds0x~qh<y2ruH9gBHa-CslJ@ANbsuF?hc<H5e
zb3cE**qk(gs8}G)rRY~X6$t;++y}})yQz?=7rjswYG#=#%y@v18iW~244lhhx<s<~
zwvcU`?Lt*tY<sN5n<lX$EfYjn+9nd|ApP-doYjo!6rJpEoKMn;N*F!o3F;22@<%wC
rjP+@9<9gV#xv1%itfe8s=+&NeJ}K3g5+iUv$|YyR54(Q21}tXZJuGSl

diff --git a/examples/n-body/build/untouched.wat b/examples/n-body/build/untouched.wat
index d5b7ee53..4fa687af 100644
--- a/examples/n-body/build/untouched.wat
+++ b/examples/n-body/build/untouched.wat
@@ -12,6 +12,7 @@
  (type $iF (func (param i32) (result f64)))
  (type $iv (func (param i32)))
  (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (import "env" "memory" (memory $0 1))
  (global $~lib/internal/allocator/AL_BITS i32 (i32.const 3))
  (global $~lib/internal/allocator/AL_SIZE i32 (i32.const 8))
  (global $~lib/internal/allocator/AL_MASK i32 (i32.const 7))
@@ -25,12 +26,10 @@
  (global $~lib/internal/arraybuffer/HEADER_SIZE i32 (i32.const 8))
  (global $~lib/internal/arraybuffer/MAX_BLENGTH i32 (i32.const 1073741816))
  (global $HEAP_BASE i32 (i32.const 100))
- (memory $0 1)
  (data (i32.const 8) "\0d\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
  (data (i32.const 40) "\1c\00\00\00~\00l\00i\00b\00/\00i\00n\00t\00e\00r\00n\00a\00l\00/\00a\00r\00r\00a\00y\00b\00u\00f\00f\00e\00r\00.\00t\00s\00")
  (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))
  (start $start)
@@ -41,106 +40,106 @@
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
-  ;;@ ~lib/allocator/arena.ts:17:2
+  ;;@ ~lib/allocator/arena.ts:18:2
   (if
-   ;;@ ~lib/allocator/arena.ts:17:6
+   ;;@ ~lib/allocator/arena.ts:18:6
    (get_local $0)
-   ;;@ ~lib/allocator/arena.ts:17:12
+   ;;@ ~lib/allocator/arena.ts:18:12
    (block
-    ;;@ ~lib/allocator/arena.ts:18:4
+    ;;@ ~lib/allocator/arena.ts:19:4
     (if
-     ;;@ ~lib/allocator/arena.ts:18:8
+     ;;@ ~lib/allocator/arena.ts:19:8
      (i32.gt_u
       (get_local $0)
-      ;;@ ~lib/allocator/arena.ts:18:15
+      ;;@ ~lib/allocator/arena.ts:19:15
       (get_global $~lib/internal/allocator/MAX_SIZE_32)
      )
-     ;;@ ~lib/allocator/arena.ts:18:28
+     ;;@ ~lib/allocator/arena.ts:19:28
      (unreachable)
     )
-    ;;@ ~lib/allocator/arena.ts:19:4
+    ;;@ ~lib/allocator/arena.ts:20:4
     (set_local $1
-     ;;@ ~lib/allocator/arena.ts:19:14
+     ;;@ ~lib/allocator/arena.ts:20:14
      (get_global $~lib/allocator/arena/offset)
     )
-    ;;@ ~lib/allocator/arena.ts:20:4
+    ;;@ ~lib/allocator/arena.ts:21:4
     (set_local $2
-     ;;@ ~lib/allocator/arena.ts:20:17
+     ;;@ ~lib/allocator/arena.ts:21:17
      (i32.and
       (i32.add
-       ;;@ ~lib/allocator/arena.ts:20:18
+       ;;@ ~lib/allocator/arena.ts:21:18
        (i32.add
         (get_local $1)
-        ;;@ ~lib/allocator/arena.ts:20:24
+        ;;@ ~lib/allocator/arena.ts:21:24
         (get_local $0)
        )
-       ;;@ ~lib/allocator/arena.ts:20:31
+       ;;@ ~lib/allocator/arena.ts:21:31
        (get_global $~lib/internal/allocator/AL_MASK)
       )
-      ;;@ ~lib/allocator/arena.ts:20:42
+      ;;@ ~lib/allocator/arena.ts:21:42
       (i32.xor
-       ;;@ ~lib/allocator/arena.ts:20:43
+       ;;@ ~lib/allocator/arena.ts:21:43
        (get_global $~lib/internal/allocator/AL_MASK)
        (i32.const -1)
       )
      )
     )
-    ;;@ ~lib/allocator/arena.ts:21:4
+    ;;@ ~lib/allocator/arena.ts:22:4
     (set_local $3
-     ;;@ ~lib/allocator/arena.ts:21:29
+     ;;@ ~lib/allocator/arena.ts:22:29
      (current_memory)
     )
-    ;;@ ~lib/allocator/arena.ts:22:4
+    ;;@ ~lib/allocator/arena.ts:23:4
     (if
-     ;;@ ~lib/allocator/arena.ts:22:8
+     ;;@ ~lib/allocator/arena.ts:23:8
      (i32.gt_u
       (get_local $2)
-      ;;@ ~lib/allocator/arena.ts:22:17
+      ;;@ ~lib/allocator/arena.ts:23:17
       (i32.shl
        (get_local $3)
-       ;;@ ~lib/allocator/arena.ts:22:39
+       ;;@ ~lib/allocator/arena.ts:23:39
        (i32.const 16)
       )
      )
-     ;;@ ~lib/allocator/arena.ts:22:43
+     ;;@ ~lib/allocator/arena.ts:23:43
      (block
-      ;;@ ~lib/allocator/arena.ts:23:6
+      ;;@ ~lib/allocator/arena.ts:24:6
       (set_local $4
-       ;;@ ~lib/allocator/arena.ts:23:24
+       ;;@ ~lib/allocator/arena.ts:24:24
        (i32.shr_u
         (i32.and
-         ;;@ ~lib/allocator/arena.ts:23:25
+         ;;@ ~lib/allocator/arena.ts:24:25
          (i32.add
-          ;;@ ~lib/allocator/arena.ts:23:26
+          ;;@ ~lib/allocator/arena.ts:24:26
           (i32.sub
            (get_local $2)
-           ;;@ ~lib/allocator/arena.ts:23:35
+           ;;@ ~lib/allocator/arena.ts:24:35
            (get_local $1)
           )
-          ;;@ ~lib/allocator/arena.ts:23:41
+          ;;@ ~lib/allocator/arena.ts:24:41
           (i32.const 65535)
          )
-         ;;@ ~lib/allocator/arena.ts:23:51
+         ;;@ ~lib/allocator/arena.ts:24:51
          (i32.xor
-          ;;@ ~lib/allocator/arena.ts:23:52
+          ;;@ ~lib/allocator/arena.ts:24:52
           (i32.const 65535)
           (i32.const -1)
          )
         )
-        ;;@ ~lib/allocator/arena.ts:23:64
+        ;;@ ~lib/allocator/arena.ts:24:64
         (i32.const 16)
        )
       )
-      ;;@ ~lib/allocator/arena.ts:24:6
+      ;;@ ~lib/allocator/arena.ts:25:6
       (set_local $5
-       ;;@ ~lib/allocator/arena.ts:24:24
+       ;;@ ~lib/allocator/arena.ts:25:24
        (select
         (tee_local $5
-         ;;@ ~lib/allocator/arena.ts:24:28
+         ;;@ ~lib/allocator/arena.ts:25:28
          (get_local $3)
         )
         (tee_local $6
-         ;;@ ~lib/allocator/arena.ts:24:41
+         ;;@ ~lib/allocator/arena.ts:25:41
          (get_local $4)
         )
         (i32.gt_s
@@ -149,56 +148,56 @@
         )
        )
       )
-      ;;@ ~lib/allocator/arena.ts:25:6
+      ;;@ ~lib/allocator/arena.ts:26:6
       (if
-       ;;@ ~lib/allocator/arena.ts:25:10
+       ;;@ ~lib/allocator/arena.ts:26:10
        (i32.lt_s
-        ;;@ ~lib/allocator/arena.ts:25:17
+        ;;@ ~lib/allocator/arena.ts:26:17
         (grow_memory
-         ;;@ ~lib/allocator/arena.ts:25:22
+         ;;@ ~lib/allocator/arena.ts:26:22
          (get_local $5)
         )
-        ;;@ ~lib/allocator/arena.ts:25:37
+        ;;@ ~lib/allocator/arena.ts:26:37
         (i32.const 0)
        )
-       ;;@ ~lib/allocator/arena.ts:25:40
+       ;;@ ~lib/allocator/arena.ts:26:40
        (if
-        ;;@ ~lib/allocator/arena.ts:26:12
+        ;;@ ~lib/allocator/arena.ts:27:12
         (i32.lt_s
-         ;;@ ~lib/allocator/arena.ts:26:19
+         ;;@ ~lib/allocator/arena.ts:27:19
          (grow_memory
-          ;;@ ~lib/allocator/arena.ts:26:24
+          ;;@ ~lib/allocator/arena.ts:27:24
           (get_local $4)
          )
-         ;;@ ~lib/allocator/arena.ts:26:39
+         ;;@ ~lib/allocator/arena.ts:27:39
          (i32.const 0)
         )
-        ;;@ ~lib/allocator/arena.ts:26:42
+        ;;@ ~lib/allocator/arena.ts:27:42
         (unreachable)
        )
       )
      )
     )
-    ;;@ ~lib/allocator/arena.ts:31:4
+    ;;@ ~lib/allocator/arena.ts:32:4
     (set_global $~lib/allocator/arena/offset
-     ;;@ ~lib/allocator/arena.ts:31:13
+     ;;@ ~lib/allocator/arena.ts:32:13
      (get_local $2)
     )
-    ;;@ ~lib/allocator/arena.ts:32:11
+    ;;@ ~lib/allocator/arena.ts:33:11
     (return
      (get_local $1)
     )
    )
   )
-  ;;@ ~lib/allocator/arena.ts:34:9
+  ;;@ ~lib/allocator/arena.ts:35:9
   (i32.const 0)
  )
  (func $~lib/memory/memory.allocate (; 2 ;) (type $ii) (param $0 i32) (result i32)
-  ;;@ ~lib/memory.ts:37:4
+  ;;@ ~lib/memory.ts:35:4
   (return
-   ;;@ ~lib/memory.ts:37:45
+   ;;@ ~lib/memory.ts:35:45
    (call $~lib/allocator/arena/__memory_allocate
-    ;;@ ~lib/memory.ts:37:63
+    ;;@ ~lib/memory.ts:35:63
     (get_local $0)
    )
   )
@@ -274,22 +273,22 @@
   ;;@ assembly/index.ts:46:2
   (call $assembly/index/Body#constructor
    (i32.const 0)
-   ;;@ assembly/index.ts:39:4
+   ;;@ assembly/index.ts:39:5
    (f64.const 4.841431442464721)
    ;;@ assembly/index.ts:40:4
    (f64.const -1.1603200440274284)
    ;;@ assembly/index.ts:41:4
    (f64.const -0.10362204447112311)
-   ;;@ assembly/index.ts:42:4
+   ;;@ assembly/index.ts:42:5
    (f64.mul
     (f64.const 0.001660076642744037)
-    ;;@ assembly/index.ts:42:30
+    ;;@ assembly/index.ts:42:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:43:4
+   ;;@ assembly/index.ts:43:5
    (f64.mul
     (f64.const 0.007699011184197404)
-    ;;@ assembly/index.ts:43:30
+    ;;@ assembly/index.ts:43:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
    ;;@ assembly/index.ts:44:4
@@ -298,10 +297,10 @@
     ;;@ assembly/index.ts:44:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:45:4
+   ;;@ assembly/index.ts:45:5
    (f64.mul
     (f64.const 9.547919384243266e-04)
-    ;;@ assembly/index.ts:45:30
+    ;;@ assembly/index.ts:45:31
     (get_global $assembly/index/SOLAR_MASS)
    )
   )
@@ -310,9 +309,9 @@
   ;;@ assembly/index.ts:58:2
   (call $assembly/index/Body#constructor
    (i32.const 0)
-   ;;@ assembly/index.ts:51:4
+   ;;@ assembly/index.ts:51:5
    (f64.const 8.34336671824458)
-   ;;@ assembly/index.ts:52:4
+   ;;@ assembly/index.ts:52:5
    (f64.const 4.124798564124305)
    ;;@ assembly/index.ts:53:4
    (f64.const -0.4035234171143214)
@@ -322,22 +321,22 @@
     ;;@ assembly/index.ts:54:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:55:4
+   ;;@ assembly/index.ts:55:5
    (f64.mul
     (f64.const 0.004998528012349172)
-    ;;@ assembly/index.ts:55:30
+    ;;@ assembly/index.ts:55:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:56:4
+   ;;@ assembly/index.ts:56:5
    (f64.mul
     (f64.const 2.3041729757376393e-05)
-    ;;@ assembly/index.ts:56:30
+    ;;@ assembly/index.ts:56:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:57:4
+   ;;@ assembly/index.ts:57:5
    (f64.mul
     (f64.const 2.858859806661308e-04)
-    ;;@ assembly/index.ts:57:30
+    ;;@ assembly/index.ts:57:31
     (get_global $assembly/index/SOLAR_MASS)
    )
   )
@@ -346,22 +345,22 @@
   ;;@ assembly/index.ts:70:2
   (call $assembly/index/Body#constructor
    (i32.const 0)
-   ;;@ assembly/index.ts:63:4
+   ;;@ assembly/index.ts:63:5
    (f64.const 12.894369562139131)
    ;;@ assembly/index.ts:64:4
    (f64.const -15.111151401698631)
    ;;@ assembly/index.ts:65:4
    (f64.const -0.22330757889265573)
-   ;;@ assembly/index.ts:66:4
+   ;;@ assembly/index.ts:66:5
    (f64.mul
     (f64.const 0.002964601375647616)
-    ;;@ assembly/index.ts:66:30
+    ;;@ assembly/index.ts:66:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:67:4
+   ;;@ assembly/index.ts:67:5
    (f64.mul
     (f64.const 2.3784717395948095e-03)
-    ;;@ assembly/index.ts:67:30
+    ;;@ assembly/index.ts:67:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
    ;;@ assembly/index.ts:68:4
@@ -370,10 +369,10 @@
     ;;@ assembly/index.ts:68:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:69:4
+   ;;@ assembly/index.ts:69:5
    (f64.mul
     (f64.const 4.366244043351563e-05)
-    ;;@ assembly/index.ts:69:30
+    ;;@ assembly/index.ts:69:31
     (get_global $assembly/index/SOLAR_MASS)
    )
   )
@@ -382,22 +381,22 @@
   ;;@ assembly/index.ts:82:2
   (call $assembly/index/Body#constructor
    (i32.const 0)
-   ;;@ assembly/index.ts:75:4
+   ;;@ assembly/index.ts:75:5
    (f64.const 15.379697114850917)
    ;;@ assembly/index.ts:76:4
    (f64.const -25.919314609987964)
-   ;;@ assembly/index.ts:77:4
+   ;;@ assembly/index.ts:77:5
    (f64.const 0.17925877295037118)
-   ;;@ assembly/index.ts:78:4
+   ;;@ assembly/index.ts:78:5
    (f64.mul
     (f64.const 2.6806777249038932e-03)
-    ;;@ assembly/index.ts:78:30
+    ;;@ assembly/index.ts:78:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:79:4
+   ;;@ assembly/index.ts:79:5
    (f64.mul
     (f64.const 0.001628241700382423)
-    ;;@ assembly/index.ts:79:30
+    ;;@ assembly/index.ts:79:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
    ;;@ assembly/index.ts:80:4
@@ -406,10 +405,10 @@
     ;;@ assembly/index.ts:80:31
     (get_global $assembly/index/DAYS_PER_YEAR)
    )
-   ;;@ assembly/index.ts:81:4
+   ;;@ assembly/index.ts:81:5
    (f64.mul
     (f64.const 5.1513890204661145e-05)
-    ;;@ assembly/index.ts:81:30
+    ;;@ assembly/index.ts:81:31
     (get_global $assembly/index/SOLAR_MASS)
    )
   )
@@ -486,297 +485,319 @@
   (local $3 i32)
   (local $4 i32)
   (local $5 i64)
-  ;;@ ~lib/memory.ts:244:2
+  ;;@ ~lib/memory.ts:242:2
   (if
-   ;;@ ~lib/memory.ts:244:6
+   ;;@ ~lib/memory.ts:242:6
    (i32.eqz
-    ;;@ ~lib/memory.ts:244:7
+    ;;@ ~lib/memory.ts:242:7
     (get_local $2)
    )
-   ;;@ ~lib/memory.ts:244:10
+   ;;@ ~lib/memory.ts:242:10
    (return)
   )
-  ;;@ ~lib/memory.ts:245:2
+  ;;@ ~lib/memory.ts:243:2
   (i32.store8
-   ;;@ ~lib/memory.ts:245:12
+   ;;@ ~lib/memory.ts:243:12
    (get_local $0)
-   ;;@ ~lib/memory.ts:245:18
+   ;;@ ~lib/memory.ts:243:18
    (get_local $1)
   )
-  ;;@ ~lib/memory.ts:246:2
+  ;;@ ~lib/memory.ts:244:2
   (i32.store8
-   ;;@ ~lib/memory.ts:246:12
+   ;;@ ~lib/memory.ts:244:12
    (i32.sub
     (i32.add
      (get_local $0)
-     ;;@ ~lib/memory.ts:246:19
+     ;;@ ~lib/memory.ts:244:19
      (get_local $2)
     )
-    ;;@ ~lib/memory.ts:246:23
+    ;;@ ~lib/memory.ts:244:23
     (i32.const 1)
    )
-   ;;@ ~lib/memory.ts:246:26
+   ;;@ ~lib/memory.ts:244:26
    (get_local $1)
   )
-  ;;@ ~lib/memory.ts:247:2
+  ;;@ ~lib/memory.ts:245:2
   (if
-   ;;@ ~lib/memory.ts:247:6
+   ;;@ ~lib/memory.ts:245:6
    (i32.le_u
     (get_local $2)
-    ;;@ ~lib/memory.ts:247:11
+    ;;@ ~lib/memory.ts:245:11
     (i32.const 2)
    )
-   ;;@ ~lib/memory.ts:247:14
+   ;;@ ~lib/memory.ts:245:14
    (return)
   )
+  ;;@ ~lib/memory.ts:247:2
+  (i32.store8
+   ;;@ ~lib/memory.ts:247:12
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:247:19
+    (i32.const 1)
+   )
+   ;;@ ~lib/memory.ts:247:22
+   (get_local $1)
+  )
+  ;;@ ~lib/memory.ts:248:2
+  (i32.store8
+   ;;@ ~lib/memory.ts:248:12
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:248:19
+    (i32.const 2)
+   )
+   ;;@ ~lib/memory.ts:248:22
+   (get_local $1)
+  )
   ;;@ ~lib/memory.ts:249:2
   (i32.store8
    ;;@ ~lib/memory.ts:249:12
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:249:19
-    (i32.const 1)
+   (i32.sub
+    (i32.add
+     (get_local $0)
+     ;;@ ~lib/memory.ts:249:19
+     (get_local $2)
+    )
+    ;;@ ~lib/memory.ts:249:23
+    (i32.const 2)
    )
-   ;;@ ~lib/memory.ts:249:22
+   ;;@ ~lib/memory.ts:249:26
    (get_local $1)
   )
   ;;@ ~lib/memory.ts:250:2
   (i32.store8
    ;;@ ~lib/memory.ts:250:12
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:250:19
-    (i32.const 2)
-   )
-   ;;@ ~lib/memory.ts:250:22
-   (get_local $1)
-  )
-  ;;@ ~lib/memory.ts:251:2
-  (i32.store8
-   ;;@ ~lib/memory.ts:251:12
    (i32.sub
     (i32.add
      (get_local $0)
-     ;;@ ~lib/memory.ts:251:19
+     ;;@ ~lib/memory.ts:250:19
      (get_local $2)
     )
-    ;;@ ~lib/memory.ts:251:23
-    (i32.const 2)
+    ;;@ ~lib/memory.ts:250:23
+    (i32.const 3)
    )
-   ;;@ ~lib/memory.ts:251:26
+   ;;@ ~lib/memory.ts:250:26
    (get_local $1)
   )
+  ;;@ ~lib/memory.ts:251:2
+  (if
+   ;;@ ~lib/memory.ts:251:6
+   (i32.le_u
+    (get_local $2)
+    ;;@ ~lib/memory.ts:251:11
+    (i32.const 6)
+   )
+   ;;@ ~lib/memory.ts:251:14
+   (return)
+  )
   ;;@ ~lib/memory.ts:252:2
   (i32.store8
    ;;@ ~lib/memory.ts:252:12
-   (i32.sub
-    (i32.add
-     (get_local $0)
-     ;;@ ~lib/memory.ts:252:19
-     (get_local $2)
-    )
-    ;;@ ~lib/memory.ts:252:23
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:252:19
     (i32.const 3)
    )
-   ;;@ ~lib/memory.ts:252:26
+   ;;@ ~lib/memory.ts:252:22
    (get_local $1)
   )
   ;;@ ~lib/memory.ts:253:2
-  (if
-   ;;@ ~lib/memory.ts:253:6
-   (i32.le_u
-    (get_local $2)
-    ;;@ ~lib/memory.ts:253:11
-    (i32.const 6)
-   )
-   ;;@ ~lib/memory.ts:253:14
-   (return)
-  )
-  ;;@ ~lib/memory.ts:254:2
   (i32.store8
-   ;;@ ~lib/memory.ts:254:12
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:254:19
-    (i32.const 3)
-   )
-   ;;@ ~lib/memory.ts:254:22
-   (get_local $1)
-  )
-  ;;@ ~lib/memory.ts:255:2
-  (i32.store8
-   ;;@ ~lib/memory.ts:255:12
+   ;;@ ~lib/memory.ts:253:12
    (i32.sub
     (i32.add
      (get_local $0)
-     ;;@ ~lib/memory.ts:255:19
+     ;;@ ~lib/memory.ts:253:19
      (get_local $2)
     )
-    ;;@ ~lib/memory.ts:255:23
+    ;;@ ~lib/memory.ts:253:23
     (i32.const 4)
    )
-   ;;@ ~lib/memory.ts:255:26
+   ;;@ ~lib/memory.ts:253:26
    (get_local $1)
   )
-  ;;@ ~lib/memory.ts:256:2
+  ;;@ ~lib/memory.ts:254:2
   (if
-   ;;@ ~lib/memory.ts:256:6
+   ;;@ ~lib/memory.ts:254:6
    (i32.le_u
     (get_local $2)
-    ;;@ ~lib/memory.ts:256:11
+    ;;@ ~lib/memory.ts:254:11
     (i32.const 8)
    )
-   ;;@ ~lib/memory.ts:256:14
+   ;;@ ~lib/memory.ts:254:14
    (return)
   )
-  ;;@ ~lib/memory.ts:259:2
+  ;;@ ~lib/memory.ts:257:2
   (set_local $3
-   ;;@ ~lib/memory.ts:259:17
+   ;;@ ~lib/memory.ts:257:17
    (i32.and
     (i32.sub
      (i32.const 0)
-     ;;@ ~lib/memory.ts:259:18
+     ;;@ ~lib/memory.ts:257:18
      (get_local $0)
     )
-    ;;@ ~lib/memory.ts:259:25
+    ;;@ ~lib/memory.ts:257:25
     (i32.const 3)
    )
   )
-  ;;@ ~lib/memory.ts:260:2
+  ;;@ ~lib/memory.ts:258:2
   (set_local $0
    (i32.add
     (get_local $0)
-    ;;@ ~lib/memory.ts:260:10
+    ;;@ ~lib/memory.ts:258:10
     (get_local $3)
    )
   )
-  ;;@ ~lib/memory.ts:261:2
+  ;;@ ~lib/memory.ts:259:2
   (set_local $2
    (i32.sub
     (get_local $2)
-    ;;@ ~lib/memory.ts:261:7
+    ;;@ ~lib/memory.ts:259:7
     (get_local $3)
    )
   )
-  ;;@ ~lib/memory.ts:262:2
+  ;;@ ~lib/memory.ts:260:2
   (set_local $2
    (i32.and
     (get_local $2)
-    ;;@ ~lib/memory.ts:262:7
+    ;;@ ~lib/memory.ts:260:7
     (i32.const -4)
    )
   )
-  ;;@ ~lib/memory.ts:264:2
+  ;;@ ~lib/memory.ts:262:2
   (set_local $4
-   ;;@ ~lib/memory.ts:264:17
+   ;;@ ~lib/memory.ts:262:17
    (i32.mul
     (i32.div_u
      (i32.const -1)
-     ;;@ ~lib/memory.ts:264:27
+     ;;@ ~lib/memory.ts:262:27
      (i32.const 255)
     )
     (i32.and
-     ;;@ ~lib/memory.ts:264:33
+     ;;@ ~lib/memory.ts:262:33
      (get_local $1)
      (i32.const 255)
     )
    )
   )
-  ;;@ ~lib/memory.ts:267:2
+  ;;@ ~lib/memory.ts:265:2
   (i32.store
-   ;;@ ~lib/memory.ts:267:13
+   ;;@ ~lib/memory.ts:265:13
    (get_local $0)
-   ;;@ ~lib/memory.ts:267:19
+   ;;@ ~lib/memory.ts:265:19
    (get_local $4)
   )
+  ;;@ ~lib/memory.ts:266:2
+  (i32.store
+   ;;@ ~lib/memory.ts:266:13
+   (i32.sub
+    (i32.add
+     (get_local $0)
+     ;;@ ~lib/memory.ts:266:20
+     (get_local $2)
+    )
+    ;;@ ~lib/memory.ts:266:24
+    (i32.const 4)
+   )
+   ;;@ ~lib/memory.ts:266:27
+   (get_local $4)
+  )
+  ;;@ ~lib/memory.ts:267:2
+  (if
+   ;;@ ~lib/memory.ts:267:6
+   (i32.le_u
+    (get_local $2)
+    ;;@ ~lib/memory.ts:267:11
+    (i32.const 8)
+   )
+   ;;@ ~lib/memory.ts:267:14
+   (return)
+  )
   ;;@ ~lib/memory.ts:268:2
   (i32.store
    ;;@ ~lib/memory.ts:268:13
-   (i32.sub
-    (i32.add
-     (get_local $0)
-     ;;@ ~lib/memory.ts:268:20
-     (get_local $2)
-    )
-    ;;@ ~lib/memory.ts:268:24
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:268:20
     (i32.const 4)
    )
-   ;;@ ~lib/memory.ts:268:27
+   ;;@ ~lib/memory.ts:268:23
    (get_local $4)
   )
   ;;@ ~lib/memory.ts:269:2
-  (if
-   ;;@ ~lib/memory.ts:269:6
-   (i32.le_u
-    (get_local $2)
-    ;;@ ~lib/memory.ts:269:11
+  (i32.store
+   ;;@ ~lib/memory.ts:269:13
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:269:20
     (i32.const 8)
    )
-   ;;@ ~lib/memory.ts:269:14
-   (return)
+   ;;@ ~lib/memory.ts:269:23
+   (get_local $4)
   )
   ;;@ ~lib/memory.ts:270:2
   (i32.store
    ;;@ ~lib/memory.ts:270:13
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:270:20
-    (i32.const 4)
+   (i32.sub
+    (i32.add
+     (get_local $0)
+     ;;@ ~lib/memory.ts:270:20
+     (get_local $2)
+    )
+    ;;@ ~lib/memory.ts:270:24
+    (i32.const 12)
    )
-   ;;@ ~lib/memory.ts:270:23
+   ;;@ ~lib/memory.ts:270:28
    (get_local $4)
   )
   ;;@ ~lib/memory.ts:271:2
   (i32.store
    ;;@ ~lib/memory.ts:271:13
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:271:20
-    (i32.const 8)
-   )
-   ;;@ ~lib/memory.ts:271:23
-   (get_local $4)
-  )
-  ;;@ ~lib/memory.ts:272:2
-  (i32.store
-   ;;@ ~lib/memory.ts:272:13
    (i32.sub
     (i32.add
      (get_local $0)
-     ;;@ ~lib/memory.ts:272:20
+     ;;@ ~lib/memory.ts:271:20
      (get_local $2)
     )
-    ;;@ ~lib/memory.ts:272:24
-    (i32.const 12)
+    ;;@ ~lib/memory.ts:271:24
+    (i32.const 8)
    )
-   ;;@ ~lib/memory.ts:272:28
+   ;;@ ~lib/memory.ts:271:27
    (get_local $4)
   )
+  ;;@ ~lib/memory.ts:272:2
+  (if
+   ;;@ ~lib/memory.ts:272:6
+   (i32.le_u
+    (get_local $2)
+    ;;@ ~lib/memory.ts:272:11
+    (i32.const 24)
+   )
+   ;;@ ~lib/memory.ts:272:15
+   (return)
+  )
   ;;@ ~lib/memory.ts:273:2
   (i32.store
    ;;@ ~lib/memory.ts:273:13
-   (i32.sub
-    (i32.add
-     (get_local $0)
-     ;;@ ~lib/memory.ts:273:20
-     (get_local $2)
-    )
-    ;;@ ~lib/memory.ts:273:24
-    (i32.const 8)
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:273:20
+    (i32.const 12)
    )
-   ;;@ ~lib/memory.ts:273:27
+   ;;@ ~lib/memory.ts:273:24
    (get_local $4)
   )
   ;;@ ~lib/memory.ts:274:2
-  (if
-   ;;@ ~lib/memory.ts:274:6
-   (i32.le_u
-    (get_local $2)
-    ;;@ ~lib/memory.ts:274:11
-    (i32.const 24)
+  (i32.store
+   ;;@ ~lib/memory.ts:274:13
+   (i32.add
+    (get_local $0)
+    ;;@ ~lib/memory.ts:274:20
+    (i32.const 16)
    )
-   ;;@ ~lib/memory.ts:274:15
-   (return)
+   ;;@ ~lib/memory.ts:274:24
+   (get_local $4)
   )
   ;;@ ~lib/memory.ts:275:2
   (i32.store
@@ -784,7 +805,7 @@
    (i32.add
     (get_local $0)
     ;;@ ~lib/memory.ts:275:20
-    (i32.const 12)
+    (i32.const 20)
    )
    ;;@ ~lib/memory.ts:275:24
    (get_local $4)
@@ -795,7 +816,7 @@
    (i32.add
     (get_local $0)
     ;;@ ~lib/memory.ts:276:20
-    (i32.const 16)
+    (i32.const 24)
    )
    ;;@ ~lib/memory.ts:276:24
    (get_local $4)
@@ -803,23 +824,31 @@
   ;;@ ~lib/memory.ts:277:2
   (i32.store
    ;;@ ~lib/memory.ts:277:13
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:277:20
-    (i32.const 20)
+   (i32.sub
+    (i32.add
+     (get_local $0)
+     ;;@ ~lib/memory.ts:277:20
+     (get_local $2)
+    )
+    ;;@ ~lib/memory.ts:277:24
+    (i32.const 28)
    )
-   ;;@ ~lib/memory.ts:277:24
+   ;;@ ~lib/memory.ts:277:28
    (get_local $4)
   )
   ;;@ ~lib/memory.ts:278:2
   (i32.store
    ;;@ ~lib/memory.ts:278:13
-   (i32.add
-    (get_local $0)
-    ;;@ ~lib/memory.ts:278:20
+   (i32.sub
+    (i32.add
+     (get_local $0)
+     ;;@ ~lib/memory.ts:278:20
+     (get_local $2)
+    )
+    ;;@ ~lib/memory.ts:278:24
     (i32.const 24)
    )
-   ;;@ ~lib/memory.ts:278:24
+   ;;@ ~lib/memory.ts:278:28
    (get_local $4)
   )
   ;;@ ~lib/memory.ts:279:2
@@ -832,7 +861,7 @@
      (get_local $2)
     )
     ;;@ ~lib/memory.ts:279:24
-    (i32.const 28)
+    (i32.const 20)
    )
    ;;@ ~lib/memory.ts:279:28
    (get_local $4)
@@ -847,106 +876,98 @@
      (get_local $2)
     )
     ;;@ ~lib/memory.ts:280:24
-    (i32.const 24)
+    (i32.const 16)
    )
    ;;@ ~lib/memory.ts:280:28
    (get_local $4)
   )
-  ;;@ ~lib/memory.ts:281:2
-  (i32.store
-   ;;@ ~lib/memory.ts:281:13
-   (i32.sub
-    (i32.add
-     (get_local $0)
-     ;;@ ~lib/memory.ts:281:20
-     (get_local $2)
-    )
-    ;;@ ~lib/memory.ts:281:24
-    (i32.const 20)
-   )
-   ;;@ ~lib/memory.ts:281:28
-   (get_local $4)
-  )
-  ;;@ ~lib/memory.ts:282:2
-  (i32.store
-   ;;@ ~lib/memory.ts:282:13
-   (i32.sub
-    (i32.add
-     (get_local $0)
-     ;;@ ~lib/memory.ts:282:20
-     (get_local $2)
-    )
-    ;;@ ~lib/memory.ts:282:24
-    (i32.const 16)
-   )
-   ;;@ ~lib/memory.ts:282:28
-   (get_local $4)
-  )
-  ;;@ ~lib/memory.ts:285:2
+  ;;@ ~lib/memory.ts:283:2
   (set_local $3
-   ;;@ ~lib/memory.ts:285:6
+   ;;@ ~lib/memory.ts:283:6
    (i32.add
     (i32.const 24)
-    ;;@ ~lib/memory.ts:285:11
+    ;;@ ~lib/memory.ts:283:11
     (i32.and
-     ;;@ ~lib/memory.ts:285:12
+     ;;@ ~lib/memory.ts:283:12
      (get_local $0)
-     ;;@ ~lib/memory.ts:285:19
+     ;;@ ~lib/memory.ts:283:19
      (i32.const 4)
     )
    )
   )
-  ;;@ ~lib/memory.ts:286:2
+  ;;@ ~lib/memory.ts:284:2
   (set_local $0
    (i32.add
     (get_local $0)
-    ;;@ ~lib/memory.ts:286:10
+    ;;@ ~lib/memory.ts:284:10
     (get_local $3)
    )
   )
-  ;;@ ~lib/memory.ts:287:2
+  ;;@ ~lib/memory.ts:285:2
   (set_local $2
    (i32.sub
     (get_local $2)
-    ;;@ ~lib/memory.ts:287:7
+    ;;@ ~lib/memory.ts:285:7
     (get_local $3)
    )
   )
-  ;;@ ~lib/memory.ts:290:2
+  ;;@ ~lib/memory.ts:288:2
   (set_local $5
-   ;;@ ~lib/memory.ts:290:17
+   ;;@ ~lib/memory.ts:288:17
    (i64.or
     (i64.extend_u/i32
      (get_local $4)
     )
-    ;;@ ~lib/memory.ts:290:28
+    ;;@ ~lib/memory.ts:288:28
     (i64.shl
-     ;;@ ~lib/memory.ts:290:29
+     ;;@ ~lib/memory.ts:288:29
      (i64.extend_u/i32
       (get_local $4)
      )
-     ;;@ ~lib/memory.ts:290:41
+     ;;@ ~lib/memory.ts:288:41
      (i64.const 32)
     )
    )
   )
-  ;;@ ~lib/memory.ts:291:2
+  ;;@ ~lib/memory.ts:289:2
   (block $break|0
    (loop $continue|0
     (if
-     ;;@ ~lib/memory.ts:291:9
+     ;;@ ~lib/memory.ts:289:9
      (i32.ge_u
       (get_local $2)
-      ;;@ ~lib/memory.ts:291:14
+      ;;@ ~lib/memory.ts:289:14
       (i32.const 32)
      )
      (block
       (block
+       ;;@ ~lib/memory.ts:290:4
+       (i64.store
+        ;;@ ~lib/memory.ts:290:15
+        (get_local $0)
+        ;;@ ~lib/memory.ts:290:21
+        (get_local $5)
+       )
+       ;;@ ~lib/memory.ts:291:4
+       (i64.store
+        ;;@ ~lib/memory.ts:291:15
+        (i32.add
+         (get_local $0)
+         ;;@ ~lib/memory.ts:291:22
+         (i32.const 8)
+        )
+        ;;@ ~lib/memory.ts:291:25
+        (get_local $5)
+       )
        ;;@ ~lib/memory.ts:292:4
        (i64.store
         ;;@ ~lib/memory.ts:292:15
-        (get_local $0)
-        ;;@ ~lib/memory.ts:292:21
+        (i32.add
+         (get_local $0)
+         ;;@ ~lib/memory.ts:292:22
+         (i32.const 16)
+        )
+        ;;@ ~lib/memory.ts:292:26
         (get_local $5)
        )
        ;;@ ~lib/memory.ts:293:4
@@ -955,46 +976,24 @@
         (i32.add
          (get_local $0)
          ;;@ ~lib/memory.ts:293:22
-         (i32.const 8)
+         (i32.const 24)
         )
-        ;;@ ~lib/memory.ts:293:25
+        ;;@ ~lib/memory.ts:293:26
         (get_local $5)
        )
        ;;@ ~lib/memory.ts:294:4
-       (i64.store
-        ;;@ ~lib/memory.ts:294:15
-        (i32.add
-         (get_local $0)
-         ;;@ ~lib/memory.ts:294:22
-         (i32.const 16)
-        )
-        ;;@ ~lib/memory.ts:294:26
-        (get_local $5)
-       )
-       ;;@ ~lib/memory.ts:295:4
-       (i64.store
-        ;;@ ~lib/memory.ts:295:15
-        (i32.add
-         (get_local $0)
-         ;;@ ~lib/memory.ts:295:22
-         (i32.const 24)
-        )
-        ;;@ ~lib/memory.ts:295:26
-        (get_local $5)
-       )
-       ;;@ ~lib/memory.ts:296:4
        (set_local $2
         (i32.sub
          (get_local $2)
-         ;;@ ~lib/memory.ts:296:9
+         ;;@ ~lib/memory.ts:294:9
          (i32.const 32)
         )
        )
-       ;;@ ~lib/memory.ts:297:4
+       ;;@ ~lib/memory.ts:295:4
        (set_local $0
         (i32.add
          (get_local $0)
-         ;;@ ~lib/memory.ts:297:12
+         ;;@ ~lib/memory.ts:295:12
          (i32.const 32)
         )
        )
@@ -1006,13 +1005,13 @@
   )
  )
  (func $~lib/memory/memory.fill (; 12 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
-  ;;@ ~lib/memory.ts:11:4
+  ;;@ ~lib/memory.ts:9:4
   (call $~lib/memory/memset
-   ;;@ ~lib/memory.ts:11:11
+   ;;@ ~lib/memory.ts:9:11
    (get_local $0)
-   ;;@ ~lib/memory.ts:11:17
+   ;;@ ~lib/memory.ts:9:17
    (get_local $1)
-   ;;@ ~lib/memory.ts:11:20
+   ;;@ ~lib/memory.ts:9:20
    (get_local $2)
   )
  )
@@ -1263,111 +1262,112 @@
   (local $6 i32)
   (local $7 i32)
   (local $8 f64)
-  ;;@ assembly/index.ts:90:4
+  ;;@ assembly/index.ts:88:4
   (set_local $2
+   ;;@ assembly/index.ts:88:20
+   (f64.const 0)
+  )
+  ;;@ assembly/index.ts:89:4
+  (set_local $3
+   ;;@ assembly/index.ts:89:20
+   (f64.const 0)
+  )
+  ;;@ assembly/index.ts:90:4
+  (set_local $4
    ;;@ assembly/index.ts:90:20
    (f64.const 0)
   )
   ;;@ assembly/index.ts:91:4
-  (set_local $3
-   ;;@ assembly/index.ts:91:20
-   (f64.const 0)
-  )
-  ;;@ assembly/index.ts:92:4
-  (set_local $4
-   ;;@ assembly/index.ts:92:20
-   (f64.const 0)
-  )
-  ;;@ assembly/index.ts:93:4
   (set_local $5
-   ;;@ assembly/index.ts:93:15
+   ;;@ assembly/index.ts:91:15
    (call $~lib/array/Array<Body>#get:length
     (get_local $1)
    )
   )
-  ;;@ assembly/index.ts:94:4
+  ;;@ assembly/index.ts:92:4
   (block $break|0
-   ;;@ assembly/index.ts:94:9
+   ;;@ assembly/index.ts:92:9
    (set_local $6
-    ;;@ assembly/index.ts:94:17
+    ;;@ assembly/index.ts:92:17
     (i32.const 0)
    )
    (loop $repeat|0
     (br_if $break|0
      (i32.eqz
-      ;;@ assembly/index.ts:94:20
+      ;;@ assembly/index.ts:92:20
       (i32.lt_s
        (get_local $6)
-       ;;@ assembly/index.ts:94:24
+       ;;@ assembly/index.ts:92:24
        (get_local $5)
       )
      )
     )
-    ;;@ assembly/index.ts:94:35
+    ;;@ assembly/index.ts:92:35
     (block
-     ;;@ assembly/index.ts:95:6
+     ;;@ assembly/index.ts:93:6
      (set_local $7
-      ;;@ assembly/index.ts:95:14
+      ;;@ assembly/index.ts:93:14
       (call $~lib/array/Array<Body>#__unchecked_get
-       ;;@ assembly/index.ts:95:24
+       ;;@ assembly/index.ts:93:24
        (get_local $1)
-       ;;@ assembly/index.ts:95:31
+       ;;@ assembly/index.ts:93:31
        (get_local $6)
       )
      )
-     ;;@ assembly/index.ts:96:6
+     ;;@ assembly/index.ts:94:6
      (set_local $8
-      ;;@ assembly/index.ts:96:14
+      ;;@ assembly/index.ts:94:14
       (f64.load offset=48
        (get_local $7)
       )
      )
-     ;;@ assembly/index.ts:97:6
+     ;;@ assembly/index.ts:95:6
      (set_local $2
       (f64.add
        (get_local $2)
-       ;;@ assembly/index.ts:97:12
+       ;;@ assembly/index.ts:95:12
        (f64.mul
         (f64.load offset=24
          (get_local $7)
         )
+        ;;@ assembly/index.ts:95:19
+        (get_local $8)
+       )
+      )
+     )
+     ;;@ assembly/index.ts:96:6
+     (set_local $3
+      (f64.add
+       (get_local $3)
+       ;;@ assembly/index.ts:96:12
+       (f64.mul
+        (f64.load offset=32
+         (get_local $7)
+        )
+        ;;@ assembly/index.ts:96:19
+        (get_local $8)
+       )
+      )
+     )
+     ;;@ assembly/index.ts:97:6
+     (set_local $4
+      (f64.add
+       (get_local $4)
+       ;;@ assembly/index.ts:97:12
+       (f64.mul
+        (f64.load offset=40
+         (get_local $7)
+        )
         ;;@ assembly/index.ts:97:19
         (get_local $8)
        )
       )
      )
-     ;;@ assembly/index.ts:98:6
-     (set_local $3
-      (f64.add
-       (get_local $3)
-       ;;@ assembly/index.ts:98:12
-       (f64.mul
-        (f64.load offset=32
-         (get_local $7)
-        )
-        ;;@ assembly/index.ts:98:19
-        (get_local $8)
-       )
-      )
-     )
-     ;;@ assembly/index.ts:99:6
-     (set_local $4
-      (f64.add
-       (get_local $4)
-       ;;@ assembly/index.ts:99:12
-       (f64.mul
-        (f64.load offset=40
-         (get_local $7)
-        )
-        ;;@ assembly/index.ts:99:19
-        (get_local $8)
-       )
-      )
-     )
     )
-    ;;@ assembly/index.ts:94:30
+    ;;@ assembly/index.ts:92:30
     (set_local $6
      (i32.add
+      ;;@ assembly/index.ts:92:32
       (get_local $6)
       (i32.const 1)
      )
@@ -1375,20 +1375,20 @@
     (br $repeat|0)
    )
   )
-  ;;@ assembly/index.ts:101:14
+  ;;@ assembly/index.ts:99:14
   (drop
    (call $assembly/index/Body#offsetMomentum
-    ;;@ assembly/index.ts:101:4
+    ;;@ assembly/index.ts:99:4
     (call $~lib/array/Array<Body>#__get
      (get_local $1)
-     ;;@ assembly/index.ts:101:11
+     ;;@ assembly/index.ts:99:11
      (i32.const 0)
     )
-    ;;@ assembly/index.ts:101:29
+    ;;@ assembly/index.ts:99:29
     (get_local $2)
-    ;;@ assembly/index.ts:101:33
+    ;;@ assembly/index.ts:99:33
     (get_local $3)
-    ;;@ assembly/index.ts:101:37
+    ;;@ assembly/index.ts:99:37
     (get_local $4)
    )
   )
@@ -1415,12 +1415,12 @@
  )
  (func $assembly/index/init (; 20 ;) (type $v)
   (local $0 i32)
-  ;;@ assembly/index.ts:191:2
+  ;;@ assembly/index.ts:189:2
   (set_global $assembly/index/system
-   ;;@ assembly/index.ts:191:11
+   ;;@ assembly/index.ts:189:11
    (call $assembly/index/NBodySystem#constructor
     (i32.const 0)
-    ;;@ assembly/index.ts:191:27
+    ;;@ assembly/index.ts:189:27
     (block (result i32)
      (set_local $0
       (call $~lib/array/Array<Body>#constructor
@@ -1431,31 +1431,31 @@
      (call $~lib/array/Array<Body>#__unchecked_set
       (get_local $0)
       (i32.const 0)
-      ;;@ assembly/index.ts:192:4
+      ;;@ assembly/index.ts:190:4
       (call $assembly/index/Sun)
      )
      (call $~lib/array/Array<Body>#__unchecked_set
       (get_local $0)
       (i32.const 1)
-      ;;@ assembly/index.ts:193:4
+      ;;@ assembly/index.ts:191:4
       (call $assembly/index/Jupiter)
      )
      (call $~lib/array/Array<Body>#__unchecked_set
       (get_local $0)
       (i32.const 2)
-      ;;@ assembly/index.ts:194:4
+      ;;@ assembly/index.ts:192:4
       (call $assembly/index/Saturn)
      )
      (call $~lib/array/Array<Body>#__unchecked_set
       (get_local $0)
       (i32.const 3)
-      ;;@ assembly/index.ts:195:4
+      ;;@ assembly/index.ts:193:4
       (call $assembly/index/Uranus)
      )
      (call $~lib/array/Array<Body>#__unchecked_set
       (get_local $0)
       (i32.const 4)
-      ;;@ assembly/index.ts:196:4
+      ;;@ assembly/index.ts:194:4
       (call $assembly/index/Neptune)
      )
      (get_local $0)
@@ -1463,37 +1463,7 @@
    )
   )
  )
- (func $assembly/index/getBody (; 21 ;) (type $ii) (param $0 i32) (result i32)
-  (local $1 i32)
-  ;;@ assembly/index.ts:201:2
-  (set_local $1
-   ;;@ assembly/index.ts:201:15
-   (i32.load
-    (get_global $assembly/index/system)
-   )
-  )
-  ;;@ assembly/index.ts:202:59
-  (if (result i32)
-   ;;@ assembly/index.ts:202:9
-   (i32.lt_u
-    (get_local $0)
-    ;;@ assembly/index.ts:202:22
-    (call $~lib/array/Array<Body>#get:length
-     ;;@ assembly/index.ts:202:27
-     (get_local $1)
-    )
-   )
-   ;;@ assembly/index.ts:202:43
-   (call $~lib/array/Array<Body>#__get
-    (get_local $1)
-    ;;@ assembly/index.ts:202:50
-    (get_local $0)
-   )
-   ;;@ assembly/index.ts:202:59
-   (i32.const 0)
-  )
- )
- (func $assembly/index/NBodySystem#advance (; 22 ;) (type $iFv) (param $0 i32) (param $1 f64)
+ (func $assembly/index/NBodySystem#advance (; 21 ;) (type $iFv) (param $0 i32) (param $1 f64)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -1515,194 +1485,194 @@
   (local $20 f64)
   (local $21 f64)
   (local $22 f64)
-  ;;@ assembly/index.ts:105:4
+  ;;@ assembly/index.ts:103:4
   (set_local $2
-   ;;@ assembly/index.ts:105:17
+   ;;@ assembly/index.ts:103:17
    (i32.load
     (get_local $0)
    )
   )
-  ;;@ assembly/index.ts:106:4
+  ;;@ assembly/index.ts:104:4
   (set_local $3
-   ;;@ assembly/index.ts:106:20
+   ;;@ assembly/index.ts:104:20
    (call $~lib/array/Array<Body>#get:length
     (get_local $2)
    )
   )
-  ;;@ assembly/index.ts:109:4
+  ;;@ assembly/index.ts:107:4
   (block $break|0
-   ;;@ assembly/index.ts:109:9
+   ;;@ assembly/index.ts:107:9
    (set_local $4
-    ;;@ assembly/index.ts:109:22
+    ;;@ assembly/index.ts:107:22
     (i32.const 0)
    )
    (loop $repeat|0
     (br_if $break|0
      (i32.eqz
-      ;;@ assembly/index.ts:109:25
+      ;;@ assembly/index.ts:107:25
       (i32.lt_u
        (get_local $4)
-       ;;@ assembly/index.ts:109:29
+       ;;@ assembly/index.ts:107:29
        (get_local $3)
       )
      )
     )
-    ;;@ assembly/index.ts:109:40
+    ;;@ assembly/index.ts:107:40
     (block
-     ;;@ assembly/index.ts:110:6
+     ;;@ assembly/index.ts:108:6
      (set_local $5
-      ;;@ assembly/index.ts:110:18
+      ;;@ assembly/index.ts:108:18
       (call $~lib/array/Array<Body>#__unchecked_get
-       ;;@ assembly/index.ts:110:28
+       ;;@ assembly/index.ts:108:28
        (get_local $2)
-       ;;@ assembly/index.ts:110:35
+       ;;@ assembly/index.ts:108:35
        (get_local $4)
       )
      )
-     ;;@ assembly/index.ts:113:6
+     ;;@ assembly/index.ts:111:6
      (set_local $6
-      ;;@ assembly/index.ts:113:15
+      ;;@ assembly/index.ts:111:15
       (f64.load
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:114:6
+     ;;@ assembly/index.ts:112:6
      (set_local $7
-      ;;@ assembly/index.ts:114:15
+      ;;@ assembly/index.ts:112:15
       (f64.load offset=8
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:115:6
+     ;;@ assembly/index.ts:113:6
      (set_local $8
-      ;;@ assembly/index.ts:115:15
+      ;;@ assembly/index.ts:113:15
       (f64.load offset=16
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:117:6
+     ;;@ assembly/index.ts:115:6
      (set_local $9
-      ;;@ assembly/index.ts:117:17
+      ;;@ assembly/index.ts:115:17
       (f64.load offset=24
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:118:6
+     ;;@ assembly/index.ts:116:6
      (set_local $10
-      ;;@ assembly/index.ts:118:17
+      ;;@ assembly/index.ts:116:17
       (f64.load offset=32
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:119:6
+     ;;@ assembly/index.ts:117:6
      (set_local $11
-      ;;@ assembly/index.ts:119:17
+      ;;@ assembly/index.ts:117:17
       (f64.load offset=40
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:121:6
+     ;;@ assembly/index.ts:119:6
      (set_local $12
-      ;;@ assembly/index.ts:121:19
+      ;;@ assembly/index.ts:119:19
       (f64.load offset=48
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:122:6
+     ;;@ assembly/index.ts:120:6
      (block $break|1
-      ;;@ assembly/index.ts:122:11
+      ;;@ assembly/index.ts:120:11
       (set_local $13
-       ;;@ assembly/index.ts:122:24
+       ;;@ assembly/index.ts:120:24
        (i32.add
         (get_local $4)
-        ;;@ assembly/index.ts:122:28
+        ;;@ assembly/index.ts:120:28
         (i32.const 1)
        )
       )
       (loop $repeat|1
        (br_if $break|1
         (i32.eqz
-         ;;@ assembly/index.ts:122:31
+         ;;@ assembly/index.ts:120:31
          (i32.lt_u
           (get_local $13)
-          ;;@ assembly/index.ts:122:35
+          ;;@ assembly/index.ts:120:35
           (get_local $3)
          )
         )
        )
-       ;;@ assembly/index.ts:122:46
+       ;;@ assembly/index.ts:120:46
        (block
-        ;;@ assembly/index.ts:123:8
+        ;;@ assembly/index.ts:121:8
         (set_local $14
-         ;;@ assembly/index.ts:123:20
+         ;;@ assembly/index.ts:121:20
          (call $~lib/array/Array<Body>#__unchecked_get
-          ;;@ assembly/index.ts:123:30
+          ;;@ assembly/index.ts:121:30
           (get_local $2)
-          ;;@ assembly/index.ts:123:37
+          ;;@ assembly/index.ts:121:37
           (get_local $13)
          )
         )
-        ;;@ assembly/index.ts:126:8
+        ;;@ assembly/index.ts:124:8
         (set_local $15
-         ;;@ assembly/index.ts:126:17
+         ;;@ assembly/index.ts:124:17
          (f64.sub
           (get_local $6)
-          ;;@ assembly/index.ts:126:22
+          ;;@ assembly/index.ts:124:22
           (f64.load
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:127:8
+        ;;@ assembly/index.ts:125:8
         (set_local $16
-         ;;@ assembly/index.ts:127:17
+         ;;@ assembly/index.ts:125:17
          (f64.sub
           (get_local $7)
-          ;;@ assembly/index.ts:127:22
+          ;;@ assembly/index.ts:125:22
           (f64.load offset=8
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:128:8
+        ;;@ assembly/index.ts:126:8
         (set_local $17
-         ;;@ assembly/index.ts:128:17
+         ;;@ assembly/index.ts:126:17
          (f64.sub
           (get_local $8)
-          ;;@ assembly/index.ts:128:22
+          ;;@ assembly/index.ts:126:22
           (f64.load offset=16
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:130:8
+        ;;@ assembly/index.ts:128:8
         (set_local $18
-         ;;@ assembly/index.ts:130:25
+         ;;@ assembly/index.ts:128:25
          (f64.add
           (f64.add
            (f64.mul
             (get_local $15)
-            ;;@ assembly/index.ts:130:30
+            ;;@ assembly/index.ts:128:30
             (get_local $15)
            )
-           ;;@ assembly/index.ts:130:35
+           ;;@ assembly/index.ts:128:35
            (f64.mul
             (get_local $16)
-            ;;@ assembly/index.ts:130:40
+            ;;@ assembly/index.ts:128:40
             (get_local $16)
            )
           )
-          ;;@ assembly/index.ts:130:45
+          ;;@ assembly/index.ts:128:45
           (f64.mul
            (get_local $17)
-           ;;@ assembly/index.ts:130:50
+           ;;@ assembly/index.ts:128:50
            (get_local $17)
           )
          )
         )
-        ;;@ assembly/index.ts:131:8
+        ;;@ assembly/index.ts:129:8
         (set_local $19
-         ;;@ assembly/index.ts:131:23
+         ;;@ assembly/index.ts:129:23
          (block $~lib/math/NativeMath.sqrt|inlined.0 (result f64)
           ;;@ ~lib/math.ts:1076:30
           (f64.sqrt
@@ -1711,126 +1681,126 @@
           )
          )
         )
-        ;;@ assembly/index.ts:132:8
+        ;;@ assembly/index.ts:130:8
         (set_local $20
-         ;;@ assembly/index.ts:132:18
+         ;;@ assembly/index.ts:130:18
          (f64.div
           (get_local $1)
-          ;;@ assembly/index.ts:132:23
+          ;;@ assembly/index.ts:130:23
           (f64.mul
-           ;;@ assembly/index.ts:132:24
+           ;;@ assembly/index.ts:130:24
            (get_local $18)
-           ;;@ assembly/index.ts:132:37
+           ;;@ assembly/index.ts:130:37
            (get_local $19)
           )
          )
         )
-        ;;@ assembly/index.ts:134:8
+        ;;@ assembly/index.ts:132:8
         (set_local $21
-         ;;@ assembly/index.ts:134:18
+         ;;@ assembly/index.ts:132:18
          (f64.mul
           (get_local $12)
-          ;;@ assembly/index.ts:134:27
+          ;;@ assembly/index.ts:132:27
           (get_local $20)
          )
         )
-        ;;@ assembly/index.ts:135:8
+        ;;@ assembly/index.ts:133:8
         (set_local $22
-         ;;@ assembly/index.ts:135:18
+         ;;@ assembly/index.ts:133:18
          (f64.mul
           (f64.load offset=48
            (get_local $14)
           )
-          ;;@ assembly/index.ts:135:31
+          ;;@ assembly/index.ts:133:31
           (get_local $20)
          )
         )
-        ;;@ assembly/index.ts:137:8
+        ;;@ assembly/index.ts:135:8
         (set_local $9
          (f64.sub
           (get_local $9)
-          ;;@ assembly/index.ts:137:16
+          ;;@ assembly/index.ts:135:16
           (f64.mul
            (get_local $15)
+           ;;@ assembly/index.ts:135:21
+           (get_local $22)
+          )
+         )
+        )
+        ;;@ assembly/index.ts:136:8
+        (set_local $10
+         (f64.sub
+          (get_local $10)
+          ;;@ assembly/index.ts:136:16
+          (f64.mul
+           (get_local $16)
+           ;;@ assembly/index.ts:136:21
+           (get_local $22)
+          )
+         )
+        )
+        ;;@ assembly/index.ts:137:8
+        (set_local $11
+         (f64.sub
+          (get_local $11)
+          ;;@ assembly/index.ts:137:16
+          (f64.mul
+           (get_local $17)
            ;;@ assembly/index.ts:137:21
            (get_local $22)
           )
          )
         )
-        ;;@ assembly/index.ts:138:8
-        (set_local $10
-         (f64.sub
-          (get_local $10)
-          ;;@ assembly/index.ts:138:16
-          (f64.mul
-           (get_local $16)
-           ;;@ assembly/index.ts:138:21
-           (get_local $22)
-          )
-         )
-        )
         ;;@ assembly/index.ts:139:8
-        (set_local $11
-         (f64.sub
-          (get_local $11)
-          ;;@ assembly/index.ts:139:16
-          (f64.mul
-           (get_local $17)
-           ;;@ assembly/index.ts:139:21
-           (get_local $22)
-          )
-         )
-        )
-        ;;@ assembly/index.ts:141:8
         (f64.store offset=24
          (get_local $14)
          (f64.add
           (f64.load offset=24
            (get_local $14)
           )
-          ;;@ assembly/index.ts:141:20
+          ;;@ assembly/index.ts:139:20
           (f64.mul
            (get_local $15)
-           ;;@ assembly/index.ts:141:25
+           ;;@ assembly/index.ts:139:25
            (get_local $21)
           )
          )
         )
-        ;;@ assembly/index.ts:142:8
+        ;;@ assembly/index.ts:140:8
         (f64.store offset=32
          (get_local $14)
          (f64.add
           (f64.load offset=32
            (get_local $14)
           )
-          ;;@ assembly/index.ts:142:20
+          ;;@ assembly/index.ts:140:20
           (f64.mul
            (get_local $16)
-           ;;@ assembly/index.ts:142:25
+           ;;@ assembly/index.ts:140:25
            (get_local $21)
           )
          )
         )
-        ;;@ assembly/index.ts:143:8
+        ;;@ assembly/index.ts:141:8
         (f64.store offset=40
          (get_local $14)
          (f64.add
           (f64.load offset=40
            (get_local $14)
           )
-          ;;@ assembly/index.ts:143:20
+          ;;@ assembly/index.ts:141:20
           (f64.mul
            (get_local $17)
-           ;;@ assembly/index.ts:143:25
+           ;;@ assembly/index.ts:141:25
            (get_local $21)
           )
          )
         )
        )
-       ;;@ assembly/index.ts:122:41
+       ;;@ assembly/index.ts:120:41
        (set_local $13
         (i32.add
-         ;;@ assembly/index.ts:122:43
+         ;;@ assembly/index.ts:120:43
          (get_local $13)
          (i32.const 1)
         )
@@ -1838,74 +1808,74 @@
        (br $repeat|1)
       )
      )
-     ;;@ assembly/index.ts:146:6
+     ;;@ assembly/index.ts:144:6
      (f64.store offset=24
       (get_local $5)
-      ;;@ assembly/index.ts:146:17
+      ;;@ assembly/index.ts:144:17
       (get_local $9)
      )
-     ;;@ assembly/index.ts:147:6
+     ;;@ assembly/index.ts:145:6
      (f64.store offset=32
       (get_local $5)
-      ;;@ assembly/index.ts:147:17
+      ;;@ assembly/index.ts:145:17
       (get_local $10)
      )
-     ;;@ assembly/index.ts:148:6
+     ;;@ assembly/index.ts:146:6
      (f64.store offset=40
       (get_local $5)
-      ;;@ assembly/index.ts:148:17
+      ;;@ assembly/index.ts:146:17
       (get_local $11)
      )
-     ;;@ assembly/index.ts:150:6
+     ;;@ assembly/index.ts:148:6
      (f64.store
       (get_local $5)
       (f64.add
        (f64.load
         (get_local $5)
        )
-       ;;@ assembly/index.ts:150:17
+       ;;@ assembly/index.ts:148:17
        (f64.mul
         (get_local $1)
-        ;;@ assembly/index.ts:150:22
+        ;;@ assembly/index.ts:148:22
         (get_local $9)
        )
       )
      )
-     ;;@ assembly/index.ts:151:6
+     ;;@ assembly/index.ts:149:6
      (f64.store offset=8
       (get_local $5)
       (f64.add
        (f64.load offset=8
         (get_local $5)
        )
-       ;;@ assembly/index.ts:151:17
+       ;;@ assembly/index.ts:149:17
        (f64.mul
         (get_local $1)
-        ;;@ assembly/index.ts:151:22
+        ;;@ assembly/index.ts:149:22
         (get_local $10)
        )
       )
      )
-     ;;@ assembly/index.ts:152:6
+     ;;@ assembly/index.ts:150:6
      (f64.store offset=16
       (get_local $5)
       (f64.add
        (f64.load offset=16
         (get_local $5)
        )
-       ;;@ assembly/index.ts:152:17
+       ;;@ assembly/index.ts:150:17
        (f64.mul
         (get_local $1)
-        ;;@ assembly/index.ts:152:22
+        ;;@ assembly/index.ts:150:22
         (get_local $11)
        )
       )
      )
     )
-    ;;@ assembly/index.ts:109:35
+    ;;@ assembly/index.ts:107:35
     (set_local $4
      (i32.add
-      ;;@ assembly/index.ts:109:37
+      ;;@ assembly/index.ts:107:37
       (get_local $4)
       (i32.const 1)
      )
@@ -1914,7 +1884,7 @@
    )
   )
  )
- (func $assembly/index/NBodySystem#energy (; 23 ;) (type $iF) (param $0 i32) (result f64)
+ (func $assembly/index/NBodySystem#energy (; 22 ;) (type $iF) (param $0 i32) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -1933,27 +1903,27 @@
   (local $16 f64)
   (local $17 f64)
   (local $18 f64)
-  ;;@ assembly/index.ts:157:4
+  ;;@ assembly/index.ts:155:4
   (set_local $1
-   ;;@ assembly/index.ts:157:19
+   ;;@ assembly/index.ts:155:19
    (f64.const 0)
   )
-  ;;@ assembly/index.ts:158:4
+  ;;@ assembly/index.ts:156:4
   (set_local $2
-   ;;@ assembly/index.ts:158:17
+   ;;@ assembly/index.ts:156:17
    (i32.load
     (get_local $0)
    )
   )
-  ;;@ assembly/index.ts:160:4
+  ;;@ assembly/index.ts:158:4
   (block $break|0
    (block
     (set_local $3
-     ;;@ assembly/index.ts:160:22
+     ;;@ assembly/index.ts:158:22
      (i32.const 0)
     )
     (set_local $4
-     ;;@ assembly/index.ts:160:37
+     ;;@ assembly/index.ts:158:37
      (call $~lib/array/Array<Body>#get:length
       (get_local $2)
      )
@@ -1962,203 +1932,203 @@
    (loop $repeat|0
     (br_if $break|0
      (i32.eqz
-      ;;@ assembly/index.ts:160:52
+      ;;@ assembly/index.ts:158:52
       (i32.lt_u
        (get_local $3)
-       ;;@ assembly/index.ts:160:56
+       ;;@ assembly/index.ts:158:56
        (get_local $4)
       )
      )
     )
-    ;;@ assembly/index.ts:160:67
+    ;;@ assembly/index.ts:158:67
     (block
-     ;;@ assembly/index.ts:161:6
+     ;;@ assembly/index.ts:159:6
      (set_local $5
-      ;;@ assembly/index.ts:161:18
+      ;;@ assembly/index.ts:159:18
       (call $~lib/array/Array<Body>#__unchecked_get
-       ;;@ assembly/index.ts:161:28
+       ;;@ assembly/index.ts:159:28
        (get_local $2)
-       ;;@ assembly/index.ts:161:35
+       ;;@ assembly/index.ts:159:35
        (get_local $3)
       )
      )
-     ;;@ assembly/index.ts:163:6
+     ;;@ assembly/index.ts:161:6
      (set_local $6
-      ;;@ assembly/index.ts:163:15
+      ;;@ assembly/index.ts:161:15
       (f64.load
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:164:6
+     ;;@ assembly/index.ts:162:6
      (set_local $7
-      ;;@ assembly/index.ts:164:15
+      ;;@ assembly/index.ts:162:15
       (f64.load offset=8
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:165:6
+     ;;@ assembly/index.ts:163:6
      (set_local $8
-      ;;@ assembly/index.ts:165:15
+      ;;@ assembly/index.ts:163:15
       (f64.load offset=16
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:167:6
+     ;;@ assembly/index.ts:165:6
      (set_local $9
-      ;;@ assembly/index.ts:167:15
+      ;;@ assembly/index.ts:165:15
       (f64.load offset=24
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:168:6
+     ;;@ assembly/index.ts:166:6
      (set_local $10
-      ;;@ assembly/index.ts:168:15
+      ;;@ assembly/index.ts:166:15
       (f64.load offset=32
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:169:6
+     ;;@ assembly/index.ts:167:6
      (set_local $11
-      ;;@ assembly/index.ts:169:15
+      ;;@ assembly/index.ts:167:15
       (f64.load offset=40
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:171:6
+     ;;@ assembly/index.ts:169:6
      (set_local $12
-      ;;@ assembly/index.ts:171:16
+      ;;@ assembly/index.ts:169:16
       (f64.load offset=48
        (get_local $5)
       )
      )
-     ;;@ assembly/index.ts:173:6
+     ;;@ assembly/index.ts:171:6
      (set_local $1
       (f64.add
        (get_local $1)
-       ;;@ assembly/index.ts:173:11
+       ;;@ assembly/index.ts:171:11
        (f64.mul
         (f64.mul
          (f64.const 0.5)
-         ;;@ assembly/index.ts:173:17
+         ;;@ assembly/index.ts:171:17
          (get_local $12)
         )
-        ;;@ assembly/index.ts:173:23
+        ;;@ assembly/index.ts:171:23
         (f64.add
-         ;;@ assembly/index.ts:173:24
+         ;;@ assembly/index.ts:171:24
          (f64.add
           (f64.mul
            (get_local $9)
-           ;;@ assembly/index.ts:173:29
+           ;;@ assembly/index.ts:171:29
            (get_local $9)
           )
-          ;;@ assembly/index.ts:173:34
+          ;;@ assembly/index.ts:171:34
           (f64.mul
            (get_local $10)
-           ;;@ assembly/index.ts:173:39
+           ;;@ assembly/index.ts:171:39
            (get_local $10)
           )
          )
-         ;;@ assembly/index.ts:173:44
+         ;;@ assembly/index.ts:171:44
          (f64.mul
           (get_local $11)
-          ;;@ assembly/index.ts:173:49
+          ;;@ assembly/index.ts:171:49
           (get_local $11)
          )
         )
        )
       )
      )
-     ;;@ assembly/index.ts:175:6
+     ;;@ assembly/index.ts:173:6
      (block $break|1
-      ;;@ assembly/index.ts:175:11
+      ;;@ assembly/index.ts:173:11
       (set_local $13
-       ;;@ assembly/index.ts:175:24
+       ;;@ assembly/index.ts:173:24
        (i32.add
         (get_local $3)
-        ;;@ assembly/index.ts:175:28
+        ;;@ assembly/index.ts:173:28
         (i32.const 1)
        )
       )
       (loop $repeat|1
        (br_if $break|1
         (i32.eqz
-         ;;@ assembly/index.ts:175:31
+         ;;@ assembly/index.ts:173:31
          (i32.lt_u
           (get_local $13)
-          ;;@ assembly/index.ts:175:35
+          ;;@ assembly/index.ts:173:35
           (get_local $4)
          )
         )
        )
-       ;;@ assembly/index.ts:175:46
+       ;;@ assembly/index.ts:173:46
        (block
-        ;;@ assembly/index.ts:176:8
+        ;;@ assembly/index.ts:174:8
         (set_local $14
-         ;;@ assembly/index.ts:176:20
+         ;;@ assembly/index.ts:174:20
          (call $~lib/array/Array<Body>#__unchecked_get
-          ;;@ assembly/index.ts:176:30
+          ;;@ assembly/index.ts:174:30
           (get_local $2)
-          ;;@ assembly/index.ts:176:37
+          ;;@ assembly/index.ts:174:37
           (get_local $13)
          )
         )
-        ;;@ assembly/index.ts:177:8
+        ;;@ assembly/index.ts:175:8
         (set_local $15
-         ;;@ assembly/index.ts:177:17
+         ;;@ assembly/index.ts:175:17
          (f64.sub
           (get_local $6)
-          ;;@ assembly/index.ts:177:22
+          ;;@ assembly/index.ts:175:22
           (f64.load
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:178:8
+        ;;@ assembly/index.ts:176:8
         (set_local $16
-         ;;@ assembly/index.ts:178:17
+         ;;@ assembly/index.ts:176:17
          (f64.sub
           (get_local $7)
-          ;;@ assembly/index.ts:178:22
+          ;;@ assembly/index.ts:176:22
           (f64.load offset=8
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:179:8
+        ;;@ assembly/index.ts:177:8
         (set_local $17
-         ;;@ assembly/index.ts:179:17
+         ;;@ assembly/index.ts:177:17
          (f64.sub
           (get_local $8)
-          ;;@ assembly/index.ts:179:22
+          ;;@ assembly/index.ts:177:22
           (f64.load offset=16
            (get_local $14)
           )
          )
         )
-        ;;@ assembly/index.ts:180:8
+        ;;@ assembly/index.ts:178:8
         (set_local $18
-         ;;@ assembly/index.ts:180:23
+         ;;@ assembly/index.ts:178:23
          (block $~lib/math/NativeMath.sqrt|inlined.1 (result f64)
           (set_local $18
-           ;;@ assembly/index.ts:180:40
+           ;;@ assembly/index.ts:178:40
            (f64.add
             (f64.add
              (f64.mul
               (get_local $15)
-              ;;@ assembly/index.ts:180:45
+              ;;@ assembly/index.ts:178:45
               (get_local $15)
              )
-             ;;@ assembly/index.ts:180:50
+             ;;@ assembly/index.ts:178:50
              (f64.mul
               (get_local $16)
-              ;;@ assembly/index.ts:180:55
+              ;;@ assembly/index.ts:178:55
               (get_local $16)
              )
             )
-            ;;@ assembly/index.ts:180:60
+            ;;@ assembly/index.ts:178:60
             (f64.mul
              (get_local $17)
-             ;;@ assembly/index.ts:180:65
+             ;;@ assembly/index.ts:178:65
              (get_local $17)
             )
            )
@@ -2170,29 +2140,29 @@
           )
          )
         )
-        ;;@ assembly/index.ts:181:8
+        ;;@ assembly/index.ts:179:8
         (set_local $1
          (f64.sub
           (get_local $1)
-          ;;@ assembly/index.ts:181:13
+          ;;@ assembly/index.ts:179:13
           (f64.div
            (f64.mul
             (get_local $12)
-            ;;@ assembly/index.ts:181:19
+            ;;@ assembly/index.ts:179:19
             (f64.load offset=48
              (get_local $14)
             )
            )
-           ;;@ assembly/index.ts:181:32
+           ;;@ assembly/index.ts:179:32
            (get_local $18)
           )
          )
         )
        )
-       ;;@ assembly/index.ts:175:41
+       ;;@ assembly/index.ts:173:41
        (set_local $13
         (i32.add
-         ;;@ assembly/index.ts:175:43
+         ;;@ assembly/index.ts:173:43
          (get_local $13)
          (i32.const 1)
         )
@@ -2201,10 +2171,10 @@
       )
      )
     )
-    ;;@ assembly/index.ts:160:62
+    ;;@ assembly/index.ts:158:62
     (set_local $3
      (i32.add
-      ;;@ assembly/index.ts:160:64
+      ;;@ assembly/index.ts:158:64
       (get_local $3)
       (i32.const 1)
      )
@@ -2212,53 +2182,54 @@
     (br $repeat|0)
    )
   )
-  ;;@ assembly/index.ts:184:11
+  ;;@ assembly/index.ts:182:11
   (get_local $1)
  )
- (func $assembly/index/step (; 24 ;) (type $F) (result f64)
-  ;;@ assembly/index.ts:206:9
+ (func $assembly/index/step (; 23 ;) (type $F) (result f64)
+  ;;@ assembly/index.ts:199:9
   (call $assembly/index/NBodySystem#advance
-   ;;@ assembly/index.ts:206:2
+   ;;@ assembly/index.ts:199:2
    (get_global $assembly/index/system)
-   ;;@ assembly/index.ts:206:17
+   ;;@ assembly/index.ts:199:17
    (f64.const 0.01)
   )
-  ;;@ assembly/index.ts:207:23
+  ;;@ assembly/index.ts:200:23
   (call $assembly/index/NBodySystem#energy
-   ;;@ assembly/index.ts:207:9
+   ;;@ assembly/index.ts:200:9
    (get_global $assembly/index/system)
   )
  )
- (func $assembly/index/bench (; 25 ;) (type $iv) (param $0 i32)
+ (func $assembly/index/bench (; 24 ;) (type $iv) (param $0 i32)
   (local $1 i32)
-  ;;@ assembly/index.ts:211:2
+  ;;@ assembly/index.ts:204:2
   (block $break|0
-   ;;@ assembly/index.ts:211:7
+   ;;@ assembly/index.ts:204:7
    (set_local $1
-    ;;@ assembly/index.ts:211:20
+    ;;@ assembly/index.ts:204:20
     (i32.const 0)
    )
    (loop $repeat|0
     (br_if $break|0
      (i32.eqz
-      ;;@ assembly/index.ts:211:23
+      ;;@ assembly/index.ts:204:23
       (i32.lt_u
        (get_local $1)
-       ;;@ assembly/index.ts:211:27
+       ;;@ assembly/index.ts:204:27
        (get_local $0)
       )
      )
     )
-    ;;@ assembly/index.ts:211:46
+    ;;@ assembly/index.ts:204:46
     (call $assembly/index/NBodySystem#advance
-     ;;@ assembly/index.ts:211:39
+     ;;@ assembly/index.ts:204:39
      (get_global $assembly/index/system)
-     ;;@ assembly/index.ts:211:54
+     ;;@ assembly/index.ts:204:54
      (f64.const 0.01)
     )
-    ;;@ assembly/index.ts:211:34
+    ;;@ assembly/index.ts:204:34
     (set_local $1
      (i32.add
+      ;;@ assembly/index.ts:204:36
       (get_local $1)
       (i32.const 1)
      )
@@ -2267,7 +2238,7 @@
    )
   )
  )
- (func $start (; 26 ;) (type $v)
+ (func $start (; 25 ;) (type $v)
   (set_global $~lib/allocator/arena/startOffset
    ;;@ ~lib/allocator/arena.ts:12:25
    (i32.and
diff --git a/examples/n-body/package.json b/examples/n-body/package.json
index fece7a1c..b52d65c9 100644
--- a/examples/n-body/package.json
+++ b/examples/n-body/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "asbuild:untouched": "asc assembly/index.ts -b build/untouched.wasm -t build/untouched.wat --sourceMap --validate",
-    "asbuild:optimized": "asc assembly/index.ts -b build/optimized.wasm -t build/optimized.wat -O3 --validate --noDebug --noAssert",
+    "asbuild:untouched": "asc assembly/index.ts -b build/untouched.wasm -t build/untouched.wat --sourceMap --validate --importMemory",
+    "asbuild:optimized": "asc assembly/index.ts -b build/optimized.wasm -t build/optimized.wat -O3 --validate --noDebug --noAssert --importMemory",
     "asbuild:asmjs": "asc assembly/index.ts -a build/index.asm.js -O3 --validate --noDebug --noAssert",
     "asbuild": "npm run asbuild:untouched && npm run asbuild:optimized && npm run asbuild:asmjs",
     "tsbuild": "tsc -p assembly -t ES2017 -m commonjs --outDir build",
diff --git a/examples/n-body/rust/Cargo.toml b/examples/n-body/rust/Cargo.toml
index cb353311..643c7e17 100644
--- a/examples/n-body/rust/Cargo.toml
+++ b/examples/n-body/rust/Cargo.toml
@@ -9,4 +9,4 @@ crate-type = ["cdylib"]
 
 [profile.release]
 lto = true
-opt-level = 's'
+opt-level = 3
diff --git a/examples/n-body/rust/index.js b/examples/n-body/rust/index.js
index 4195684c..5686c0ef 100644
--- a/examples/n-body/rust/index.js
+++ b/examples/n-body/rust/index.js
@@ -7,6 +7,7 @@ const compiled = new WebAssembly.Module(
 
 const imports = {
   env: {
+    memory: new WebAssembly.Memory({ initial: 17 }),
     abort: (filename, line, column) => {
       throw Error("abort called at " + line + ":" + colum);
     }
diff --git a/examples/n-body/rust/src/lib.rs b/examples/n-body/rust/src/lib.rs
index 018ca9e7..077b8d7a 100644
--- a/examples/n-body/rust/src/lib.rs
+++ b/examples/n-body/rust/src/lib.rs
@@ -1,22 +1,20 @@
 // Code adopted from https://benchmarksgame-team.pages.debian.net/benchmarksgame/program/nbody-rust-1.html
 
-#![feature(core_intrinsics, lang_items)]
+#![feature(core_intrinsics, panic_implementation)]
 #![no_std]
 
-#[lang = "panic_fmt"]
-extern "C" fn panic_fmt(_args: ::core::fmt::Arguments, _file: &'static str, _line: u32) -> ! {
-  use core::intrinsics;
-  unsafe {
-    intrinsics::abort();
-  }
+use core::intrinsics;
+use core::panic::PanicInfo;
+
+#[panic_implementation]
+#[no_mangle]
+pub fn panic(_info: &PanicInfo) -> ! {
+  unsafe { intrinsics::abort() }
 }
 
 #[inline(always)]
 fn sqrt(x: f64) -> f64 {
-  use core::intrinsics;
-  unsafe {
-    intrinsics::sqrtf64(x)
-  }
+  unsafe { intrinsics::sqrtf64(x) }
 }
 
 const PI: f64         = 3.141592653589793;
diff --git a/examples/n-body/tests/index.js b/examples/n-body/tests/index.js
index fa3e4cdd..9a7cebbf 100644
--- a/examples/n-body/tests/index.js
+++ b/examples/n-body/tests/index.js
@@ -41,38 +41,39 @@ function test(nbody, steps) {
 }
 
 var steps = process.argv.length > 2 ? parseInt(process.argv[2], 10) : 20000000;
-var time;
 
-console.log("Performing " + steps + " steps (AssemblyScript WASM) ...");
-time = test(nbodyAS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+function prologue(name, steps) {
+  console.log("Performing " + steps + " steps (" + name + ") ...");
+}
 
-console.log("Performing " + steps + " steps (AssemblyScript ASMJS) ...");
-time = test(nbodyAsmJS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+function epilogue(time) {
+  console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+}
 
-console.log("Performing " + steps + " steps (JS) ...");
-time = test(nbodyJS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+console.log("\nCOLD SERIES:\n");
 
-console.log("Performing " + steps + " steps (Rust WASM) ...");
-time = test(nbodyRS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+prologue("AssemblyScript WASM", steps);
+epilogue(test(nbodyAS, steps));
 
-console.log("\nWARMED UP:\n");
+prologue("AssemblyScript ASMJS", steps);
+epilogue(test(nbodyAsmJS, steps));
 
-console.log("Performing " + steps + " steps (AssemblyScript WASM) ...");
-time = test(nbodyAS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+prologue("JS", steps);
+epilogue(test(nbodyJS, steps));
 
-console.log("Performing " + steps + " steps (AssemblyScript ASMJS) ...");
-time = test(nbodyAsmJS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+prologue("Rust WASM", steps);
+epilogue(test(nbodyRS, steps));
 
-console.log("Performing " + steps + " steps (JS) ...");
-time = test(nbodyJS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+console.log("\nWARMED UP SERIES:\n");
 
-console.log("Performing " + steps + " steps (Rust WASM) ...");
-time = test(nbodyRS, steps);
-console.log("Took " + (time[0] * 1e3 + time[1] / 1e6) + "ms");
+prologue("AssemblyScript WASM", steps);
+epilogue(test(nbodyAS, steps));
+
+prologue("AssemblyScript ASMJS", steps);
+epilogue(test(nbodyAsmJS, steps));
+
+prologue("JS", steps);
+epilogue(test(nbodyJS, steps));
+
+prologue("Rust WASM", steps);
+epilogue(test(nbodyRS, steps));