urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 13:54:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:urbit/urbit

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-04-21 10:02:34 -07:00
commit 72843c8955
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
f/loom.c
View File

@ -1733,6 +1733,7 @@ u2_chop(c3_g met_g,
u2_atom src) u2_atom src)
{ {
c3_w i_w; c3_w i_w;
c3_w len_w = (u2_fly_is_cat(src) ? 1 : *u2_at_pug_len(src));
c3_assert(u2_none != src); c3_assert(u2_none != src);
c3_assert(u2_fly_is_atom(src)); c3_assert(u2_fly_is_atom(src));
@ -1752,7 +1753,7 @@ u2_chop(c3_g met_g,
c3_g rat_g = (bat_w & 31); c3_g rat_g = (bat_w & 31);
c3_w hop_w; c3_w hop_w;
hop_w = u2_atom_word(src, waf_w); hop_w = (waf_w >= len_w) ? 0 : u2_atom_word(src, waf_w);
hop_w = (hop_w >> raf_g) & mek_w; hop_w = (hop_w >> raf_g) & mek_w;
*u2_at_ray(dst_r + wat_w) ^= (hop_w << rat_g); *u2_at_ray(dst_r + wat_w) ^= (hop_w << rat_g);
@ -1762,7 +1763,6 @@ u2_chop(c3_g met_g,
} }
} }
else { else {
c3_w len_w = (u2_fly_is_cat(src) ? 1 : *u2_at_pug_len(src));
c3_g hut_g = (met_g - 5); c3_g hut_g = (met_g - 5);
c3_w san_w = (1 << hut_g); c3_w san_w = (1 << hut_g);
c3_w j_w; c3_w j_w;

3
v/main.c
View File

@ -187,6 +187,9 @@ _main_getopt(c3_i argc, c3_c** argv)
} }
} }
} }
printf("≜\n");
printf("welcome.\n");
printf("vere: hostname is %s\n", u2_Host.ops_u.nam_c); printf("vere: hostname is %s\n", u2_Host.ops_u.nam_c);
if ( argc != (optind + 1) ) { if ( argc != (optind + 1) ) {

10
v/sist.c
View File

@ -998,7 +998,15 @@ _sist_rest(u2_reck* rec_u)
// Nothing in the log that was not also in the checkpoint. // Nothing in the log that was not also in the checkpoint.
// //
c3_assert(rec_u->ent_w == old_w); c3_assert(rec_u->ent_w == old_w);
c3_assert((las_w + 1) == old_w); //c3_assert((las_w + 1) == old_w);
if ( las_w + 1 != old_w ) {
uL(fprintf(uH, "checkpoint and log disagree! las:%u old:%u\n",
las_w + 1, old_w));
uL(fprintf(uH, "Some events appear to be missing from the log.\n"
"Please contact the authorities, "
"and do not delete your pier!\n"));
u2_lo_bail(rec_u);
}
} }
else { else {
u2_noun rou = roe; u2_noun rou = roe;