urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-25 13:04:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'frodwith/nomugbuf', 'torchhound/torchhound', 'freekh/master' and 'davis68/master'

Browse Source 
remove code duplication (_mug_words_buf)
Fix 64-bit comet typo in README.md
Fix #735: misleading indent compile error on gcc 6
Change readme to refer to HTTP instead of HTTPS.
This commit is contained in:
Raymond Pasco 2016-06-02 13:24:29 -04:00
commit df9c782bb1
3 changed files with 9 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -89,7 +89,7 @@ Once your dependencies are installed the rest is easy:
git clone https://github.com/urbit/urbit
cd urbit
make
curl -o urbit.pill https://bootstrap.urbit.org/latest.pill
curl -o urbit.pill http://bootstrap.urbit.org/latest.pill
After running `make`, your Urbit executable lives at `bin/urbit`. The `.pill` file is a compiled binary of Arvo that Urbit uses to bootstrap itself.
@ -111,7 +111,7 @@ Without a planet anyone can create a comet:
bin/urbit -c comet
This will create a directory `comet/` and start up a random 64-bit comet. You can specify any name you like.
This will create a directory `comet/` and start up a random 128-bit comet. You can specify any name you like.
## Orientation

8
noun/allocate.c
View File

@ -715,7 +715,9 @@ _me_wash_north(u3_noun dog)
{
u3a_noun* dog_u = u3a_to_ptr(dog);
if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash
if ( dog_u->mug_w == 0 ) return;
dog_u->mug_w = 0; // power wash
// if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; }
if ( _(u3a_is_pom(dog)) ) {
@ -746,7 +748,9 @@ _me_wash_south(u3_noun dog)
{
u3a_noun* dog_u = u3a_to_ptr(dog);
if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash
if ( dog_u->mug_w == 0 ) return;
dog_u->mug_w = 0; // power wash
// if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; }
if ( _(u3a_is_pom(dog)) ) {

64
noun/retrieve.c
View File

@ -260,54 +260,6 @@ _mug_bytes(c3_w off_w, c3_w nby_w, const c3_y* byt_y)
}
}
static __inline__ c3_w
_mug_words_in_buf(c3_w off_w, c3_w nwd_w, u3_noun veb)
{
u3a_atom* veb_u = u3a_to_ptr(veb);
if ( 0 == nwd_w ) {
return off_w;
} else {
c3_w i_w, x_w;
for ( i_w = 0; i_w < (nwd_w - 1); i_w++ ) {
x_w = veb_u->buf_w[i_w];
{
c3_y a_y = (x_w & 0xff);
c3_y b_y = ((x_w >> 8) & 0xff);
c3_y c_y = ((x_w >> 16) & 0xff);
c3_y d_y = ((x_w >> 24) & 0xff);
off_w = _mug_fnv(off_w ^ a_y);
off_w = _mug_fnv(off_w ^ b_y);
off_w = _mug_fnv(off_w ^ c_y);
off_w = _mug_fnv(off_w ^ d_y);
}
}
x_w = veb_u->buf_w[nwd_w - 1];
if ( x_w ) {
off_w = _mug_fnv(off_w ^ (x_w & 0xff));
x_w >>= 8;
if ( x_w ) {
off_w = _mug_fnv(off_w ^ (x_w & 0xff));
x_w >>= 8;
if ( x_w ) {
off_w = _mug_fnv(off_w ^ (x_w & 0xff));
x_w >>= 8;
if ( x_w ) {
off_w = _mug_fnv(off_w ^ (x_w & 0xff));
}
}
}
}
}
return off_w;
}
static __inline__ c3_w
_mug_words_in(c3_w off_w, c3_w nwd_w, const c3_w* wod_w)
{
@ -368,20 +320,6 @@ _mug_words(c3_w off_w, c3_w nwd_w, const c3_w* wod_w)
}
}
static c3_w
_mug_words_buf(c3_w off_w, c3_w nwd_w, u3_noun veb)
{
c3_w has_w = _mug_words_in_buf(off_w, nwd_w, veb);
c3_w out_w = _mug_out(has_w);
if ( 0 != out_w ) {
return out_w;
}
else {
return _mug_words_buf(++off_w, nwd_w, veb);
}
}
/* u3r_mug():
**
** Compute and/or recall the mug (31-bit FNV1a hash) of (a).
@ -414,7 +352,7 @@ u3r_mug(u3_noun veb)
u3a_atom* veb_u = u3a_to_ptr(veb);
c3_w len_w = veb_u->len_w;
veb_u->mug_w = _mug_words_buf(2166136261U, len_w, veb);
veb_u->mug_w = _mug_words(2166136261U, len_w, veb_u->buf_w);
return veb_u->mug_w;
}
}