diff --git a/pkg/noun/v1/nock.c b/pkg/noun/v1/nock.c index 86aa07a921..fa996133f0 100644 --- a/pkg/noun/v1/nock.c +++ b/pkg/noun/v1/nock.c @@ -26,13 +26,6 @@ u3n_v1_reclaim(void) static void _cn_v1_prog_free(u3n_v1_prog* pog_u) { - // fix up pointers for loom portability - pog_u->byc_u.ops_y = (c3_y*) ((void*) pog_u) + sizeof(u3n_v1_prog); - pog_u->lit_u.non = (u3_noun*) (pog_u->byc_u.ops_y + pog_u->byc_u.len_w); - pog_u->mem_u.sot_u = (u3n_v1_memo*) (pog_u->lit_u.non + pog_u->lit_u.len_w); - pog_u->cal_u.sit_u = (u3j_v1_site*) (pog_u->mem_u.sot_u + pog_u->mem_u.len_w); - pog_u->reg_u.rit_u = (u3j_v1_rite*) (pog_u->cal_u.sit_u + pog_u->cal_u.len_w); - c3_w dex_w; for (dex_w = 0; dex_w < pog_u->lit_u.len_w; ++dex_w) { u3a_v1_lose(pog_u->lit_u.non[dex_w]); @@ -46,7 +39,6 @@ _cn_v1_prog_free(u3n_v1_prog* pog_u) for (dex_w = 0; dex_w < pog_u->reg_u.len_w; ++dex_w) { u3j_v1_rite_lose(&(pog_u->reg_u.rit_u[dex_w])); } - u3a_v1_free(pog_u); } diff --git a/pkg/noun/v1/vortex.h b/pkg/noun/v1/vortex.h index f6c0b223d6..84cf6e405c 100644 --- a/pkg/noun/v1/vortex.h +++ b/pkg/noun/v1/vortex.h @@ -8,8 +8,9 @@ /** Aliases. **/ -# define u3H_v1 u3H_v2 -# define u3A_v1 u3A_v2 +# define u3H_v1 u3H_v2 +# define u3A_v1 u3A_v2 +# define u3v_v1_home u3v_v2_home /** Functions. **/ diff --git a/pkg/noun/v2/manage.c b/pkg/noun/v2/manage.c index e361ffb2af..5175534803 100644 --- a/pkg/noun/v2/manage.c +++ b/pkg/noun/v2/manage.c @@ -151,7 +151,7 @@ u3m_v2_migrate() u3_assert( U3V_VER1 == ver_w ); c3_w* mem_w = u3_Loom + 1; - c3_w siz_w = c3_wiseof(u3v_v2_home); + c3_w siz_w = c3_wiseof(u3v_v1_home); c3_w* mat_w = (mem_w + len_w) - siz_w; u3H_v1 = (void *)mat_w;