Merge branch 'develop' into ml/64

Author: matthew-levan

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 = .{

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,
         });
     }

pkg/noun/hashtable.c

@@ -14,22 +14,6 @@
 */
 #define BIT_SET(a_w, b_w) ((a_w) & ((c3_h)1 << (b_w)))
 
-/* asserting noun deconstruction to make sure HAMTs are bail-safe
-*/
-static inline u3_noun
-_h_need(u3_noun som)
-{
-  u3_assert( _(u3a_is_cell(som)) );
-  return ((u3a_cell *)u3a_to_ptr(som))->hed;
-}
-
-static inline u3_noun
-_t_need(u3_noun som)
-{
-  u3_assert( _(u3a_is_cell(som)) );
-  return ((u3a_cell *)u3a_to_ptr(som))->tel;
-}
-
 static u3_weak
 _ch_trim_slot(u3h_root* har_u, u3h_slot *sot_w, c3_h lef_h, c3_h rem_h);
 
@@ -149,8 +133,8 @@ _ch_buck_add(u3h_buck* hab_u, u3_noun kev, c3_w *use_w)
   //  then replace that key-value pair with kev.
   //
   for ( i_h = 0; i_h < hab_u->len_h; i_h++ ) {
-    u3_noun kov = u3h_slot_to_noun(hab_u->sot_w[i_h]);
-    if ( c3y == u3r_sing(_h_need(kev), _h_need(kov)) ) {
+    u3_noun kov = u3h_slot_to_noun(hab_u->sot_h[i_h]);
+    if ( c3y == u3r_sing(u3h(kev), u3h(kov)) ) {
       hab_u->sot_w[i_h] = u3h_noun_to_slot(kev);
       u3z(kov);
       return hab_u;
@@ -250,13 +234,13 @@ _ch_slot_put(u3h_slot* sot_w, u3_noun kev, c3_h lef_h, c3_h rem_h, c3_w* use_w)
   else {
     u3_noun  kov   = u3h_slot_to_noun(*sot_w);
     u3h_slot add_w = u3h_noun_be_warm(u3h_noun_to_slot(kev));
-    if ( c3y == u3r_sing(_h_need(kev), _h_need(kov)) ) {
+    if ( c3y == u3r_sing(u3h(kev), u3h(kov)) ) {
       // replace old value
       u3z(kov);
       *sot_w = add_w;
     }
     else {
-      c3_h ham_h = CUT_END(u3r_mug(_h_need(kov)), lef_h);
+      c3_h ham_h = CUT_END(u3r_mug(u3h(kov)), lef_h);
       *sot_w     = _ch_two(*sot_w, add_w, lef_h, ham_h, rem_h);
       *use_w    += 1;
     }
@@ -327,7 +311,7 @@ _ch_buck_del(u3h_slot* sot_w, u3_noun key)
   //
   for ( i_h = 0; i_h < hab_u->len_h; i_h++ ) {
     u3_noun kov = u3h_slot_to_noun(hab_u->sot_w[i_h]);
-    if ( c3y == u3r_sing(key, _h_need(kov)) ) {
+    if ( c3y == u3r_sing(key, u3h(kov)) ) {
       fin_h = i_h;
       u3z(kov);
       break;
@@ -464,7 +448,7 @@ _ch_uni_with(u3_noun kev, void* wit)
 {
   u3p(u3h_root) har_p = *(u3p(u3h_root)*)wit;
   u3_noun key, val;
-  u3_assert(c3y == u3r_cell(kev, &key, &val));
+  u3x_cell(kev, &key, &val);
 
   u3h_put(har_p, key, u3k(val));
 }
@@ -668,7 +652,7 @@ _ch_buck_hum(u3h_buck* hab_u, c3_h mug_h)
   c3_h i_h;
 
   for ( i_h = 0; i_h < hab_u->len_h; i_h++ ) {
-    if ( mug_h == u3r_mug(_h_need(u3h_slot_to_noun(hab_u->sot_w[i_h]))) ) {
+    if ( mug_h == u3r_mug(u3h(u3h_slot_to_noun(hab_u->sot_w[i_h]))) ) {
       return c3y;
     }
   }
@@ -697,7 +681,7 @@ _ch_node_hum(u3h_node* han_u, c3_h lef_h, c3_h rem_h, c3_h mug_h)
     if ( _(u3h_slot_is_noun(sot_w)) ) {
       u3_noun kev = u3h_slot_to_noun(sot_w);
 
-      if ( mug_h == u3r_mug(_h_need(kev)) ) {
+      if ( mug_h == u3r_mug(u3h(kev)) ) {
         return c3y;
       }
       else {
@@ -733,7 +717,7 @@ u3h_hum(u3p(u3h_root) har_p, c3_h mug_h)
   else if ( _(u3h_slot_is_noun(sot_w)) ) {
     u3_noun kev = u3h_slot_to_noun(sot_w);
 
-    if ( mug_h == u3r_mug(_h_need(kev)) ) {
+    if ( mug_h == u3r_mug(u3h(kev)) ) {
       return c3y;
     }
     else {
@@ -756,7 +740,7 @@ _ch_buck_git(u3h_buck* hab_u, u3_noun key)
 
   for ( i_h = 0; i_h < hab_u->len_h; i_h++ ) {
     u3_noun kev = u3h_slot_to_noun(hab_u->sot_w[i_h]);
-    if ( _(u3r_sing(key, _h_need(kev))) ) {
+    if ( _(u3r_sing(key, u3h(kev))) ) {
       return u3t(kev);
     }
   }
@@ -785,8 +769,8 @@ _ch_node_git(u3h_node* han_u, c3_h lef_h, c3_h rem_h, u3_noun key)
     if ( _(u3h_slot_is_noun(sot_w)) ) {
       u3_noun kev = u3h_slot_to_noun(sot_w);
 
-      if ( _(u3r_sing(key, _h_need(kev))) ) {
-        return _t_need(kev);
+      if ( _(u3r_sing(key, u3h(kev))) ) {
+        return u3t(kev);
       }
       else {
         return u3_none;
@@ -822,7 +806,7 @@ u3h_git(u3p(u3h_root) har_p, u3_noun key)
   else if ( _(u3h_slot_is_noun(sot_w)) ) {
     u3_noun kev = u3h_slot_to_noun(sot_w);
 
-    if ( _(u3r_sing(key, _h_need(kev))) ) {
+    if ( _(u3r_sing(key, u3h(kev))) ) {
       har_u->sot_w[inx_h] = u3h_noun_be_warm(sot_w);
       return u3t(kev);
     }
@@ -1009,8 +993,8 @@ static u3h_slot
 _ch_take_noun(u3h_slot sot_w, u3_funk fun_f)
 {
   u3_noun kov = u3h_slot_to_noun(sot_w);
-  u3_noun kev = u3nc(u3a_take(_h_need(kov)),
-                     fun_f(_t_need(kov)));
+  u3_noun kev = u3nc(u3a_take(u3h(kov)),
+                     fun_f(u3t(kov)));
 
   return u3h_noun_to_slot(kev);
 }

pkg/noun/manage.c

@@ -290,14 +290,7 @@ _cm_stack_unwind(void)
   u3_noun tax;
 
   while ( u3R != &(u3H->rod_u) ) {
-    u3_noun yat = u3R->bug.tax;
-    u3m_fall();
-    yat = u3a_take(yat);
-    //  pop the stack
-    //
-    u3a_drop_heap(u3R->cap_p, u3R->ear_p);
-    u3R->cap_p = u3R->ear_p;
-    u3R->ear_p = 0;
+    u3_noun yat = u3m_love(u3R->bug.tax);
 
     u3R->bug.tax = u3kb_weld(yat, u3R->bug.tax);
   }
@@ -1387,43 +1380,6 @@ u3m_love(u3_noun pro)
   return pro;
 }
 
-/* u3m_warm(): return product from leap without promoting state
-*/
-u3_noun
-u3m_warm(u3_noun pro)
-{
-  c3_o tim_o = u3du(u3R->tim);
-  u3m_fall();
-  if ( _(tim_o) ) _m_renew_now();
-  pro = u3a_take(pro);
-
-  //  pop the stack
-  //
-  u3a_drop_heap(u3R->cap_p, u3R->ear_p);
-  u3R->cap_p = u3R->ear_p;
-  u3R->ear_p = 0;
-  return pro;
-}
-
-/* u3m_pour(): return error ball from leap, promoting the state if the error
- * is deterministic
-*/
-u3_noun
-u3m_pour(u3_noun why)
-{
-  u3_assert(c3y == u3du(why));
-  switch (u3h(why)) {
-    case 0:
-    case 1: {
-      return u3m_love(why);
-    } break;
-
-    default: {
-      return u3m_warm(why);
-    } break;
-  }
-}
-
 /* u3m_golf(): record cap_p length for u3m_flog().
 */
 c3_w
@@ -1564,7 +1520,7 @@ u3m_soft_top(c3_w    mil_w,                     //  timer ms
 #endif
     /* Overload the error result.
     */
-    pro = u3m_pour(why);
+    pro = u3m_love(why);
   }
 
   /* Revert to external signal regime.
@@ -1695,7 +1651,7 @@ u3m_soft_cax(u3_funq fun_f,
         } break;
 
         case 3: {                             //  failure; rebail w/trace
-          u3_noun yod = u3m_warm(u3t(why));
+          u3_noun yod = u3m_love(u3t(why));
 
           u3m_bail
             (u3nt(3,
@@ -1808,7 +1764,7 @@ u3m_soft_run(u3_noun gul,
         } break;
 
         case 3: {                             //  failure; rebail w/trace
-          u3_noun yod = u3m_warm(u3t(why));
+          u3_noun yod = u3m_love(u3t(why));
 
           u3m_bail
             (u3nt(3,
@@ -1817,7 +1773,7 @@ u3m_soft_run(u3_noun gul,
         } break;
 
         case 4: {                             //  meta-bail
-          u3m_bail(u3m_pour(u3t(why)));
+          u3m_bail(u3m_love(u3t(why)));
         } break;
       }
     }
@@ -1887,7 +1843,7 @@ u3m_soft_esc(u3_noun ref, u3_noun sam)
     /* Push the error back up to the calling context - not the run we
     ** are in, but the caller of the run, matching pure nock semantics.
     */
-    u3m_bail(u3nc(4, u3m_pour(why)));
+    u3m_bail(u3nc(4, u3m_love(why)));
   }
 
   /* Release the sample.  Note that we used it above, but in a junior

pkg/noun/platform/windows/setjmp.c

@@ -0,0 +1,21 @@
+// We want to use __builtin_setjmp but clang has a longstanding bug that causes
+// __builtin_setjmp to store a corrupt frame pointer. Until that is fixed we
+// write our own. See https://github.com/llvm/llvm-project/pull/186843 for
+// details.
+
+__attribute__((naked,returns_twice))
+int windows_setjmp(void** buf)
+{
+  // We store the frame pointer, instruction pointer and stack pointer into the
+  // buffer. Note that we can keep using __builtin_longjmp because we store
+  // exactly what it expects.
+    __asm(
+          "mov %rbp, 0(%rcx)\n"
+          "mov (%rsp), %rax\n"
+          "mov %rax,  8(%rcx)\n"
+          "lea 8(%rsp), %rax\n"
+          "mov %rax,  16(%rcx)\n"
+          "xor %eax, %eax\n"
+          "ret\n"
+    );
+}

pkg/noun/platform/windows/setjmp.h

@@ -10,6 +10,8 @@ typedef struct jmp_buf {
 #define _setjmp setjmp
 #define _longjmp longjmp
 #define longjmp(buf, val) {(buf).retval = (val); __builtin_longjmp((void**)((buf).buffer), 1);}
-#define setjmp(buf) (__builtin_setjmp((void**)(buf.buffer)) ? (buf.retval) : 0)
+#define setjmp(buf) (windows_setjmp((void**)(buf.buffer)) ? (buf.retval) : 0)
+
+__attribute__((naked,returns_twice)) int windows_setjmp(void** buf);
 
 #endif// _SETJMP_H

pkg/vere/io/conn.c

@@ -867,6 +867,10 @@ _conn_ef_handle(u3_conn*  con_u,
       can_u->mor_u.bal_f(can_u, -4, "handle-unknown");
       u3_king_bail();
     }
+
+    if ( !uv_is_readable((uv_stream_t*)&con_u->san_u->pyp_u) ) {
+      _conn_close_chan(con_u->san_u, can_u);
+    }
   }
   else {
     u3l_log("conn: handle-no-coq %" PRIxc3_h " %" PRIc3_h,