src/bindings/js.ts

@@ -13,6 +13,11 @@ import {
   CommonFlags
 } from "../common";
 
+import {
+  runtimeFunctions,
+  runtimeGlobals
+} from "../compiler";
+
 import {
   ElementKind,
   Element,
@@ -945,19 +950,31 @@ export class JSBuilder extends ExportsWalker {
     assert(this.indentLevel == 0);
 
     if (this.esm) {
-      sb.push("export const {\n  ");
+      sb.push("export const {\n");
       if (this.program.options.exportMemory) {
-        sb.push("memory,\n  ");
+        sb.push("  memory,\n");
       }
       if (this.program.options.exportTable) {
-        sb.push("table,\n  ");
+        sb.push("  table,\n");
+      }
+      if (this.program.options.exportRuntime) {
+        for (let i = 0, k = runtimeFunctions.length; i < k; ++i) {
+          sb.push("  ");
+          sb.push(runtimeFunctions[i]);
+          sb.push(",\n");
+        }
+        for (let i = 0, k = runtimeGlobals.length; i < k; ++i) {
+          sb.push("  ");
+          sb.push(runtimeGlobals[i]);
+          sb.push(",\n");
+        }
       }
       for (let i = 0, k = exports.length; i < k; ++i) {
-        if (i > 0) sb.push(",\n  ");
+        sb.push("  ");
         sb.push(exports[i]);
+        sb.push(",\n");
       }
-      sb.push(`
-} = await (async url => instantiate(
+      sb.push(`} = await (async url => instantiate(
   await (async () => {
     try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }
     catch { return globalThis.WebAssembly.compile(await (await import("node:fs/promises")).readFile(url)); }

src/bindings/tsd.ts

@@ -198,6 +198,20 @@ export class TSDBuilder extends ExportsWalker {
       indent(sb, this.indentLevel);
       sb.push(`export ${this.esm ? "declare " : ""}const table: WebAssembly.Table;\n`);
     }
+    if (this.program.options.exportRuntime) {
+      indent(sb, this.indentLevel);
+      sb.push("// Exported runtime interface\n");
+      indent(sb, this.indentLevel);
+      sb.push(`export ${this.esm ? "declare " : ""}function __new(size: number, id: number): number;\n`);
+      indent(sb, this.indentLevel);
+      sb.push(`export ${this.esm ? "declare " : ""}function __pin(ptr: number): number;\n`);
+      indent(sb, this.indentLevel);
+      sb.push(`export ${this.esm ? "declare " : ""}function __unpin(ptr: number): void;\n`);
+      indent(sb, this.indentLevel);
+      sb.push(`export ${this.esm ? "declare " : ""}function __collect(): void;\n`);
+      indent(sb, this.indentLevel);
+      sb.push(`export ${this.esm ? "declare " : ""}const __rtti_base: number;\n`);
+    }
     this.walk();
     if (!this.esm) {
       --this.indentLevel;

src/compiler.ts

@@ -418,9 +418,9 @@ export namespace ExportNames {
 }
 
 /** Functions to export if `--exportRuntime` is set. */
-const runtimeFunctions = [ "__new", "__pin", "__unpin", "__collect" ];
+export const runtimeFunctions = [ "__new", "__pin", "__unpin", "__collect" ];
 /** Globals to export if `--exportRuntime` is set. */
-const runtimeGlobals = [ "__rtti_base" ];
+export const runtimeGlobals = [ "__rtti_base" ];
 
 /** Compiler interface. */
 export class Compiler extends DiagnosticEmitter {

std/assembly/rt/tlsf.ts

@@ -373,8 +373,9 @@ function prepareBlock(root: Root, block: Block, size: usize): void {
 }
 
 /** Adds more memory to the pool. */
-function addMemory(root: Root, start: usize, end: usize): bool {
-  if (DEBUG) assert(start <= end); // must be valid
+function addMemory(root: Root, start: usize, endU64: u64): bool {
+  let end = <usize>endU64;
+  if (DEBUG) assert(<u64>start <= endU64); // must be valid
   start = ((start + BLOCK_OVERHEAD + AL_MASK) & ~AL_MASK) - BLOCK_OVERHEAD;
   end &= ~AL_MASK;
 
@@ -442,7 +443,7 @@ function growMemory(root: Root, size: usize): void {
     if (memory.grow(pagesNeeded) < 0) unreachable();
   }
   let pagesAfter = memory.size();
-  addMemory(root, <usize>pagesBefore << 16, <usize>pagesAfter << 16);
+  addMemory(root, <usize>pagesBefore << 16, <u64>pagesAfter << 16);
 }
 
 /** Computes the size (excl. header) of a block. */
@@ -477,11 +478,11 @@ function initialize(): void {
   }
   let memStart = rootOffset + ROOT_SIZE;
   if (ASC_LOW_MEMORY_LIMIT) {
-    const memEnd = <usize>ASC_LOW_MEMORY_LIMIT & ~AL_MASK;
+    const memEnd = <u64>ASC_LOW_MEMORY_LIMIT & ~AL_MASK;
     if (memStart <= memEnd) addMemory(root, memStart, memEnd);
     else unreachable(); // low memory limit already exceeded
   } else {
-    addMemory(root, memStart, memory.size() << 16);
+    addMemory(root, memStart, <u64>memory.size() << 16);
   }
   ROOT = root;
 }

tests/compiler/bindings/esm.debug.d.ts

@@ -1,5 +1,11 @@
 /** Exported memory */
 export declare const memory: WebAssembly.Memory;
+// Exported runtime interface
+export declare function __new(size: number, id: number): number;
+export declare function __pin(ptr: number): number;
+export declare function __unpin(ptr: number): void;
+export declare function __collect(): void;
+export declare const __rtti_base: number;
 /** bindings/esm/plainGlobal */
 export declare const plainGlobal: {
   /** @type `i32` */

tests/compiler/bindings/esm.debug.js

@@ -18,10 +18,10 @@ async function instantiate(module, imports = {}) {
         // ~lib/bindings/dom/Math.E: f64
         Math.E
       ),
-      "Math.log": (
+      "Math.log"(x) {
         // ~lib/bindings/dom/Math.log(f64) => f64
-        Math.log
-      ),
+        return Math.log(x);
+      },
       "globalThis.globalThis": (
         // bindings/esm/immutableGlobalNested: ref_extern | null}
         globalThis.globalThis
@@ -522,6 +522,11 @@ async function instantiate(module, imports = {}) {
 }
 export const {
   memory,
+  __new,
+  __pin,
+  __unpin,
+  __collect,
+  __rtti_base,
   plainGlobal,
   plainMutableGlobal,
   stringGlobal,
@@ -545,7 +550,7 @@ export const {
   newInternref,
   internrefFunction,
   functionFunction,
-  fn
+  fn,
 } = await (async url => instantiate(
   await (async () => {
     try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }

tests/compiler/bindings/esm.debug.wat

@@ -7,14 +7,15 @@
  (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
- (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $i32_i64_=>_none (func (param i32 i64)))
  (type $i32_i32_f64_f64_f64_f64_f64_=>_none (func (param i32 i32 f64 f64 f64 f64 f64)))
  (type $f64_=>_f64 (func (param f64) (result f64)))
  (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
  (type $none_=>_i64 (func (result i64)))
+ (type $i32_i32_i64_=>_i32 (func (param i32 i32 i64) (result i32)))
  (type $i32_f32_=>_none (func (param i32 f32)))
  (type $i32_f64_=>_none (func (param i32 f64)))
+ (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $i32_i32_i64_=>_none (func (param i32 i32 i64)))
  (type $i32_i32_=>_f32 (func (param i32 i32) (result f32)))
  (import "env" "Math.E" (global $~lib/bindings/dom/Math.E f64))
@@ -1123,25 +1124,30 @@
   local.get $slMap
   i32.store $0 offset=4
  )
- (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $end i32) (result i32)
-  (local $root|3 i32)
+ (func $~lib/rt/tlsf/addMemory (param $root i32) (param $start i32) (param $endU64 i64) (result i32)
+  (local $end i32)
+  (local $root|4 i32)
   (local $tail i32)
   (local $tailInfo i32)
   (local $size i32)
   (local $leftSize i32)
   (local $left i32)
-  (local $root|9 i32)
-  (local $tail|10 i32)
+  (local $root|10 i32)
+  (local $tail|11 i32)
+  local.get $endU64
+  i32.wrap_i64
+  local.set $end
   i32.const 1
   drop
   local.get $start
-  local.get $end
-  i32.le_u
+  i64.extend_i32_u
+  local.get $endU64
+  i64.le_u
   i32.eqz
   if
    i32.const 0
    i32.const 672
-   i32.const 377
+   i32.const 378
    i32.const 14
    call $~lib/builtins/abort
    unreachable
@@ -1166,8 +1172,8 @@
   local.set $end
   block $~lib/rt/tlsf/GETTAIL|inlined.0 (result i32)
    local.get $root
-   local.set $root|3
-   local.get $root|3
+   local.set $root|4
+   local.get $root|4
    i32.load $0 offset=1568
    br $~lib/rt/tlsf/GETTAIL|inlined.0
   end
@@ -1187,7 +1193,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 384
+    i32.const 385
     i32.const 16
     call $~lib/builtins/abort
     unreachable
@@ -1220,7 +1226,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 397
+    i32.const 398
     i32.const 5
     call $~lib/builtins/abort
     unreachable
@@ -1276,11 +1282,11 @@
   i32.or
   call $~lib/rt/common/BLOCK#set:mmInfo
   local.get $root
-  local.set $root|9
+  local.set $root|10
   local.get $tail
-  local.set $tail|10
-  local.get $root|9
-  local.get $tail|10
+  local.set $tail|11
+  local.get $root|10
+  local.get $tail|11
   i32.store $0 offset=1568
   local.get $root
   local.get $left
@@ -1426,8 +1432,9 @@
   local.get $root
   local.get $memStart
   memory.size $0
-  i32.const 16
-  i32.shl
+  i64.extend_i32_s
+  i64.const 16
+  i64.shl
   call $~lib/rt/tlsf/addMemory
   drop
   local.get $root
@@ -1463,7 +1470,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 559
+   i32.const 560
    i32.const 3
    call $~lib/builtins/abort
    unreachable
@@ -1792,7 +1799,7 @@
   if
    i32.const 336
    i32.const 672
-   i32.const 458
+   i32.const 459
    i32.const 29
    call $~lib/builtins/abort
    unreachable
@@ -2094,8 +2101,9 @@
   i32.const 16
   i32.shl
   local.get $pagesAfter
-  i32.const 16
-  i32.shl
+  i64.extend_i32_s
+  i64.const 16
+  i64.shl
   call $~lib/rt/tlsf/addMemory
   drop
  )
@@ -2235,7 +2243,7 @@
    if
     i32.const 0
     i32.const 672
-    i32.const 496
+    i32.const 497
     i32.const 16
     call $~lib/builtins/abort
     unreachable
@@ -2255,7 +2263,7 @@
   if
    i32.const 0
    i32.const 672
-   i32.const 498
+   i32.const 499
    i32.const 14
    call $~lib/builtins/abort
    unreachable

tests/compiler/bindings/esm.json

@@ -1,7 +1,8 @@
 {
   "asc_flags": [
     "--exportStart _start",
-    "--bindings esm"
+    "--bindings esm",
+    "--exportRuntime"
   ],
   "features": [
     "reference-types"

tests/compiler/bindings/esm.release.d.ts

@@ -1,5 +1,11 @@
 /** Exported memory */
 export declare const memory: WebAssembly.Memory;
+// Exported runtime interface
+export declare function __new(size: number, id: number): number;
+export declare function __pin(ptr: number): number;
+export declare function __unpin(ptr: number): void;
+export declare function __collect(): void;
+export declare const __rtti_base: number;
 /** bindings/esm/plainGlobal */
 export declare const plainGlobal: {
   /** @type `i32` */

tests/compiler/bindings/esm.release.js

@@ -18,12 +18,12 @@ async function instantiate(module, imports = {}) {
         // ~lib/bindings/dom/Math.E: f64
         Math.E
       ),
-      "Math.log": (
+      "Math.log"(x) {
         // ~lib/bindings/dom/Math.log(f64) => f64
-        Math.log
-      ),
+        return Math.log(x);
+      },
       "globalThis.globalThis": (
-        // bindings/esm/immutableGlobalNested: externref
+        // bindings/esm/immutableGlobalNested: ref_extern | null}
         globalThis.globalThis
       ),
       "Date.getTimezoneOffset"() {
@@ -522,6 +522,11 @@ async function instantiate(module, imports = {}) {
 }
 export const {
   memory,
+  __new,
+  __pin,
+  __unpin,
+  __collect,
+  __rtti_base,
   plainGlobal,
   plainMutableGlobal,
   stringGlobal,
@@ -545,7 +550,7 @@ export const {
   newInternref,
   internrefFunction,
   functionFunction,
-  fn
+  fn,
 } = await (async url => instantiate(
   await (async () => {
     try { return await globalThis.WebAssembly.compileStreaming(globalThis.fetch(url)); }