Groundwire 408k (Vere)

build.zig

@@ -71,7 +71,7 @@ const CdbGenStep = struct {
     }
 };
 
-const VERSION = "4.3";
+const VERSION = "4.4";
 
 const main_targets: []const std.Target.Query = &[_]std.Target.Query{
     .{ .cpu_arch = .aarch64, .os_tag = .macos, .abi = null },
@@ -105,6 +105,7 @@ const BuildCfg = struct {
     c3dbg: bool = false,
     snapshot_validation: bool = false,
     urth_mass: bool = false,
+    unsafe_dawn: bool = false,
     ubsan: bool = false,
     asan: bool = false,
     tracy_enable: bool = false,
@@ -169,6 +170,12 @@ pub fn build(b: *std.Build) !void {
         "Enable |mass in urth process (-DU3_URTH_MASS)",
     ) orelse false;
 
+    const unsafe_dawn = b.option(
+        bool,
+        "unsafe-dawn",
+        "Enable unsafe dawn code paths (-Dunsafe_dawn)",
+    ) orelse false;
+
     const binary_name = b.option(
         []const u8,
         "binary-name",
@@ -231,6 +238,7 @@ pub fn build(b: *std.Build) !void {
         .c3dbg = c3dbg,
         .snapshot_validation = snapshot_validation,
         .urth_mass = urth_mass,
+        .unsafe_dawn = unsafe_dawn,
         .asan = asan,
         .ubsan = ubsan,
         .tracy_enable = tracy_enable,
@@ -360,6 +368,9 @@ fn buildBinary(
     if (cfg.urth_mass)
         try urbit_flags.appendSlice(&.{"-DU3_URTH_MASS"});
 
+    if (cfg.unsafe_dawn)
+        try urbit_flags.appendSlice(&.{"-Dunsafe_dawn"});
+
     if (cfg.tracy_enable) {
         try urbit_flags.appendSlice(&.{"-DTRACY_ENABLE"});
         if (cfg.tracy_callstack) {

ext/urcrypt/build.zig.zon

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

pkg/c3/defs.h

@@ -283,4 +283,6 @@ c3_align_p(void const * p, size_t al, align_dir hilo) {
 #define c3_likely(x)    ( __builtin_expect(!!(x), 1) )
 #define c3_unlikely(x)  ( __builtin_expect(!!(x), 0) )
 
+#define c3_array_len(arr)  ( sizeof(arr) / sizeof(arr[0]) )
+
 #endif /* ifndef C3_DEFS_H */

pkg/c3/motes.h

@@ -420,6 +420,7 @@
 #   define c3__fent   c3_s4('f','e','n','t')
 #   define c3__ferd   c3_s4('f','e','r','d')
 #   define c3__fhex   c3_s4('f','h','e','x')
+#   define c3__fief   c3_s4('f','i','e','f')
 #   define c3__file   c3_s4('f','i','l','e')
 #   define c3__film   c3_s4('f','i','l','m')
 #   define c3__find   c3_s4('f','i','n','d')
@@ -452,6 +453,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

@@ -1660,7 +1660,7 @@ u3a_print_quac(FILE* fil_u, c3_w den_w, 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");
@@ -1695,11 +1695,15 @@ u3a_mark_road()
   qua_u[7]->siz_w = u3h_mark(u3R->cax.per_p) * 4;
 
   qua_u[8] = c3_calloc(sizeof(*qua_u[8]));
-  qua_u[8]->nam_c = strdup("page directory");
-  qua_u[8]->siz_w = u3a_mark_ptr(u3a_into(u3R->hep.pag_p)) * 4;
+  qua_u[8]->nam_c = strdup("ford memoization cache");
+  qua_u[8]->siz_w = u3h_mark(u3R->cax.for_p) * 4;
 
   qua_u[9] = c3_calloc(sizeof(*qua_u[9]));
-  qua_u[9]->nam_c = strdup("cell pool");
+  qua_u[9]->nam_c = strdup("page directory");
+  qua_u[9]->siz_w = u3a_mark_ptr(u3a_into(u3R->hep.pag_p)) * 4;
+
+  qua_u[10] = c3_calloc(sizeof(*qua_u[10]));
+  qua_u[10]->nam_c = strdup("cell pool");
 
   {
     u3_post *cel_p;
@@ -1714,11 +1718,11 @@ u3a_mark_road()
       }
     }
 
-    qua_u[9]->siz_w = cel_w * 4;
+    qua_u[10]->siz_w = cel_w * 4;
   }
 
-  qua_u[10] = c3_calloc(sizeof(*qua_u[10]));
-  qua_u[10]->nam_c = strdup("free list");
+  qua_u[11] = c3_calloc(sizeof(*qua_u[11]));
+  qua_u[11]->nam_c = strdup("free list");
 
   {
     u3a_dell *fre_u = u3tn(u3a_dell, u3R->hep.fre_p);
@@ -1733,11 +1737,11 @@ u3a_mark_road()
       fre_w += u3a_mark_ptr(u3a_into(u3R->hep.cac_p));
     }
 
-    qua_u[10]->siz_w = fre_w * 4;
+    qua_u[11]->siz_w = fre_w * 4;
   }
 
-  qua_u[11] = c3_calloc(sizeof(*qua_u[11]));
-  qua_u[11]->nam_c = strdup("metadata");
+  qua_u[12] = c3_calloc(sizeof(*qua_u[12]));
+  qua_u[12]->nam_c = strdup("metadata");
 
   {
     c3_w wee_w = 0;
@@ -1746,18 +1750,18 @@ u3a_mark_road()
       wee_w += u3a_Mark.wee_w[i_w];
     }
 
-    qua_u[11]->siz_w = wee_w * 4;
+    qua_u[12]->siz_w = wee_w * 4;
   }
 
-  qua_u[12] = c3_calloc(sizeof(*qua_u[12]));
-  qua_u[12]->nam_c = strdup("loop hint set");
-  qua_u[12]->siz_w = u3h_mark(u3R->lop_p) * 4;
-
   qua_u[13] = c3_calloc(sizeof(*qua_u[13]));
-  qua_u[13]->nam_c = strdup("timer stack");
-  qua_u[13]->siz_w = u3a_mark_noun(u3R->tim) * 4;
-
-  qua_u[14] = NULL;
+  qua_u[13]->nam_c = strdup("loop hint set");
+  qua_u[13]->siz_w = u3h_mark(u3R->lop_p) * 4;
+
+  qua_u[14] = c3_calloc(sizeof(*qua_u[14]));
+  qua_u[14]->nam_c = strdup("timer stack");
+  qua_u[14]->siz_w = u3a_mark_noun(u3R->tim) * 4;
+
+  qua_u[15] = NULL;
 
   c3_w sum_w = 0;
   for (c3_w i_w = 0; qua_u[i_w]; i_w++) {
@@ -1798,6 +1802,7 @@ u3a_rewrite_compact(void)
   u3a_relocate_noun(&(u3R->tim));
   u3h_relocate(&(u3R->cax.har_p));
   u3h_relocate(&(u3R->cax.per_p));
+  u3h_relocate(&(u3R->cax.for_p));
   u3h_relocate(&(u3R->lop_p));
 }
 

pkg/noun/allocate.h

@@ -211,6 +211,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;
@@ -219,7 +220,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

@@ -392,6 +392,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",
@@ -417,6 +419,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/jets.c

@@ -895,23 +895,29 @@ _cj_kick_z(u3_noun cor, u3j_core* cop_u, u3j_harm* ham_u, u3_atom axe)
         u3z(cor);
         return pro;
       }
-      ham_u->liv = c3n;
+      //ham_u->liv = c3n;
       ame = _cj_soft(cor, axe);
-      ham_u->liv = c3y;
+      //ham_u->liv = c3y;
 
       if ( c3n == u3r_sing(ame, pro) ) {
-        u3l_log("test: %s %s: mismatch: good %x, bad %x",
+        //u3l_log("test: %s %s: mismatch: good %x, bad %x",
+        //       cop_u->cos_c,
+        //       (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c,
+        //       u3r_mug(ame),
+        //       u3r_mug(pro));
+        //ham_u->liv = c3n;
+        u3l_log("test: %s %s: mismatch",
                cop_u->cos_c,
-               (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c,
-               u3r_mug(ame),
-               u3r_mug(pro));
-        ham_u->liv = c3n;
+               (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c
+        );
+        u3m_p("good", ame);
+        u3m_p("baad", pro);
 
         return u3m_bail(c3__fail);
       }
       else {
 
-#if 0
+#if 1
         u3l_log("test: %s %s",
                cop_u->cos_c,
                (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c);