From b256c87f6ddf9ba42d983b39a9200e63027e5b7a Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:26:10 -0400 Subject: [PATCH 01/17] jets: adds +hub --- pkg/noun/jets/c/hub.c | 61 +++++++++++++++++++++++++++++++++++++++++++ pkg/noun/jets/q.h | 1 + pkg/noun/jets/w.h | 1 + 3 files changed, 63 insertions(+) create mode 100644 pkg/noun/jets/c/hub.c diff --git a/pkg/noun/jets/c/hub.c b/pkg/noun/jets/c/hub.c new file mode 100644 index 0000000000..bae3831649 --- /dev/null +++ b/pkg/noun/jets/c/hub.c @@ -0,0 +1,61 @@ +#include "jets/q.h" +#include "jets/w.h" + +#include "noun.h" + +u3_noun +u3qc_hub(u3_atom a, u3_atom b) +{ + c3_w a_w, b_w, c_w; + + if ( 1 == a ) return u3k(b); + + a_w = u3r_met(0, a); + b_w = u3r_met(0, b); + + if ( b_w < a_w ) return u3m_bail(c3__exit); + + c_w = b_w - a_w; + + if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { + if ( a != (b >> c_w) ) return u3m_bail(c3__exit); + + return b & ((1 << c_w) - 1); + } + else { + u3_atom c, d, e, f, g; + + c = u3i_word(b_w - a_w); + d = u3qc_rsh(0, c, b); + + if ( c3n == u3r_sing(a, d) ) return u3m_bail(c3__exit); + + e = u3qc_bex(c); + f = u3qa_dec(e); + g = u3qc_dis(b, f); + + u3z(c); + u3z(d); + u3z(e); + u3z(f); + + return g; + } +} + +u3_noun +u3wc_hub(u3_noun cor) +{ + u3_noun a, b; + if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) + || (0 == a) + || (0 == b) + || (c3n == u3ud(b)) + || (c3n == u3ud(a) && b != 1) ) + { + return u3m_bail(c3__exit); + } + else { + return u3qc_hub(a, b); + } +} diff --git a/pkg/noun/jets/q.h b/pkg/noun/jets/q.h index e9c8bfd9b3..ad4b10b82e 100644 --- a/pkg/noun/jets/q.h +++ b/pkg/noun/jets/q.h @@ -57,6 +57,7 @@ u3_noun u3qc_dvr(u3_atom, u3_atom); u3_noun u3qc_end(u3_atom, u3_atom, u3_atom); u3_noun u3qc_gor(u3_atom, u3_atom); + u3_noun u3qc_hub(u3_atom, u3_atom); u3_noun u3qc_lsh(u3_atom, u3_atom, u3_atom); u3_noun u3qc_mas(u3_atom); u3_noun u3qc_met(u3_atom, u3_atom); diff --git a/pkg/noun/jets/w.h b/pkg/noun/jets/w.h index 2898e0b6e6..76ff87d4be 100644 --- a/pkg/noun/jets/w.h +++ b/pkg/noun/jets/w.h @@ -58,6 +58,7 @@ u3_noun u3wc_dor(u3_noun); u3_noun u3wc_dvr(u3_noun); u3_noun u3wc_end(u3_noun); + u3_noun u3wc_hub(u3_noun); u3_noun u3wc_gor(u3_noun); u3_noun u3wc_lsh(u3_noun); u3_noun u3wc_mas(u3_noun); From af6adb8fb52cd94fa0e6061cc3611f913cf2759d Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:29:00 -0400 Subject: [PATCH 02/17] jets: adds +pin --- pkg/noun/jets/c/pin.c | 54 +++++++++++++++++++++++++++++++++++++++++++ pkg/noun/jets/q.h | 1 + pkg/noun/jets/w.h | 1 + 3 files changed, 56 insertions(+) create mode 100644 pkg/noun/jets/c/pin.c diff --git a/pkg/noun/jets/c/pin.c b/pkg/noun/jets/c/pin.c new file mode 100644 index 0000000000..c1b45581f8 --- /dev/null +++ b/pkg/noun/jets/c/pin.c @@ -0,0 +1,54 @@ +#include "jets/q.h" +#include "jets/w.h" + +#include "noun.h" + +u3_noun +u3qc_pin(u3_atom a, u3_atom b) +{ + c3_w a_w, b_w, c_w; + + if ( 1 == a ) return c3y; + if ( 1 == b ) return c3n; + + a_w = u3r_met(0, a); + b_w = u3r_met(0, b); + + if ( b_w < a_w ) return c3n; + + c_w = b_w - a_w; + + if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { + return __(a == (b >> (b_w - a_w))); + } + else { + u3_atom c, d, e; + + c = u3i_word(b_w - a_w); + d = u3qc_rsh(0, c, b); + e = u3r_sing(a, d); + + u3z(c); + u3z(d); + + return e; + } +} + +u3_noun +u3wc_pin(u3_noun cor) +{ + u3_noun a, b; + + if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) + || (0 == a) + || (0 == b) + || (c3n == u3ud(b)) + || (c3n == u3ud(a)) ) + { + return u3m_bail(c3__exit); + } + else { + return u3qc_pin(a, b); + } +} diff --git a/pkg/noun/jets/q.h b/pkg/noun/jets/q.h index ad4b10b82e..8a6cb15be7 100644 --- a/pkg/noun/jets/q.h +++ b/pkg/noun/jets/q.h @@ -65,6 +65,7 @@ u3_noun u3qc_mor(u3_atom, u3_atom); u3_noun u3qc_muk(u3_atom, u3_atom, u3_atom); u3_noun u3qc_peg(u3_atom, u3_atom); + u3_noun u3qc_pin(u3_atom, u3_atom); u3_noun u3qc_pow(u3_atom, u3_atom); u3_noun u3qc_rap(u3_atom, u3_noun); u3_noun u3qc_rep(u3_atom, u3_atom, u3_noun); diff --git a/pkg/noun/jets/w.h b/pkg/noun/jets/w.h index 76ff87d4be..df1d5c0fba 100644 --- a/pkg/noun/jets/w.h +++ b/pkg/noun/jets/w.h @@ -68,6 +68,7 @@ u3_noun u3wc_mug(u3_noun); u3_noun u3wc_muk(u3_noun); u3_noun u3wc_peg(u3_noun); + u3_noun u3wc_pin(u3_noun); u3_noun u3wc_pow(u3_noun); u3_noun u3wc_rap(u3_noun); u3_noun u3wc_rep(u3_noun); From 9d42e0dbb94a74b24b40ada50890a2938503940d Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:32:13 -0400 Subject: [PATCH 03/17] jets: fixes unsafe c3_w -> atom conversion in +peg --- pkg/noun/jets/c/peg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/noun/jets/c/peg.c b/pkg/noun/jets/c/peg.c index 28a8f3b2bd..16508c11af 100644 --- a/pkg/noun/jets/c/peg.c +++ b/pkg/noun/jets/c/peg.c @@ -14,16 +14,15 @@ return u3k(a); } - u3_atom c, d, e, f, g, h; + u3_atom d, e, f, g, h; + c3_w c_w = u3r_met(0, b) - 1; - c = u3r_met(0, b); - d = u3qa_dec(c); + d = u3i_word(c_w); e = u3qc_lsh(0, d, 1); f = u3qa_sub(b, e); g = u3qc_lsh(0, d, a); h = u3qa_add(f, g); - u3z(c); u3z(d); u3z(e); u3z(f); From b1d7d26cf738e73e8a05255af216817f002f0532 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:44:48 -0400 Subject: [PATCH 04/17] jets: optimizes direct +peg --- pkg/noun/jets/c/peg.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkg/noun/jets/c/peg.c b/pkg/noun/jets/c/peg.c index 16508c11af..c87bff3c11 100644 --- a/pkg/noun/jets/c/peg.c +++ b/pkg/noun/jets/c/peg.c @@ -14,21 +14,29 @@ return u3k(a); } - u3_atom d, e, f, g, h; c3_w c_w = u3r_met(0, b) - 1; - d = u3i_word(c_w); - e = u3qc_lsh(0, d, 1); - f = u3qa_sub(b, e); - g = u3qc_lsh(0, d, a); - h = u3qa_add(f, g); + if ( (c3y == u3a_is_cat(a) && (c3y == u3a_is_cat(b))) ) { + c3_w d_w = b - (1 << c_w); + c3_d e_d = (c3_d)a << c_w; + return u3i_chub(d_w + e_d); + } + else { + u3_atom d, e, f, g, h; + + d = u3i_word(c_w); + e = u3qc_lsh(0, d, 1); + f = u3qa_sub(b, e); + g = u3qc_lsh(0, d, a); + h = u3qa_add(f, g); - u3z(d); - u3z(e); - u3z(f); - u3z(g); + u3z(d); + u3z(e); + u3z(f); + u3z(g); - return h; + return h; + } } u3_noun u3wc_peg(u3_noun cor) From 8fea31ec12657167fcb31a3201787deaeab1ca42 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:45:13 -0400 Subject: [PATCH 05/17] jets: restyles +peg --- pkg/noun/jets/c/peg.c | 93 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 48 deletions(-) diff --git a/pkg/noun/jets/c/peg.c b/pkg/noun/jets/c/peg.c index c87bff3c11..cc39a1022b 100644 --- a/pkg/noun/jets/c/peg.c +++ b/pkg/noun/jets/c/peg.c @@ -1,57 +1,54 @@ -/// @file - #include "jets/q.h" #include "jets/w.h" #include "noun.h" +u3_noun +u3qc_peg(u3_atom a, u3_atom b) +{ + if ( 1 == b ) { + return u3k(a); + } - u3_noun - u3qc_peg(u3_atom a, - u3_atom b) - { - if ( 1 == b ) { - return u3k(a); - } - - c3_w c_w = u3r_met(0, b) - 1; - - if ( (c3y == u3a_is_cat(a) && (c3y == u3a_is_cat(b))) ) { - c3_w d_w = b - (1 << c_w); - c3_d e_d = (c3_d)a << c_w; - return u3i_chub(d_w + e_d); - } - else { - u3_atom d, e, f, g, h; - - d = u3i_word(c_w); - e = u3qc_lsh(0, d, 1); - f = u3qa_sub(b, e); - g = u3qc_lsh(0, d, a); - h = u3qa_add(f, g); - - u3z(d); - u3z(e); - u3z(f); - u3z(g); - - return h; - } + c3_w c_w = u3r_met(0, b) - 1; + + if ( (c3y == u3a_is_cat(a) && (c3y == u3a_is_cat(b))) ) { + c3_w d_w = b - (1 << c_w); + c3_d e_d = (c3_d)a << c_w; + return u3i_chub(d_w + e_d); + } + else { + u3_atom d, e, f, g, h; + + d = u3i_word(c_w); + e = u3qc_lsh(0, d, 1); + f = u3qa_sub(b, e); + g = u3qc_lsh(0, d, a); + h = u3qa_add(f, g); + + u3z(d); + u3z(e); + u3z(f); + u3z(g); + + return h; } - u3_noun - u3wc_peg(u3_noun cor) +} + +u3_noun +u3wc_peg(u3_noun cor) +{ + u3_noun a, b; + + if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) || + (0 == a) || + (0 == b) || + (c3n == u3ud(b)) || + (c3n == u3ud(a) && b != 1) ) { - u3_noun a, b; - - if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) || - (0 == a) || - (0 == b) || - (c3n == u3ud(b)) || - (c3n == u3ud(a) && b != 1) ) - { - return u3m_bail(c3__exit); - } else { - return u3qc_peg(a, b); - } + return u3m_bail(c3__exit); } - + else { + return u3qc_peg(a, b); + } +} From 30279b8990d2c87a7f1664e74b1d8c33a91af045 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:43:39 -0400 Subject: [PATCH 06/17] jets: fixes unsafe c3_w -> atom conversion in +mas --- pkg/noun/jets/c/mas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/noun/jets/c/mas.c b/pkg/noun/jets/c/mas.c index 7b2658d738..881ae73977 100644 --- a/pkg/noun/jets/c/mas.c +++ b/pkg/noun/jets/c/mas.c @@ -17,8 +17,8 @@ return u3m_bail(c3__exit); } else { - c = u3qc_bex((b_w - 1)); - d = u3qc_bex((b_w - 2)); + c = u3qc_bex(u3i_word(b_w - 1)); + d = u3qc_bex(u3i_word(b_w - 2)); e = u3qa_sub(a, c); f = u3qc_con(e, d); From 76ce8392ba8032c2f7efc6ecb89d2ebea78d82d3 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:44:08 -0400 Subject: [PATCH 07/17] jets: optimizes direct +mas --- pkg/noun/jets/c/mas.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/noun/jets/c/mas.c b/pkg/noun/jets/c/mas.c index 881ae73977..63c8632079 100644 --- a/pkg/noun/jets/c/mas.c +++ b/pkg/noun/jets/c/mas.c @@ -16,6 +16,9 @@ if ( b_w < 2 ) { return u3m_bail(c3__exit); } + else if ( c3y == u3a_is_cat(a) ) { + return (a - (1 << (b_w - 1))) | (1 << (b_w - 2)); + } else { c = u3qc_bex(u3i_word(b_w - 1)); d = u3qc_bex(u3i_word(b_w - 2)); From 0b114c5c2c151daa6faa8c88a07806510ddf2252 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 16 May 2023 23:45:48 -0400 Subject: [PATCH 08/17] jets: restyles +mas --- pkg/noun/jets/c/mas.c | 72 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/pkg/noun/jets/c/mas.c b/pkg/noun/jets/c/mas.c index 63c8632079..4d5f0e45ca 100644 --- a/pkg/noun/jets/c/mas.c +++ b/pkg/noun/jets/c/mas.c @@ -1,48 +1,46 @@ -/// @file - #include "jets/q.h" #include "jets/w.h" #include "noun.h" +u3_noun +u3qc_mas(u3_atom a) +{ + c3_w b_w; + u3_atom c, d, e, f; - u3_noun - u3qc_mas(u3_atom a) - { - c3_w b_w; - u3_atom c, d, e, f; - - b_w = u3r_met(0, a); - if ( b_w < 2 ) { - return u3m_bail(c3__exit); - } - else if ( c3y == u3a_is_cat(a) ) { - return (a - (1 << (b_w - 1))) | (1 << (b_w - 2)); - } - else { - c = u3qc_bex(u3i_word(b_w - 1)); - d = u3qc_bex(u3i_word(b_w - 2)); - e = u3qa_sub(a, c); - f = u3qc_con(e, d); + b_w = u3r_met(0, a); + if ( b_w < 2 ) { + return u3m_bail(c3__exit); + } + else if ( c3y == u3a_is_cat(a) ) { + return (a - (1 << (b_w - 1))) | (1 << (b_w - 2)); + } + else { + c = u3qc_bex(u3i_word(b_w - 1)); + d = u3qc_bex(u3i_word(b_w - 2)); + e = u3qa_sub(a, c); + f = u3qc_con(e, d); - u3z(c); - u3z(d); - u3z(e); + u3z(c); + u3z(d); + u3z(e); - return f; - } + return f; } - u3_noun - u3wc_mas(u3_noun cor) - { - u3_noun a; +} - if ( (u3_none == (a = u3r_at(u3x_sam, cor))) || - (c3n == u3ud(a)) ) - { - return u3m_bail(c3__exit); - } else { - return u3qc_mas(a); - } - } +u3_noun +u3wc_mas(u3_noun cor) +{ + u3_noun a; + if ( (u3_none == (a = u3r_at(u3x_sam, cor))) || + (c3n == u3ud(a)) ) + { + return u3m_bail(c3__exit); + } + else { + return u3qc_mas(a); + } +} From 2f4c64ebc72d4d7dd8211a8e446b5508742d72ad Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Wed, 17 May 2023 10:58:13 -0400 Subject: [PATCH 09/17] jets: remove redundant expressions in +pin and +hub --- pkg/noun/jets/c/hub.c | 2 +- pkg/noun/jets/c/pin.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/noun/jets/c/hub.c b/pkg/noun/jets/c/hub.c index bae3831649..c4bf6e4726 100644 --- a/pkg/noun/jets/c/hub.c +++ b/pkg/noun/jets/c/hub.c @@ -25,7 +25,7 @@ u3qc_hub(u3_atom a, u3_atom b) else { u3_atom c, d, e, f, g; - c = u3i_word(b_w - a_w); + c = u3i_word(c_w); d = u3qc_rsh(0, c, b); if ( c3n == u3r_sing(a, d) ) return u3m_bail(c3__exit); diff --git a/pkg/noun/jets/c/pin.c b/pkg/noun/jets/c/pin.c index c1b45581f8..33d608f096 100644 --- a/pkg/noun/jets/c/pin.c +++ b/pkg/noun/jets/c/pin.c @@ -19,12 +19,12 @@ u3qc_pin(u3_atom a, u3_atom b) c_w = b_w - a_w; if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { - return __(a == (b >> (b_w - a_w))); + return __(a == (b >> c_w)); } else { u3_atom c, d, e; - c = u3i_word(b_w - a_w); + c = u3i_word(c_w); d = u3qc_rsh(0, c, b); e = u3r_sing(a, d); From e1adbfbae9cf6610f279dae680a3be9771dafa91 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Wed, 17 May 2023 10:59:28 -0400 Subject: [PATCH 10/17] jets: corrects axis math in +hub --- pkg/noun/jets/c/hub.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/noun/jets/c/hub.c b/pkg/noun/jets/c/hub.c index c4bf6e4726..80214754d7 100644 --- a/pkg/noun/jets/c/hub.c +++ b/pkg/noun/jets/c/hub.c @@ -18,12 +18,16 @@ u3qc_hub(u3_atom a, u3_atom b) c_w = b_w - a_w; if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { + c3_w d_w; + if ( a != (b >> c_w) ) return u3m_bail(c3__exit); - return b & ((1 << c_w) - 1); + d_w = 1 << c_w; + + return (b & (d_w - 1)) | d_w; } else { - u3_atom c, d, e, f, g; + u3_atom c, d, e, f, g, h; c = u3i_word(c_w); d = u3qc_rsh(0, c, b); @@ -33,13 +37,15 @@ u3qc_hub(u3_atom a, u3_atom b) e = u3qc_bex(c); f = u3qa_dec(e); g = u3qc_dis(b, f); + h = u3qc_con(g, e); u3z(c); u3z(d); u3z(e); u3z(f); + u3z(g); - return g; + return h; } } From 2d696e3bf570e3b7b442dc73fea601e2f50649c7 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sat, 7 Oct 2023 13:54:42 -0400 Subject: [PATCH 11/17] Revert "jets: adds +hub, +pin" This reverts commit b256c87f6ddf9ba42d983b39a9200e63027e5b7a. --- pkg/noun/jets/c/hub.c | 67 ------------------------------------------- pkg/noun/jets/c/pin.c | 54 ---------------------------------- pkg/noun/jets/q.h | 2 -- pkg/noun/jets/w.h | 2 -- 4 files changed, 125 deletions(-) delete mode 100644 pkg/noun/jets/c/hub.c delete mode 100644 pkg/noun/jets/c/pin.c diff --git a/pkg/noun/jets/c/hub.c b/pkg/noun/jets/c/hub.c deleted file mode 100644 index 80214754d7..0000000000 --- a/pkg/noun/jets/c/hub.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "jets/q.h" -#include "jets/w.h" - -#include "noun.h" - -u3_noun -u3qc_hub(u3_atom a, u3_atom b) -{ - c3_w a_w, b_w, c_w; - - if ( 1 == a ) return u3k(b); - - a_w = u3r_met(0, a); - b_w = u3r_met(0, b); - - if ( b_w < a_w ) return u3m_bail(c3__exit); - - c_w = b_w - a_w; - - if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { - c3_w d_w; - - if ( a != (b >> c_w) ) return u3m_bail(c3__exit); - - d_w = 1 << c_w; - - return (b & (d_w - 1)) | d_w; - } - else { - u3_atom c, d, e, f, g, h; - - c = u3i_word(c_w); - d = u3qc_rsh(0, c, b); - - if ( c3n == u3r_sing(a, d) ) return u3m_bail(c3__exit); - - e = u3qc_bex(c); - f = u3qa_dec(e); - g = u3qc_dis(b, f); - h = u3qc_con(g, e); - - u3z(c); - u3z(d); - u3z(e); - u3z(f); - u3z(g); - - return h; - } -} - -u3_noun -u3wc_hub(u3_noun cor) -{ - u3_noun a, b; - if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) - || (0 == a) - || (0 == b) - || (c3n == u3ud(b)) - || (c3n == u3ud(a) && b != 1) ) - { - return u3m_bail(c3__exit); - } - else { - return u3qc_hub(a, b); - } -} diff --git a/pkg/noun/jets/c/pin.c b/pkg/noun/jets/c/pin.c deleted file mode 100644 index 33d608f096..0000000000 --- a/pkg/noun/jets/c/pin.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "jets/q.h" -#include "jets/w.h" - -#include "noun.h" - -u3_noun -u3qc_pin(u3_atom a, u3_atom b) -{ - c3_w a_w, b_w, c_w; - - if ( 1 == a ) return c3y; - if ( 1 == b ) return c3n; - - a_w = u3r_met(0, a); - b_w = u3r_met(0, b); - - if ( b_w < a_w ) return c3n; - - c_w = b_w - a_w; - - if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { - return __(a == (b >> c_w)); - } - else { - u3_atom c, d, e; - - c = u3i_word(c_w); - d = u3qc_rsh(0, c, b); - e = u3r_sing(a, d); - - u3z(c); - u3z(d); - - return e; - } -} - -u3_noun -u3wc_pin(u3_noun cor) -{ - u3_noun a, b; - - if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) - || (0 == a) - || (0 == b) - || (c3n == u3ud(b)) - || (c3n == u3ud(a)) ) - { - return u3m_bail(c3__exit); - } - else { - return u3qc_pin(a, b); - } -} diff --git a/pkg/noun/jets/q.h b/pkg/noun/jets/q.h index 8a6cb15be7..e9c8bfd9b3 100644 --- a/pkg/noun/jets/q.h +++ b/pkg/noun/jets/q.h @@ -57,7 +57,6 @@ u3_noun u3qc_dvr(u3_atom, u3_atom); u3_noun u3qc_end(u3_atom, u3_atom, u3_atom); u3_noun u3qc_gor(u3_atom, u3_atom); - u3_noun u3qc_hub(u3_atom, u3_atom); u3_noun u3qc_lsh(u3_atom, u3_atom, u3_atom); u3_noun u3qc_mas(u3_atom); u3_noun u3qc_met(u3_atom, u3_atom); @@ -65,7 +64,6 @@ u3_noun u3qc_mor(u3_atom, u3_atom); u3_noun u3qc_muk(u3_atom, u3_atom, u3_atom); u3_noun u3qc_peg(u3_atom, u3_atom); - u3_noun u3qc_pin(u3_atom, u3_atom); u3_noun u3qc_pow(u3_atom, u3_atom); u3_noun u3qc_rap(u3_atom, u3_noun); u3_noun u3qc_rep(u3_atom, u3_atom, u3_noun); diff --git a/pkg/noun/jets/w.h b/pkg/noun/jets/w.h index df1d5c0fba..2898e0b6e6 100644 --- a/pkg/noun/jets/w.h +++ b/pkg/noun/jets/w.h @@ -58,7 +58,6 @@ u3_noun u3wc_dor(u3_noun); u3_noun u3wc_dvr(u3_noun); u3_noun u3wc_end(u3_noun); - u3_noun u3wc_hub(u3_noun); u3_noun u3wc_gor(u3_noun); u3_noun u3wc_lsh(u3_noun); u3_noun u3wc_mas(u3_noun); @@ -68,7 +67,6 @@ u3_noun u3wc_mug(u3_noun); u3_noun u3wc_muk(u3_noun); u3_noun u3wc_peg(u3_noun); - u3_noun u3wc_pin(u3_noun); u3_noun u3wc_pow(u3_noun); u3_noun u3wc_rap(u3_noun); u3_noun u3wc_rep(u3_noun); From de74b2552173934606ca0c0c500db5141d940ae0 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sat, 7 Oct 2023 18:13:06 -0400 Subject: [PATCH 12/17] u3: further optimizes +peg jet --- pkg/noun/jets/c/peg.c | 50 +++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pkg/noun/jets/c/peg.c b/pkg/noun/jets/c/peg.c index cc39a1022b..a700752e28 100644 --- a/pkg/noun/jets/c/peg.c +++ b/pkg/noun/jets/c/peg.c @@ -6,33 +6,47 @@ u3_noun u3qc_peg(u3_atom a, u3_atom b) { - if ( 1 == b ) { + if ( (0 == a) || (0 == b) ) { + return u3m_bail(c3__exit); + } + else if ( 1 == b ) { return u3k(a); } - c3_w c_w = u3r_met(0, b) - 1; + c3_d a_d, b_d; + c3_w c_w; - if ( (c3y == u3a_is_cat(a) && (c3y == u3a_is_cat(b))) ) { - c3_w d_w = b - (1 << c_w); - c3_d e_d = (c3_d)a << c_w; - return u3i_chub(d_w + e_d); + if ( (c3y == u3a_is_cat(a)) && (c3y == u3a_is_cat(b)) ) { + c_w = c3_bits_word(b) - 1; + a_d = a; + b_d = b; } else { - u3_atom d, e, f, g, h; + c3_w d_w = u3r_met(0, a); + c3_d e_d; + + c_w = u3r_met(0, b) - 1; + e_d = (c3_d)c_w + d_w; - d = u3i_word(c_w); - e = u3qc_lsh(0, d, 1); - f = u3qa_sub(b, e); - g = u3qc_lsh(0, d, a); - h = u3qa_add(f, g); + if ( 64 <= e_d ) { + u3i_slab sab_u; + u3i_slab_init(&sab_u, 0, e_d); - u3z(d); - u3z(e); - u3z(f); - u3z(g); + u3r_chop(0, 0, c_w, 0, sab_u.buf_w, b); + u3r_chop(0, 0, d_w, c_w, sab_u.buf_w, a); - return h; + return u3i_slab_moot(&sab_u); + } + + a_d = u3r_chub(0, a); + b_d = u3r_chub(0, b); } + + b_d &= ((c3_d)1 << c_w) - 1; + a_d <<= c_w; + a_d ^= b_d; + + return u3i_chub(a_d); } u3_noun @@ -41,8 +55,6 @@ u3wc_peg(u3_noun cor) u3_noun a, b; if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) || - (0 == a) || - (0 == b) || (c3n == u3ud(b)) || (c3n == u3ud(a) && b != 1) ) { From b58e4c7d7d6665bde9edb4877305f71c4595fc3c Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sat, 7 Oct 2023 17:37:27 -0400 Subject: [PATCH 13/17] u3: further optimizes +mas jet --- pkg/noun/jets/c/mas.c | 53 +++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pkg/noun/jets/c/mas.c b/pkg/noun/jets/c/mas.c index 4d5f0e45ca..622def2119 100644 --- a/pkg/noun/jets/c/mas.c +++ b/pkg/noun/jets/c/mas.c @@ -7,40 +7,43 @@ u3_noun u3qc_mas(u3_atom a) { c3_w b_w; - u3_atom c, d, e, f; - b_w = u3r_met(0, a); - if ( b_w < 2 ) { - return u3m_bail(c3__exit); - } - else if ( c3y == u3a_is_cat(a) ) { - return (a - (1 << (b_w - 1))) | (1 << (b_w - 2)); + if ( c3y == u3a_is_cat(a) ) { + b_w = c3_bits_word(a); + + if ( 2 > b_w ) { + return u3m_bail(c3__exit); + } + else { + a &= ~((c3_w)1 << (b_w - 1)); + a |= ((c3_w)1 << (b_w - 2)); + return a; + } } else { - c = u3qc_bex(u3i_word(b_w - 1)); - d = u3qc_bex(u3i_word(b_w - 2)); - e = u3qa_sub(a, c); - f = u3qc_con(e, d); + b_w = u3r_met(0, a); - u3z(c); - u3z(d); - u3z(e); + if ( 64 > b_w ) { + c3_d a_d = u3r_chub(0, a); + a_d &= ~((c3_d)1 << (b_w - 1)); + a_d |= ((c3_d)1 << (b_w - 2)); + return u3i_chub(a_d); + } + else { + u3i_slab sab_u; + u3i_slab_from(&sab_u, a, 0, --b_w); - return f; + sab_u.buf_w[(b_w >> 5)] &= ((c3_w)1 << (b_w & 31)) - 1; + b_w--; + sab_u.buf_w[(b_w >> 5)] |= ((c3_w)1 << (b_w & 31)); + + return u3i_slab_mint(&sab_u); + } } } u3_noun u3wc_mas(u3_noun cor) { - u3_noun a; - - if ( (u3_none == (a = u3r_at(u3x_sam, cor))) || - (c3n == u3ud(a)) ) - { - return u3m_bail(c3__exit); - } - else { - return u3qc_mas(a); - } + return u3qc_mas(u3x_atom(u3x_at(u3x_sam, cor))); } From 562bfac536c3ba3366afacf23c932cbc0356b60b Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 13 Oct 2023 20:50:12 -0400 Subject: [PATCH 14/17] u3: refactors +cap jet --- pkg/noun/jets/c/cap.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/pkg/noun/jets/c/cap.c b/pkg/noun/jets/c/cap.c index c7edfbeb2e..95bef1fe95 100644 --- a/pkg/noun/jets/c/cap.c +++ b/pkg/noun/jets/c/cap.c @@ -5,32 +5,21 @@ #include "noun.h" +u3_noun +u3qc_cap(u3_atom a) +{ + c3_w met_w = u3r_met(0, a); - u3_noun - u3qc_cap(u3_atom a) - { - c3_w met_w = u3r_met(0, a); - - if ( met_w < 2 ) { - return u3m_bail(c3__exit); - } - else if ( (1 == u3r_bit((met_w - 2), a)) ) { - return 3; - } else { - return 2; - } + if ( 2 > met_w ) { + return u3m_bail(c3__exit); } - u3_noun - u3wc_cap(u3_noun cor) - { - u3_noun a; - - if ( (u3_none == (a = u3r_at(u3x_sam, cor))) || - (c3n == u3ud(a)) ) - { - return u3m_bail(c3__exit); - } else { - return u3qc_cap(a); - } + else { + return 2 + u3r_bit((met_w - 2), a); } +} +u3_noun +u3wc_cap(u3_noun cor) +{ + return u3qc_cap(u3x_atom(u3x_at(u3x_sam, cor))); +} From 45f30fcaa1e32eebf199f6009ff12aca6079151c Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 10 Nov 2023 23:48:28 -0500 Subject: [PATCH 15/17] u3: updates u3i_slab_from() to truncate bitwise --- pkg/noun/imprison.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/noun/imprison.c b/pkg/noun/imprison.c index 1ff8200790..143878e48e 100644 --- a/pkg/noun/imprison.c +++ b/pkg/noun/imprison.c @@ -149,6 +149,21 @@ u3i_slab_from(u3i_slab* sab_u, u3_atom a, c3_g met_g, c3_d len_d) // copies [a], zero-initializes any additional space // u3r_words(0, sab_u->len_w, sab_u->buf_w, a); + + // if necessary, mask off extra most-significant bits + // from most-significant word + // + if ( (5 > met_g) && (u3r_met(5, a) >= sab_u->len_w) ) { + // NB: overflow already checked in _ci_slab_size() + // + c3_d bit_d = len_d << met_g; + c3_w wor_w = bit_d >> 5; + c3_w bit_w = bit_d & 0x1f; + + if ( bit_w ) { + sab_u->buf_w[wor_w] &= ((c3_w)1 << bit_w) - 1; + } + } } /* u3i_slab_grow(): resize slab, zero-initializing new space. From 817fac493d81478f21a9b7168fce27cfe4a36c4a Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 10 Nov 2023 23:49:06 -0500 Subject: [PATCH 16/17] u3: updates +mas jet to depend on slab truncation --- pkg/noun/jets/c/mas.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/noun/jets/c/mas.c b/pkg/noun/jets/c/mas.c index 622def2119..b0be6e1ae1 100644 --- a/pkg/noun/jets/c/mas.c +++ b/pkg/noun/jets/c/mas.c @@ -31,10 +31,9 @@ u3qc_mas(u3_atom a) } else { u3i_slab sab_u; - u3i_slab_from(&sab_u, a, 0, --b_w); + u3i_slab_from(&sab_u, a, 0, b_w - 1); - sab_u.buf_w[(b_w >> 5)] &= ((c3_w)1 << (b_w & 31)) - 1; - b_w--; + b_w -= 2; sab_u.buf_w[(b_w >> 5)] |= ((c3_w)1 << (b_w & 31)); return u3i_slab_mint(&sab_u); From c64d626f23aae0b470d28480a0ec45f82c4e07f6 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 10 Nov 2023 23:49:31 -0500 Subject: [PATCH 17/17] tests: adds trivial +mas jet tests --- pkg/noun/jets_tests.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/pkg/noun/jets_tests.c b/pkg/noun/jets_tests.c index 257ec81e3b..222b31afbf 100644 --- a/pkg/noun/jets_tests.c +++ b/pkg/noun/jets_tests.c @@ -860,6 +860,71 @@ _test_ob(void) return ret_i; } +static c3_i +_test_mas(void) +{ + c3_i ret_i = 1; + u3_atom res; + + if ( 0x4000 != (res = u3qc_mas(0x8000)) ) { + fprintf(stderr, "test mas fail: (mas 0x8000) != 0x4000: 0x'%x'\r\n", res); + ret_i = 0; + } + + if ( 0x20000000 != (res = u3qc_mas(0x40000000)) ) { + fprintf(stderr, "test mas fail: (mas 0x4000.0000) != 0x2000.0000: 0x%x\r\n", res); + ret_i = 0; + } + + { + u3_atom sam, pro; + + sam = u3qc_bex(36); + pro = u3qc_bex(35); + res = u3qc_mas(sam); + + if ( c3n == u3r_sing(pro, res) ) { + c3_c* out_c; + u3s_etch_ux_c(res, &out_c); + fprintf(stderr, "test mas fail: (mas (bex 36)) != (bex 35): %s\r\n", out_c); + c3_free(out_c); + ret_i = 0; + } + + u3z(res); u3z(sam); u3z(pro); + + sam = u3qc_bex(64); + pro = u3qc_bex(63); + res = u3qc_mas(sam); + + if ( c3n == u3r_sing(pro, res) ) { + c3_c* out_c; + u3s_etch_ux_c(res, &out_c); + fprintf(stderr, "test mas fail: (mas (bex 64)) != (bex 63): %s\r\n", out_c); + c3_free(out_c); + ret_i = 0; + } + + u3z(res); u3z(sam); u3z(pro); + + sam = u3qc_bex(65); + pro = u3qc_bex(64); + res = u3qc_mas(sam); + + if ( c3n == u3r_sing(pro, res) ) { + c3_c* out_c; + u3s_etch_ux_c(res, &out_c); + fprintf(stderr, "test mas fail: (mas (bex 65)) != (bex 64): %s\r\n", out_c); + c3_free(out_c); + ret_i = 0; + } + + u3z(res); u3z(sam); u3z(pro); + } + + return ret_i; +} + static c3_i _test_jets(void) { @@ -900,6 +965,11 @@ _test_jets(void) ret_i = 0; } + if ( !_test_mas() ) { + fprintf(stderr, "test jets: mas: failed\r\n"); + ret_i = 0; + } + return ret_i; }