Merge branch 'ml/64' into ml/bob

Author: matthew-levan

.github/workflows/shared.yml

@@ -73,7 +73,7 @@ jobs:
           echo
           swapon --show
           echo
-      
+
       - name: Set memory overcommit
         run: |
           sudo sysctl -w vm.overcommit_memory=1
@@ -86,24 +86,24 @@ jobs:
 
       - name: Build binaries
         run: |
-          # Add -Dvere32 flag for 32-bit builds
-          VERE32_FLAG=""
-          if [[ "${{ matrix.bits }}" == "32" ]]; then
-            VERE32_FLAG="-Dvere32"
+          # Add -Dvere64 flag for 64-bit builds
+          VERE64_FLAG=""
+          if [[ "${{ matrix.bits }}" == "64" ]]; then
+            VERE64_FLAG="-Dvere64"
           fi
 
           if [[ "${{ inputs.pace }}" == "live" ]]; then
             zig build                  \
               -Dall                    \
               -Drelease                \
-              $VERE32_FLAG             \
+              $VERE64_FLAG             \
               --summary all
           else
             zig build                  \
               -Dall                    \
               -Doptimize=ReleaseFast   \
               -Dpace=${{inputs.pace}}  \
-              $VERE32_FLAG             \
+              $VERE64_FLAG             \
               --summary all
           fi
       - name: Run unit tests
@@ -124,10 +124,10 @@ jobs:
       - name: Build test binary
         if: ${{ inputs.fake_tests }}
         run: |
-          # Add -Dvere32 flag for 32-bit builds
-          VERE32_FLAG=""
-          if [[ "${{ matrix.bits }}" == "32" ]]; then
-            VERE32_FLAG="-Dvere32"
+          # Add -Dvere64 flag for 64-bit builds
+          VERE64_FLAG=""
+          if [[ "${{ matrix.bits }}" == "64" ]]; then
+            VERE64_FLAG="-Dvere64"
           fi
 
           zig build                    \
@@ -139,7 +139,7 @@ jobs:
             -Dc3dbg                    \
             -Dsnapshot-validation      \
             -Durth-mass                \
-            $VERE32_FLAG               \
+            $VERE64_FLAG               \
             --summary all
 
       - name: Boot fake ship
@@ -270,6 +270,7 @@ jobs:
       - name: Build 64-bit migration binary
         run: |
           zig build                           \
+            -Dvere64                          \
             -Doptimize=ReleaseFast            \
             -Dpace=${{inputs.pace}}           \
             -Dbinary-name=vere-migration     \
@@ -278,13 +279,12 @@ jobs:
       - name: Build 32-bit migration binary
         run: |
           zig build                           \
-            -Dvere32                          \
             -Doptimize=ReleaseFast            \
             -Dpace=${{inputs.pace}}           \
             -Dbinary-name=vere32-migration   \
             --summary all
 
-      - name: Run v5↔v6 roundtrip migration test
+      - name: Run 32↔64 roundtrip migration test
         env:
           VERE64_BINARY: "zig-out/x86_64-linux-musl/vere-migration"
           VERE32_BINARY: "zig-out/x86_64-linux-musl/vere32-migration"

build.zig

@@ -107,7 +107,7 @@ const BuildCfg = struct {
     urth_mass: bool = false,
     ubsan: bool = false,
     asan: bool = false,
-    vere32: bool = false,
+    vere64: bool = false,
     tracy_enable: bool = false,
     tracy_callstack: bool = false,
     tracy_no_exit: bool = false,
@@ -194,10 +194,10 @@ pub fn build(b: *std.Build) !void {
     else
         false;
 
-    const vere32 = b.option(
+    const vere64 = b.option(
         bool,
-        "vere32",
-        "Compile in 32-bit mode",
+        "vere64",
+        "Compile in 64-bit mode",
     ) orelse false;
 
     const tracy_enable = b.option(bool, "tracy", "Enable Tracy profiler") orelse false;
@@ -240,7 +240,7 @@ pub fn build(b: *std.Build) !void {
         .urth_mass = urth_mass,
         .asan = asan,
         .ubsan = ubsan,
-        .vere32 = vere32,
+        .vere64 = vere64,
         .tracy_enable = tracy_enable,
         .tracy_callstack = tracy_callstack,
         .tracy_no_exit = tracy_no_exit,
@@ -365,7 +365,7 @@ fn buildBinary(
     if (cfg.snapshot_validation)
         try urbit_flags.appendSlice(&.{"-DU3_SNAPSHOT_VALIDATION"});
 
-    if (!cfg.vere32)
+    if (cfg.vere64)
         try urbit_flags.appendSlice(&.{"-DVERE64"});
 
     if (cfg.urth_mass)
@@ -449,6 +449,7 @@ fn buildBinary(
         .target = target,
         .optimize = optimize,
         .copt = copts,
+        .vere64 = cfg.vere64,
     });
 
     const pkg_vere = b.dependency("pkg_vere", .{
@@ -457,7 +458,7 @@ fn buildBinary(
         .copt = copts,
         .pace = cfg.pace,
         .version = cfg.version,
-        .vere32 = cfg.vere32,
+        .vere64 = cfg.vere64,
     });
 
     const curl = b.dependency("curl", .{

ext/urcrypt/build.zig.zon

@@ -15,8 +15,8 @@
             .hash = "N-V-__8AAJ4DSwC7aDpt90TmGPWKAI6q4-titwp4M0zsZ2vY",
         },
         .urcrypt = .{
-            .url = "https://github.com/urbit/urcrypt/archive/465aad6262f2710f76f75adfe74effb5751c5ab3.tar.gz",
-            .hash = "N-V-__8AAL3OSQDA9xQasK60FkxcKuQoSANeWy_f9SxmxX1X",
+            .url = "https://github.com/urbit/urcrypt/archive/6c93535d46adffcd1495f904bac91d43b2d6d555.tar.gz",
+            .hash = "N-V-__8AAEPPSQAFB28-gqWMJB7_zp5ZIS8wIN4boyLzAWRb",
         },
     },
     .paths = .{

migration-test.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 # migration-test.sh: roundtrip migration test for the vere loom.
 #
-# Tests the v5↔v6 loom migration path by running three sequential boots on
+# Tests the 32↔64-bit loom migration path by running three sequential boots on
 # the same fake pier:
-#   1. 32-bit vere: fresh boot from pill → saves a v5 (32-bit) loom snapshot
-#   2. 64-bit vere: re-boots same pier   → migrates v5→v6 (u3_migrate_v6)
-#   3. 32-bit vere: re-boots same pier   → restores v6→v5 (u3_restore_v5)
+#   1. 32-bit vere: fresh boot from pill → saves a 32-bit loom snapshot
+#   2. 64-bit vere: re-boots same pier   → migrates 32→64 (u3_migrate_64)
+#   3. 32-bit vere: re-boots same pier   → migrates 64→32 (u3_migrate_32)
 #
 # Required environment variables:
 #   VERE32_BINARY   32-bit vere binary path, relative to GITHUB_WORKSPACE or PWD
@@ -89,9 +89,9 @@ cleanup() {
 }
 trap cleanup EXIT
 
-# ── Step 1: 32-bit vere → create v5 snapshot ─────────────────────────────────
+# ── Step 1: 32-bit vere → create 32-bit snapshot ─────────────────────────────
 
-echo "=== migration step 1: boot with 32-bit vere (create v5 snapshot) ==="
+echo "=== migration step 1: boot with 32-bit vere (create 32-bit snapshot) ==="
 
 rm -rf "$pier"
 "$vere32" --lite-boot --daemon --fake bus \
@@ -108,11 +108,11 @@ lensd "$port" '+vats %base'
 lensa "$port" hood '+hood/exit'
 wait_for_shutdown "$pier"
 
-echo "=== step 1 done: v5 snapshot saved ==="
+echo "=== step 1 done: 32-bit snapshot saved ==="
 
-# ── Step 2: 64-bit vere → migrate v5→v6 ──────────────────────────────────────
+# ── Step 2: 64-bit vere → migrate 32→64 ──────────────────────────────────────
 
-echo "=== migration step 2: boot with 64-bit vere (v5→v6 migration) ==="
+echo "=== migration step 2: boot with 64-bit vere (32→64 migration) ==="
 
 rm -f "$pier/.http.ports"
 "$vere64" --lite-boot --daemon "$pier"
@@ -126,11 +126,11 @@ lensd "$port" '+vats %base'
 lensa "$port" hood '+hood/exit'
 wait_for_shutdown "$pier"
 
-echo "=== step 2 done: v5→v6 migration succeeded ==="
+echo "=== step 2 done: 32→64 migration succeeded ==="
 
-# ── Step 3: 32-bit vere → restore v6→v5 ──────────────────────────────────────
+# ── Step 3: 32-bit vere → migrate 64→32 ──────────────────────────────────────
 
-echo "=== migration step 3: boot with 32-bit vere (v6→v5 restore) ==="
+echo "=== migration step 3: boot with 32-bit vere (64→32 migration) ==="
 
 rm -f "$pier/.http.ports"
 "$vere32" --lite-boot --daemon "$pier"
@@ -144,5 +144,5 @@ lensd "$port" '+vats %base'
 lensa "$port" hood '+hood/exit'
 wait_for_shutdown "$pier"
 
-echo "=== step 3 done: v6→v5 restore succeeded ==="
+echo "=== step 3 done: 64→32 migration succeeded ==="
 echo "Migration roundtrip complete."

pkg/c3/motes.h

@@ -452,6 +452,7 @@
 #   define c3__fond   c3_s4('f','o','n','d')
 #   define c3__for    c3_s3('f','o','r')
 #   define c3__forb   c3_s4('f','o','r','b')
+#   define c3__ford   c3_s4('f','o','r','d')
 #   define c3__fore   c3_s4('f','o','r','e')
 #   define c3__fork   c3_s4('f','o','r','k')
 #   define c3__form   c3_s4('f','o','r','m')

pkg/noun/allocate.c

@@ -1690,7 +1690,7 @@ u3a_print_quac(FILE* fil_u, c3_h den_h, u3m_quac* mas_u)
 u3m_quac*
 u3a_mark_road()
 {
-  u3m_quac** qua_u = c3_malloc(sizeof(*qua_u) * 15);
+  u3m_quac** qua_u = c3_malloc(sizeof(*qua_u) * 16);
 
   qua_u[0] = c3_calloc(sizeof(*qua_u[0]));
   qua_u[0]->nam_c = strdup("namespace");
@@ -1787,7 +1787,11 @@ u3a_mark_road()
   qua_u[13]->nam_c = strdup("timer stack");
   qua_u[13]->siz_w = u3a_mark_noun(u3R->tim) * sizeof(c3_w);
 
-  qua_u[14] = NULL;
+  qua_u[14] = c3_calloc(sizeof(*qua_u[14]));
+  qua_u[14]->nam_c = strdup("ford memoization cache");
+  qua_u[14]->siz_w = u3h_mark(u3R->cax.for_p) * sizeof(c3_w);
+
+  qua_u[15] = NULL;
 
   c3_w sum_w = 0;
   for (c3_w i_w = 0; qua_u[i_w]; i_w++) {
@@ -1829,6 +1833,7 @@ u3a_rewrite_compact(void)
   u3h_relocate(&(u3R->cax.har_p));
   u3h_relocate(&(u3R->cax.per_p));
   u3h_relocate(&(u3R->lop_p));
+  u3h_relocate(&(u3R->cax.for_p));
 }
 
 /* u3a_idle(): measure free-lists in [rod_u]

pkg/noun/allocate.h

@@ -14,9 +14,11 @@
     /* u3a_vits: number of virtual bits in a noun reference gained via shifting
     */
 #ifndef VERE64
-#     define u3a_vits    2
+#     define u3a_vits   2
+#     define u3a_wits   0  //  word-size: 0==32-bit, 1==64-bit
 #else
-#     define u3a_vits    0
+#     define u3a_vits   0
+#     define u3a_wits   1  //  word-size: 0==32-bit, 1==64-bit
 #endif
 
 #     define u3a_word_bytes  (sizeof(c3_w))
@@ -298,6 +300,7 @@ STATIC_ASSERT( u3a_vits <= u3a_min_log,
         struct {                              //  memoization caches
           u3p(u3h_root) har_p;                //  transient
           u3p(u3h_root) per_p;                //  persistent
+          u3p(u3h_root) for_p;                //  ford
         } cax;
       } u3a_road;
       typedef u3a_road u3_road;
@@ -306,7 +309,7 @@ STATIC_ASSERT( u3a_vits <= u3a_min_log,
     */
       enum u3a_flag {
         u3a_flag_sand  = 1 << 1,              //  bump allocation (XX not impl)
-        u3a_flag_cash  = 1 << 2,              //  memo cache harvesting
+        u3a_flag_cash  = 1 << 2,              //  memo cache harvesting, flows forward
       };
 
     /* u3a_pile: stack control, abstracted over road direction.

pkg/noun/build.zig

@@ -183,7 +183,7 @@ pub fn build(b: *std.Build) !void {
     if (t.os.tag == .windows) {
         pkg_noun.addCSourceFiles(.{
             .root = b.path("platform/windows"),
-            .files = &.{ "veh_handler.c", "rsignal.c" },
+            .files = &.{ "veh_handler.c", "rsignal.c", "setjmp.c" },
             .flags = flags.items,
         });
     }
@@ -393,6 +393,8 @@ const c_source_files = [_][]const u8{
     "jets/tree.c",
     "jets/137/tree.c",
     "jets/136/tree.c",
+    "jets/136/loot.c",
+    "jets/135/tree.c",
     "log.c",
     "manage.c",
     "palloc.c",
@@ -418,6 +420,7 @@ const install_headers = [_][]const u8{
     "jets/k.h",
     "jets/q.h",
     "jets/w.h",
+    "jets/136/w.h",
     "log.h",
     "manage.h",
     "nock.h",

pkg/noun/equality_tests.c

@@ -157,7 +157,7 @@ main(int argc, char* argv[])
 
   //  GC
   //
-  u3m_grab(u3_none);
+  u3m_grab();
 
   fprintf(stderr, "test equality: ok\r\n");
   return 0;

pkg/noun/events.c

@@ -499,11 +499,10 @@ _ce_patch_verify(u3_ce_patch* pat_u)
   c3_y  buf_y[_ce_page];
   c3_zs ret_zs;
 
-  if ( U3P_VERLAT != pat_u->con_u->ver_w ) {
-    fprintf(stderr, "loom: patch version mismatch: have %"PRIc3_w", need %"PRIc3_w"\r\n",
-        // XX: remove cast?
-                    (c3_w)pat_u->con_u->ver_w,
-                    (c3_w)U3D_VERLAT);
+  if ( U3P_VERLAT != pat_u->con_u->ver_h ) {
+    fprintf(stderr, "loom: patch version mismatch: have %u, need %u\r\n",
+                    pat_u->con_u->ver_h,
+                    U3P_VERLAT);
     return c3n;
   }
 
@@ -729,7 +728,7 @@ _ce_patch_compose(c3_w max_w)
     _ce_patch_create(pat_u);
     len_w = sizeof(u3e_control) + (pgs_w * sizeof(u3e_line));
     pat_u->con_u = c3_malloc(len_w);
-    pat_u->con_u->ver_w = U3P_VERLAT;
+    pat_u->con_u->ver_h = U3P_VERLAT;
     pgc_w = 0;
 
     for ( i_w = 0; i_w < max_w; i_w++ ) {