Skip to content

manage: new bail code, remove traps if discarding cold state #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dozreg-toplud wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

manage: new bail code, remove traps if discarding cold state #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa5b98
manage: new bail code, remove traps if discarding cold state
dozreg-toplud Mar 2, 2026
e170509
manage: _cm_stack_unwind simplify
dozreg-toplud Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/c3/motes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,7 @@
# define c3__site c3_s4('s','i','t','e')
# define c3__sith c3_s4('s','i','t','h')
# define c3__size c3_s4('s','i','z','e')
# define c3__skip c3_s4('s','k','i','p')
# define c3__slam c3_s4('s','l','a','m')
# define c3__slap c3_s4('s','l','a','p')
# define c3__slat c3_s4('s','l','a','t')
Expand Down
115 changes: 95 additions & 20 deletions pkg/noun/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,23 +277,22 @@ _cm_stack_recover(u3a_road* rod_u)
}
#endif

static u3_noun _skip_traps(u3_noun tax);

/* _cm_stack_unwind(): unwind to the top level, preserving all frames.
*/
static u3_noun
_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;
if ( u3R != &(u3H->rod_u) ) {
u3_noun yat = u3m_warm(_skip_traps(u3R->bug.tax));
u3R->bug.tax = u3kb_weld(yat, u3R->bug.tax);
}

while ( u3R != &(u3H->rod_u) ) {
u3_noun yat = u3m_love(u3R->bug.tax);
u3R->bug.tax = u3kb_weld(yat, u3R->bug.tax);
}
tax = u3R->bug.tax;
Expand Down Expand Up @@ -368,7 +367,7 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg)
#else
tax = _cm_stack_unwind();
#endif
pro = u3nt(3, sig_l, tax);
pro = u3nt(5, sig_l, tax);
_cm_signal_reset();

u3z(arg);
Expand Down Expand Up @@ -993,7 +992,7 @@ u3m_bail(u3_noun how)
} break;

default: {
how = u3nt(3, how, u3R->bug.tax);
how = u3nt(3, how, _skip_traps(u3R->bug.tax));
} break;
}
}
Expand Down Expand Up @@ -1375,6 +1374,56 @@ u3m_love(u3_noun pro)
return pro;
}

// RETAINS args
static u3_noun
_fall_mean(u3_noun som, u3_noun def)
{
u3_noun tag;
u3_assert(c3y == u3r_cell(som, &tag, NULL));
return ( c3__mean == tag ) ? u3k(def) : u3k(som);
}

static u3_noun*
_append_defcon(u3_noun* tel, u3_noun som)
{
u3_noun *i, *t;
*tel = u3i_defcons(&i, &t);
*i = som;
return t;
}

static u3_noun
_skip_traps(u3_noun tax)
{
c3_w tax_len = u3qb_lent(tax);
c3_w for_w = 0;
u3_noun tax_new, hed;
u3_noun* cur = &tax_new;
u3_noun def = u3nc(c3__mean, c3_s4('#', '#', '#', '#'));
while ( u3_nul != tax && for_w < 512 ) {
u3_assert(c3y == u3r_cell(tax, &hed, &tax));
for_w++;
cur = _append_defcon(cur, _fall_mean(hed, def));
}

u3_noun skip = u3nc(c3__mean, c3__skip);
while (tax_len - for_w > 512) {
u3_assert(c3y == u3r_cell(tax, &hed, &tax));
for_w++;
cur = _append_defcon(cur, u3k(skip));
}
u3z(skip);

while ( u3_nul != tax ) {
u3_assert(c3y == u3r_cell(tax, &hed, &tax));
cur = _append_defcon(cur, _fall_mean(hed, def));
}

*cur = u3_nul;
u3z(tax); u3z(def);
return tax_new;
}

/* u3m_warm(): return product from leap without promoting state
*/
u3_noun
Expand All @@ -1401,13 +1450,15 @@ u3m_pour(u3_noun why)
{
u3_assert(c3y == u3du(why));
switch (u3h(why)) {
case 0:
case 1: {
default: {
return u3m_love(why);
} break;

default: {
return u3m_warm(why);
case 3: {
why = u3m_warm(why);
u3_noun out = u3nc(5, u3k(u3t(why)));
u3z(why);
return out;
} break;
}
}
Expand Down Expand Up @@ -1672,11 +1723,20 @@ u3m_soft_cax(u3_funq fun_f,
pro = u3nc(u3m_love(why), u3_nul);
} break;

case 3: { // failure; rebail w/trace
case 3: { // failure on our road; rebail w/trace
u3_noun yod = u3m_warm(u3t(why));

u3m_bail
(u3nt(3,
(u3nt(5,
u3a_take(u3h(yod)),
u3kb_weld(u3t(yod), u3k(u3R->bug.tax))));
} break;

case 5: { // failure in child; rebail w/trace
u3_noun yod = u3m_love(u3t(why));

u3m_bail
(u3nt(5,
u3a_take(u3h(yod)),
u3kb_weld(u3t(yod), u3k(u3R->bug.tax))));
} break;
Expand Down Expand Up @@ -1775,18 +1835,27 @@ u3m_soft_run(u3_noun gul,
pro = u3m_love(why);
} break;

case 3: { // failure; rebail w/trace
case 3: { // failure on our road; rebail w/trace
u3_noun yod = u3m_warm(u3t(why));

u3m_bail
(u3nt(3,
(u3nt(5,
u3a_take(u3h(yod)),
u3kb_weld(u3t(yod), u3k(u3R->bug.tax))));
} break;

case 4: { // meta-bail
u3m_bail(u3m_pour(u3t(why)));
} break;

case 5: { // failure in the child road; rebail w/trace
u3_noun yod = u3m_love(u3t(why));

u3m_bail
(u3nt(5,
u3a_take(u3h(yod)),
u3kb_weld(u3t(yod), u3k(u3R->bug.tax))));
} break;
}
}
}
Expand Down Expand Up @@ -1921,10 +1990,16 @@ u3m_soft(c3_w mil_w,
cod = c3__exit;
tax = u3t(why);
} break;

case 3: {
cod = u3h(u3t(why));
tax = u3t(u3t(why));
u3_noun why_new = u3nt(5, u3k(cod), _skip_traps(u3k(tax)));
u3z(why);
why = why_new;
} // fallthrough
case 5: {
cod = u3h(u3t(why));
tax = u3t(u3t(why));
} break;

// don't use .^ at the top level!
Expand Down
5 changes: 5 additions & 0 deletions pkg/noun/manage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@
u3_noun
u3m_love(u3_noun pro);

/* u3m_warm(): return product from leap without promoting state.
*/
u3_noun
u3m_warm(u3_noun pro);

/* u3m_soft(): system soft wrapper. unifies unix and nock errors.
**
** Produces [%$ result] or [%error (list tank)].
Expand Down