diff --git a/pkg/noun/allocate.h b/pkg/noun/allocate.h index 15e8883660..b9b04c1fd4 100644 --- a/pkg/noun/allocate.h +++ b/pkg/noun/allocate.h @@ -286,7 +286,7 @@ STATIC_ASSERT( u3a_vits <= u3a_min_log, /* u3a_is_north(): yes if road [r] is north road. */ -# define u3a_is_north(r) __((r)->cap_p > (r)->hat_p) +# define u3a_is_north(r) __((r)->mat_p > (r)->rut_p) /* u3a_is_south(): yes if road [r] is south road. */ diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c index c7e4e7e227..ae6b4517c5 100644 --- a/pkg/noun/manage.c +++ b/pkg/noun/manage.c @@ -398,9 +398,7 @@ _cm_signal_deep(void) // go utterly haywire. // if ( 0 == u3H->rod_u.bug.mer ) { - u3H->rod_u.bug.mer = u3i_string( - "emergency buffer with sufficient space to cons the trace and bail" - ); + u3H->rod_u.bug.mer = u3i_tape("emergency buffer"); } u3t_boot(); @@ -1217,13 +1215,12 @@ u3m_hate(c3_w pad_w) c3_w fag_w = u3R->how.fag_w; u3m_leap(pad_w); + u3R->bug.mer = u3i_tape("emergency buffer"); + // inherit forward-flowing flags // u3R->how.fag_w |= (fag_w & u3a_flag_cash); - u3R->bug.mer = u3i_string( - "emergency buffer with sufficient space to cons the trace and bail" - ); } // RETAINS `now`. diff --git a/pkg/vere/melt.c b/pkg/vere/melt.c index abc939f3ab..d2460efad8 100644 --- a/pkg/vere/melt.c +++ b/pkg/vere/melt.c @@ -165,6 +165,8 @@ u3_melt_all(FILE *fil_u) // u3_assert( &(u3H->rod_u) == u3R ); + u3z(u3H->rod_u.bug.mer); + can_u.siz_w = 32; can_u.tac = c3_malloc(sizeof(*can_u.tac) * can_u.siz_w); @@ -194,6 +196,8 @@ u3_melt_all(FILE *fil_u) c3_free(can_u.tac); + u3H->rod_u.bug.mer = u3i_tape("emergency buffer"); + return u3a_idle(u3R) - pre_w; }