Merge develop to release for rc

build.zig

@@ -363,6 +363,11 @@ fn buildBinary(
         .optimize = optimize,
     });
 
+    const wasm3 = b.dependency("wasm3", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
     //
     // Build Artifact
     //
@@ -418,6 +423,7 @@ fn buildBinary(
     urbit.linkLibrary(sigsegv.artifact("sigsegv"));
     urbit.linkLibrary(urcrypt.artifact("urcrypt"));
     urbit.linkLibrary(whereami.artifact("whereami"));
+    urbit.linkLibrary(wasm3.artifact("wasm3"));
 
     if (t.isDarwin()) {
         // Requires llvm@18 homebrew installation

build.zig.zon

@@ -56,6 +56,9 @@
             .url = "https://github.com/allyourcodebase/zlib/archive/0918e87b7629b9c6a50a08edd0ce30d849758faf.tar.gz",
             .hash = "122034ab2a12adf8016ffa76e48b4be3245ffd305193edba4d83058adbcfa749c107",
         },
+        .wasm3 = .{
+            .path = "./ext/wasm3",
+        },
     },
     .paths = .{
         "",

ext/wasm3/build.zig

@@ -0,0 +1,87 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+    const t = target.result;
+
+    const softfloat = b.dependency("softfloat", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
+    const wasm3_c = b.dependency("wasm3", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
+    const wasm3 = b.addStaticLibrary(.{
+        .name = "wasm3",
+        .target = target,
+        .optimize = optimize,
+    });
+
+    wasm3.linkLibC();
+
+    wasm3.addIncludePath(wasm3_c.path("source/"));
+
+    const common_flags = [_][]const u8{
+        "-std=c99",
+        "-Wall",
+        "-Wextra",
+        "-Wparentheses",
+        "-Wundef",
+        "-Wpointer-arith",
+        "-Wstrict-aliasing=2",
+        "-Werror=implicit-function-declaration",
+        "-fno-sanitize=all",
+        // "-fsanitize=undefined",
+        // "-fno-sanitize-trap=undefined",
+    };
+
+    const mac_flags = common_flags ++ [_][]const u8{
+        "-fPIC",
+        "-c",
+    };
+
+    wasm3.addCSourceFiles(.{
+        .root = wasm3_c.path("source/"),
+        .files = &.{
+          "m3_bind.c",
+          "m3_code.c",
+          "m3_compile.c",
+          "m3_core.c",
+          "m3_emit.c",
+          "m3_env.c",
+          "m3_exec.c",
+          "m3_function.c",
+          "m3_info.c",
+          "m3_module.c",
+          "m3_parse.c",
+          "m3_validate.c",
+        },
+        .flags = if (t.os.tag == .macos) &mac_flags else &common_flags,
+    });
+
+    wasm3.installHeader(wasm3_c.path("source/m3_config_platforms.h"), "m3_config_platforms.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_bind.h"), "m3_bind.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_code.h"), "m3_code.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_compile.h"), "m3_compile.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_config.h"), "m3_config.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_core.h"), "m3_core.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_emit.h"), "m3_emit.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_env.h"), "m3_env.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_exception.h"), "m3_exception.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_exec.h"), "m3_exec.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_exec_defs.h"), "m3_exec_defs.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_function.h"), "m3_function.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_info.h"), "m3_info.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_math_utils.h"), "m3_math_utils.h");
+    wasm3.installHeader(wasm3_c.path("source/wasm3.h"), "wasm3.h");
+    wasm3.installHeader(wasm3_c.path("source/wasm3_defs.h"), "wasm3_defs.h");
+    wasm3.installHeader(wasm3_c.path("source/m3_validate.h"), "m3_validate.h");
+
+    wasm3.linkLibrary(softfloat.artifact("softfloat"));
+
+    b.installArtifact(wasm3);
+}

ext/wasm3/build.zig.zon

@@ -0,0 +1,17 @@
+.{
+    .name = "wasm3",
+    .version = "0.0.1",
+    .dependencies = .{
+        .softfloat = .{
+            .path = "../softfloat",
+        },
+        .wasm3 = .{
+            // .path = "../../../../wasm3"
+            .url = "https://github.com/urbit/wasm3/archive/5b74cbca01793cda71ebf707b0587616c32cc88c.tar.gz",
+            .hash = "12200fb06246d1956d73684cddbf84e819e4a0d7b1817bf5934b836466d194e3c60d",
+        },
+    },
+    .paths = .{
+        "",
+    },
+}

pkg/c3/motes.h

@@ -402,6 +402,8 @@
 #   define c3__exit   c3_s4('e','x','i','t')
 #   define c3__eyre   c3_s4('e','y','r','e')
 #   define c3__f      c3_s1('f')
+#   define c3__f32    c3_s3('f','3','2')
+#   define c3__f64    c3_s3('f','6','4')
 #   define c3__fx     c3_s2('f','x')
 #   define c3__fab    c3_s3('f','a','b')
 #   define c3__face   c3_s4('f','a','c','e')
@@ -596,6 +598,8 @@
 #   define c3__hxtr   c3_s4('h','x','t','r')
 #   define c3__hxts   c3_s4('h','x','t','s')
 #   define c3__i      c3_s1('i')
+#   define c3__i32    c3_s3('i','3','2')
+#   define c3__i64    c3_s3('i','6','4')
 #   define c3__ic     c3_s2('i','c')
 #   define c3__ice    c3_s3('i','c','e')
 #   define c3__iced   c3_s4('i','c','e','d')

pkg/noun/build.zig

@@ -104,6 +104,11 @@ pub fn build(b: *std.Build) !void {
         .optimize = optimize,
     });
 
+    const wasm3 = b.dependency("wasm3", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
     pkg_noun.linkLibC();
 
     pkg_noun.linkLibrary(pkg_c3.artifact("c3"));
@@ -123,6 +128,7 @@ pub fn build(b: *std.Build) !void {
     pkg_noun.linkLibrary(urcrypt.artifact("urcrypt"));
     pkg_noun.linkLibrary(whereami.artifact("whereami"));
     pkg_noun.linkLibrary(zlib.artifact("z"));
+    pkg_noun.linkLibrary(wasm3.artifact("wasm3"));
 
     pkg_noun.addIncludePath(b.path(""));
     if (t.os.tag.isDarwin())
@@ -229,6 +235,7 @@ const c_source_files = [_][]const u8{
     "jets/c/rig.c",
     "jets/c/rip.c",
     "jets/c/rsh.c",
+    "jets/c/sew.c",
     "jets/c/sqt.c",
     "jets/c/swp.c",
     "jets/c/xeb.c",
@@ -315,6 +322,7 @@ const c_source_files = [_][]const u8{
     "jets/e/slaw.c",
     "jets/e/tape.c",
     "jets/e/trip.c",
+    "jets/e/urwasm.c",
     "jets/f/cell.c",
     "jets/f/comb.c",
     "jets/f/cons.c",

pkg/noun/build.zig.zon

@@ -53,6 +53,9 @@
             .url = "https://github.com/allyourcodebase/zlib/archive/0918e87b7629b9c6a50a08edd0ce30d849758faf.tar.gz",
             .hash = "122034ab2a12adf8016ffa76e48b4be3245ffd305193edba4d83058adbcfa749c107",
         },
+        .wasm3 = .{
+            .path = "../../ext/wasm3",
+        },
     },
     .paths = .{
         "",

pkg/noun/jets/137/tree.c

@@ -874,6 +874,56 @@ static u3j_core _137_non_d[] =
   };
 
 
+static u3j_harm _137_hex_lia_run_a[] = {{".2", u3we_lia_run, c3y}, {}};
+
+static u3j_harm _137_hex_lia_run_once_inner_a[] = {{".2", u3we_lia_run_once, c3y}, {}};
+
+static u3j_core _137_hex_lia_run_once_d[] = {
+  { "run-once-inner-v0", 15, _137_hex_lia_run_once_inner_a, 0, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_lia_monad_d[] = {
+  { "run-v0", 7, _137_hex_lia_run_a, 0, no_hashes },
+  { "run-once-v0", 7, 0, _137_hex_lia_run_once_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_engine_d[] = {
+  { "monad-v0", 3, 0, _137_hex_lia_monad_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_op_def_d[] = {
+  { "wasm-engine-v0", 3, 0, _137_hex_wasm_engine_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_validator_d[] = {
+  { "wasm-op-def-v0", 3, 0, _137_hex_wasm_op_def_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_parser_d[] = {
+  { "validator-v0", 3, 0, _137_hex_wasm_validator_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_lia_sur_d[] = {
+  { "wasm-parser-v0", 3, 0, _137_hex_wasm_parser_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_engine_sur_d[] = {
+  { "monad-sur-v0", 3, 0, _137_hex_lia_sur_d, no_hashes },
+  {}
+};
+
+static u3j_core _137_hex_wasm_sur_d[] = {
+  { "engine-sur-v0", 3, 0, _137_hex_wasm_engine_sur_d, no_hashes },
+  {}
+};
+
 static u3j_core _137_hex_d[] =
   { { "non", 7, 0, _137_non_d, no_hashes },
 
@@ -900,6 +950,7 @@ static u3j_core _137_hex_d[] =
     { "secp",    6, 0, _137_hex_secp_d,   no_hashes },
     { "mimes",  31, 0, _137_hex_mimes_d,  no_hashes },
     { "json",   31, 0, _137_hex_json_d,   no_hashes },
+    { "wasm-sur-v0", 3, 0, _137_hex_wasm_sur_d, no_hashes },
     {}
   };
 
@@ -1033,6 +1084,7 @@ static u3j_core _137_two__in_d[] =
 static u3j_harm _137_two_rig_a[] = {{".2", u3wc_rig, c3n}, {}};
 
 static u3j_harm _137_two_mate_a[] = {{".2", u3wb_mate, c3y}, {}};
+static u3j_harm _137_two_sew_a[]  = {{".2", u3wc_sew, c3y}, {}};
 
 static u3j_core _137_two_d[] =
   { { "tri", 3, 0, _137_tri_d, no_hashes, _137_tri_ho },
@@ -1091,6 +1143,7 @@ static u3j_core _137_two_d[] =
     { "swp",  7, _137_two_swp_a, 0, no_hashes },
     { "rub",  7, _137_two_rub_a, 0, no_hashes },
     { "pow",  7, _137_two_pow_a, 0, no_hashes },
+    { "sew",  7, _137_two_sew_a, 0, no_hashes },
     { "sqt",  7, _137_two_sqt_a, 0, no_hashes },
     { "xeb",  7, _137_two_xeb_a, 0, no_hashes },
 

pkg/noun/jets/c/bex.c

@@ -34,7 +34,7 @@ u3qc_bex(u3_atom a)
 
   u3i_slab_init(&sab_u, 0, a_d + 1);
 
-  sab_u.buf_w[a_d >> 5] = 1 << (a_d & 31);
+  sab_u.buf_w[a_d >> 5] = (c3_d)1 << (a_d & 31);
 
   return u3i_slab_moot(&sab_u);
 }

pkg/noun/jets/c/sew.c

@@ -0,0 +1,74 @@
+/// @file
+
+#include "jets/q.h"
+#include "jets/w.h"
+
+#include "noun.h"
+
+u3_weak
+u3qc_sew(u3_atom a,
+         u3_atom b,
+         u3_atom c,
+         u3_atom d,
+         u3_atom e
+        )
+{
+  if (0 == c) return u3k(e);
+  if ( !_(u3a_is_cat(b)) ||
+       !_(u3a_is_cat(c)) ) {
+    return u3_none;
+  }
+  if ( !_(u3a_is_cat(a)) || (a >= 32) ) {
+    return u3m_bail(c3__fail);
+  }
+
+  c3_g a_g = a;
+  c3_w b_w = b, c_w = c;
+  c3_w len_e_w = u3r_met(a_g, e);
+  u3i_slab sab_u;
+  c3_w* src_w;
+  c3_w len_src_w;
+  if ( _(u3a_is_cat(e)) ) {
+    len_src_w = e ? 1 : 0;
+    src_w = &e;
+  }
+  else {
+    u3a_atom* src_u = u3a_to_ptr(e);
+    len_src_w = src_u->len_w;
+    src_w = src_u->buf_w;
+  }
+  u3i_slab_init(&sab_u, a_g, c3_max(len_e_w, b_w + c_w));
+  u3r_chop_words(a_g, 0, b_w, 0, sab_u.buf_w, len_src_w, src_w);
+  u3r_chop(a_g, 0, c_w, b_w, sab_u.buf_w, d);
+  if (len_e_w > b_w + c_w) {
+    u3r_chop_words(a_g,
+             b_w + c_w,
+             len_e_w - (b_w + c_w),
+             b_w + c_w,
+             sab_u.buf_w,
+             len_src_w,
+             src_w);
+  }
+  return u3i_slab_mint(&sab_u);
+}
+
+u3_weak
+u3wc_sew(u3_noun cor)
+{
+  u3_noun a, b, c, d, e;
+  if ( (c3n == u3r_mean(cor, u3x_sam_2,  &a,
+                             u3x_sam_12, &b,
+                                    106, &c,
+                                    107, &d,
+                              u3x_sam_7, &e, 0)) ||
+       (c3n == u3ud(a)) ||
+       (c3n == u3ud(b)) ||
+       (c3n == u3ud(c)) ||
+       (c3n == u3ud(d)) ||
+       (c3n == u3ud(e)) )
+  {
+    return u3m_bail(c3__fail);
+  } else {
+    return u3qc_sew(a, b, c, d, e);
+  }
+}