ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-24 02:24:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

More calx adjustments.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-11-18 10:56:28 -08:00
parent 2282f050f7
commit 23a0228e7f
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i/n/j.h
View File

@ -11,8 +11,8 @@
++ batt ,* :: battery
++ calf ::
$: jax=,@ud :: hot core index
pax=,@ud :: parent axis or 0
hap=(map ,@ud ,@ud) :: axis/hot arm index
ext=* :: arbitrary data
== ::
++ calx (trel calf cope club) :: cached by battery
++ clog (pair cope (map batt club)) :: identity record

13
n/j.c
View File

@ -432,7 +432,7 @@ _cj_warm_ream_be(c3_l jax_l,
{
u3h_put(u3R->jed.har_p,
bat,
u3nt(u3nt(jax_l, u3k(pax), _cj_warm_hump(jax_l, u3t(cub))),
u3nt(u3nt(jax_l, _cj_warm_hump(jax_l, u3t(cub)), u3_nul),
u3k(mop),
u3k(cub)));
}
@ -564,7 +564,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
if ( u3_none != cey ) {
u3_noun huc = u3t(u3t(cey));
u3_noun pax = u3h(u3t(cey));
// u3_noun pax = u3h(u3t(cey));
u3_noun mop;
if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) {
@ -573,7 +573,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
// fprintf(stderr, "warm: bat %x\r\n", u3r_mug(bat));
u3h_put(u3R->jed.har_p,
bat,
u3nt(u3nt(jax_l, u3k(pax), _cj_warm_hump(jax_l, huc)),
u3nt(u3nt(jax_l, _cj_warm_hump(jax_l, huc), u3_nul),
mop,
u3nc(u3_nul, u3k(huc))));
}
@ -725,14 +725,13 @@ _cj_hook_in(u3_noun cor,
if ( u3_none == cax ) { return u3m_bail(c3__fail); }
{
u3_noun p_cax, q_cax, r_cax;
u3_noun jax, pax, mop, huc, hap;
u3_noun jax, mop, huc, hap, ext;
u3_noun p_mop, q_mop, r_mop;
u3x_trel(cax, &p_cax, &q_cax, &r_cax);
u3x_trel(p_cax, &jax, &pax, &hap);
u3x_trel(p_cax, &jax, &hap, &ext);
mop = q_cax;
u3x_trel(mop, &p_mop, &q_mop, &r_mop);
c3_assert(pax == q_mop);
huc = u3t(r_cax);
{
@ -824,7 +823,7 @@ u3j_kick(u3_noun cor, u3_noun axe)
if ( u3_none == cax ) { return u3_none; }
{
u3_noun hap = u3t(u3t(u3h(cax)));
u3_noun hap = u3h(u3t(u3h(cax)));
u3_noun inx = u3kdb_get(u3k(hap), u3k(axe));
if ( u3_none == inx ) {