| ... | ... | @@ -33,16 +33,11 @@ fn mix1(a: u64, b: u64, seed: u64) u64 { |
| 33 | 33 | |
| 34 | 34 | pub const Wyhash = struct { |
| 35 | 35 | seed: u64, |
| 36 | | |
| 37 | | buf: [32]u8, |
| 38 | | buf_len: usize, |
| 39 | 36 | msg_len: usize, |
| 40 | 37 | |
| 41 | 38 | pub fn init(seed: u64) Wyhash { |
| 42 | 39 | return Wyhash{ |
| 43 | 40 | .seed = seed, |
| 44 | | .buf = undefined, |
| 45 | | .buf_len = 0, |
| 46 | 41 | .msg_len = 0, |
| 47 | 42 | }; |
| 48 | 43 | } |
| ... | ... | @@ -61,34 +56,12 @@ pub const Wyhash = struct { |
| 61 | 56 | ); |
| 62 | 57 | } |
| 63 | 58 | |
| 64 | | pub fn update(self: *Wyhash, b: []const u8) void { |
| 65 | | var off: usize = 0; |
| 66 | | |
| 67 | | // Partial from previous. |
| 68 | | if (self.buf_len != 0 and self.buf_len + b.len > 32) { |
| 69 | | off += 32 - self.buf_len; |
| 70 | | mem.copy(u8, self.buf[self.buf_len..], b[0..off]); |
| 71 | | self.round(self.buf[0..]); |
| 72 | | self.buf_len = 0; |
| 73 | | } |
| 74 | | |
| 75 | | // Full middle blocks. |
| 76 | | while (off + 32 <= b.len) : (off += 32) { |
| 77 | | @inlineCall(self.round, b[off .. off + 32]); |
| 78 | | } |
| 79 | | |
| 80 | | // Remainder for next pass. |
| 81 | | mem.copy(u8, self.buf[self.buf_len..], b[off..]); |
| 82 | | self.buf_len += @intCast(u8, b[off..].len); |
| 83 | | self.msg_len += b.len; |
| 84 | | } |
| 85 | | |
| 86 | | pub fn final(self: *Wyhash) u64 { |
| 87 | | const seed = self.seed; |
| 88 | | const rem_len = @intCast(u5, self.buf_len); |
| 89 | | const rem_key = self.buf[0..self.buf_len]; |
| 59 | fn partial(self: *Wyhash, b: []const u8) void { |
| 60 | const rem_key = b; |
| 61 | const rem_len = b.len; |
| 90 | 62 | |
| 91 | | self.seed = switch (rem_len) { |
| 63 | var seed = self.seed; |
| 64 | seed = switch (@intCast(u5, rem_len)) { |
| 92 | 65 | 0 => seed, |
| 93 | 66 | 1 => mix0(read_bytes(1, rem_key), primes[4], seed), |
| 94 | 67 | 2 => mix0(read_bytes(2, rem_key), primes[4], seed), |
| ... | ... | @@ -122,7 +95,22 @@ pub const Wyhash = struct { |
| 122 | 95 | 30 => mix0(read_8bytes_swapped(rem_key), read_8bytes_swapped(rem_key[8..]), seed) ^ mix1(read_8bytes_swapped(rem_key[16..]), (read_bytes(4, rem_key[24..]) << 16) | read_bytes(2, rem_key[28..]), seed), |
| 123 | 96 | 31 => mix0(read_8bytes_swapped(rem_key), read_8bytes_swapped(rem_key[8..]), seed) ^ mix1(read_8bytes_swapped(rem_key[16..]), (read_bytes(4, rem_key[24..]) << 24) | (read_bytes(2, rem_key[28..]) << 8) | read_bytes(1, rem_key[30..]), seed), |
| 124 | 97 | }; |
| 98 | self.seed = seed; |
| 99 | } |
| 100 | |
| 101 | pub fn update(self: *Wyhash, b: []const u8) void { |
| 102 | var off: usize = 0; |
| 103 | |
| 104 | // Full middle blocks. |
| 105 | while (off + 32 <= b.len) : (off += 32) { |
| 106 | @inlineCall(self.round, b[off .. off + 32]); |
| 107 | } |
| 125 | 108 | |
| 109 | self.partial(b[off..]); |
| 110 | self.msg_len += b.len; |
| 111 | } |
| 112 | |
| 113 | pub fn final(self: *Wyhash) u64 { |
| 126 | 114 | return mum(self.seed ^ self.msg_len, primes[4]); |
| 127 | 115 | } |
| 128 | 116 | |
Sahnvour <sahnvour@pm.me> 2019-07-16 20:31:02+02:00