u3: updates +muk to truncate seed and removes spurious assertion
/* functions
*/
u3_noun
-u3qc_muk(u3_atom seed,
+u3qc_muk(u3_atom sed,
u3_atom len,
u3_atom key)
{
+ if ( c3n == u3a_is_cat(len) ) {
+ return u3m_bail(c3__fail);
+ }
+ else {
+ c3_w len_w = (c3_w)len;
c3_w key_w = u3r_met(3, key);
- // XX revisit
- //
- // the first two conditions are explicitly asserted in +muk;
- // the third is implicit in the pad subtraction.
- //
- // the first assertion is semantically required for murmur32,
- // the latter two are particular to our hoon implementation.
- //
- // +muk (via +mug) is routinely "called" on samples that
- // violate these assertions.
- // are all three necessary for the rest of +muk to be correct?
+ // NB: this condition is implicit in the pad subtraction
//
- if ( (u3r_met(5, seed) > 1) ||
- (u3r_met(0, len) > 31) ||
- (key_w > len) )
- {
+ if ( key_w > len_w ) {
return u3m_bail(c3__exit);
}
else {
- c3_w seed_w = u3r_word(0, seed);
- c3_w len_w = u3r_word(0, len);
+ c3_w sed_w = u3r_word(0, sed);
c3_o loc_o = c3n;
c3_y* key_y = 0;
c3_w out_w;
@@ -47,12 +38,14 @@ u3qc_muk(u3_atom seed,
u3r_bytes(0, len_w, key_y, key);
}
else if ( len_w > 0 ) {
+ // XX assumes little-endian
+ //
key_y = ( c3y == u3a_is_cat(key) )
? (c3_y*)&key
: (c3_y*)((u3a_atom*)u3a_to_ptr(key))->buf_w;
}
- MurmurHash3_x86_32(key_y, len_w, seed_w, &out_w);
+ MurmurHash3_x86_32(key_y, len_w, sed_w, &out_w);
if ( c3y == loc_o ) {
u3a_free(key_y);
@@ -61,22 +54,23 @@ u3qc_muk(u3_atom seed,
return u3i_words(1, &out_w);
}
}
+}
u3_noun
u3wc_muk(u3_noun cor)
{
- u3_noun seed, len, key;
-
- if ( (c3n == u3r_mean(cor, u3x_sam_2, &seed,
+ u3_noun sed, len, key;
+ u3x_mean(cor, u3x_sam_2, &sed,
u3x_sam_6, &len,
- u3x_sam_7, &key, 0)) ||
- (c3n == u3ud(seed)) ||
- (c3n == u3ud(len)) ||
- (c3n == u3ud(key)) )
+ u3x_sam_7, &key, 0);
+
+ if ( (c3n == u3ud(sed))
+ || (c3n == u3ud(len))
+ || (c3n == u3ud(key)) )
{
return u3m_bail(c3__exit);
}
else {
- return u3qc_muk(seed, len, key);
+ return u3qc_muk(sed, len, key);
}
}
