urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 14:42:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'urbit/master' into newbreach

Browse Source 
Conflicts:
	urb/urbit.pill

Generate new pill.
This commit is contained in:
~hatteb-mitlyd 2014-05-09 13:26:22 -07:00
commit 3e869096b8
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gen164/5/rub.c
View File

@ -16,6 +16,8 @@
u2_atom w, x, y, z;
u2_atom p, q;
u2_atom m = j2_mbc(Pt1, add)(wir_r, a, u2_met(0, b));
// Compute c and d.
{
x = u2_rx(wir_r, a);
@ -23,6 +25,12 @@
while ( _0 == j2_mbc(Pt3, cut)(wir_r, _0, x, _1, b) ) {
u2_atom y = j2_mbc(Pt1, inc)(wir_r, x);
// Sanity check: crash if decoding more bits than available
if ( u2_yes == j2_mbc(Pt1, gth)(wir_r, x, m)) {
// fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m);
return u2_bl_bail(wir_r, c3__exit);
}
u2_rz(wir_r, x);
x = y;
}
@ -77,6 +85,6 @@
*/
u2_ho_jet
j2_mbj(Pt5, rub)[] = {
{ ".2", c3__hevy, j2_mb(Pt5, rub), Tier3, u2_none, u2_none },
{ ".2", c3__hevy, j2_mb(Pt5, rub), Tier5, u2_none, u2_none },
{ }
};

3
v/raft.c
View File

@ -1684,12 +1684,10 @@ u2_raft_work(u2_reck* rec_u)
if ( egg_u == rec_u->ova.geg_u ) {
c3_assert(egg_u->nex_u == 0);
rec_u->ova.geg_u = rec_u->ova.egg_u = 0;
free(egg_u);
}
else {
c3_assert(egg_u->nex_u != 0);
rec_u->ova.egg_u = egg_u->nex_u;
free(egg_u);
}
if ( u2_yes == egg_u->cit ) {
@ -1701,6 +1699,7 @@ u2_raft_work(u2_reck* rec_u)
uL(fprintf(uH, "vere: event executed but not persisted\n"));
c3_assert(0);
}
free(egg_u);
}
else break;
}