diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 5adf8212..b905e778 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6359,6 +6359,10 @@ struct wuffs_crc32__ieee_hasher__struct { wuffs_base__vtable null_vtable; uint32_t f_state; + + wuffs_base__empty_struct (*choosy_up)( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x); } private_impl; #ifdef __cplusplus @@ -21691,6 +21695,23 @@ WUFFS_CRC32__IEEE_TABLE[16][256] WUFFS_BASE__POTENTIALLY_UNUSED = { // ---------------- Private Function Prototypes +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x); + +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up__choosy_default( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x); + +#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up_arm_crc32( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x); +#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) + // ---------------- VTables const wuffs_base__hasher_u32__func_ptrs @@ -21743,6 +21764,8 @@ wuffs_crc32__ieee_hasher__initialize( } } + self->private_impl.choosy_up = &wuffs_crc32__ieee_hasher__up__choosy_default; + self->private_impl.magic = WUFFS_BASE__MAGIC; self->private_impl.vtable_for__wuffs_base__hasher_u32.vtable_name = wuffs_base__hasher_u32__vtable_name; @@ -21796,6 +21819,30 @@ wuffs_crc32__ieee_hasher__update_u32( return 0; } + if (self->private_impl.f_state == 0) { + self->private_impl.choosy_up = ( +#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) + wuffs_base__cpu_arch__have_arm_crc32() ? &wuffs_crc32__ieee_hasher__up_arm_crc32 : +#endif + self->private_impl.choosy_up); + } + wuffs_crc32__ieee_hasher__up(self, a_x); + return self->private_impl.f_state; +} + +// -------- func crc32.ieee_hasher.up + +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x) { + return (*self->private_impl.choosy_up)(self, a_x); +} + +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up__choosy_default( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x) { uint32_t v_s = 0; wuffs_base__slice_u8 v_p = {0}; @@ -21883,9 +21930,107 @@ wuffs_crc32__ieee_hasher__update_u32( v_p.len = 0; } self->private_impl.f_state = (4294967295 ^ v_s); - return self->private_impl.f_state; + return wuffs_base__make_empty_struct(); } +// -------- func crc32.ieee_hasher.up_arm_crc32 + +#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) +static wuffs_base__empty_struct +wuffs_crc32__ieee_hasher__up_arm_crc32( + wuffs_crc32__ieee_hasher* self, + wuffs_base__slice_u8 a_x) { + uint32_t v_s = 0; + wuffs_base__slice_u8 v_p = {0}; + + v_s = (4294967295 ^ self->private_impl.f_state); + { + wuffs_base__slice_u8 i_slice_p = a_x; + v_p.ptr = i_slice_p.ptr; + v_p.len = 16; + uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 32) * 32); + while (v_p.ptr < i_end0_p) { + v_s ^= ((((uint32_t)(v_p.ptr[0])) << 0) | + (((uint32_t)(v_p.ptr[1])) << 8) | + (((uint32_t)(v_p.ptr[2])) << 16) | + (((uint32_t)(v_p.ptr[3])) << 24)); + v_s = (WUFFS_CRC32__IEEE_TABLE[0][v_p.ptr[15]] ^ + WUFFS_CRC32__IEEE_TABLE[1][v_p.ptr[14]] ^ + WUFFS_CRC32__IEEE_TABLE[2][v_p.ptr[13]] ^ + WUFFS_CRC32__IEEE_TABLE[3][v_p.ptr[12]] ^ + WUFFS_CRC32__IEEE_TABLE[4][v_p.ptr[11]] ^ + WUFFS_CRC32__IEEE_TABLE[5][v_p.ptr[10]] ^ + WUFFS_CRC32__IEEE_TABLE[6][v_p.ptr[9]] ^ + WUFFS_CRC32__IEEE_TABLE[7][v_p.ptr[8]] ^ + WUFFS_CRC32__IEEE_TABLE[8][v_p.ptr[7]] ^ + WUFFS_CRC32__IEEE_TABLE[9][v_p.ptr[6]] ^ + WUFFS_CRC32__IEEE_TABLE[10][v_p.ptr[5]] ^ + WUFFS_CRC32__IEEE_TABLE[11][v_p.ptr[4]] ^ + WUFFS_CRC32__IEEE_TABLE[12][(255 & (v_s >> 24))] ^ + WUFFS_CRC32__IEEE_TABLE[13][(255 & (v_s >> 16))] ^ + WUFFS_CRC32__IEEE_TABLE[14][(255 & (v_s >> 8))] ^ + WUFFS_CRC32__IEEE_TABLE[15][(255 & (v_s >> 0))]); + v_p.ptr += 16; + v_s ^= ((((uint32_t)(v_p.ptr[0])) << 0) | + (((uint32_t)(v_p.ptr[1])) << 8) | + (((uint32_t)(v_p.ptr[2])) << 16) | + (((uint32_t)(v_p.ptr[3])) << 24)); + v_s = (WUFFS_CRC32__IEEE_TABLE[0][v_p.ptr[15]] ^ + WUFFS_CRC32__IEEE_TABLE[1][v_p.ptr[14]] ^ + WUFFS_CRC32__IEEE_TABLE[2][v_p.ptr[13]] ^ + WUFFS_CRC32__IEEE_TABLE[3][v_p.ptr[12]] ^ + WUFFS_CRC32__IEEE_TABLE[4][v_p.ptr[11]] ^ + WUFFS_CRC32__IEEE_TABLE[5][v_p.ptr[10]] ^ + WUFFS_CRC32__IEEE_TABLE[6][v_p.ptr[9]] ^ + WUFFS_CRC32__IEEE_TABLE[7][v_p.ptr[8]] ^ + WUFFS_CRC32__IEEE_TABLE[8][v_p.ptr[7]] ^ + WUFFS_CRC32__IEEE_TABLE[9][v_p.ptr[6]] ^ + WUFFS_CRC32__IEEE_TABLE[10][v_p.ptr[5]] ^ + WUFFS_CRC32__IEEE_TABLE[11][v_p.ptr[4]] ^ + WUFFS_CRC32__IEEE_TABLE[12][(255 & (v_s >> 24))] ^ + WUFFS_CRC32__IEEE_TABLE[13][(255 & (v_s >> 16))] ^ + WUFFS_CRC32__IEEE_TABLE[14][(255 & (v_s >> 8))] ^ + WUFFS_CRC32__IEEE_TABLE[15][(255 & (v_s >> 0))]); + v_p.ptr += 16; + } + v_p.len = 16; + uint8_t* i_end1_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 16) * 16); + while (v_p.ptr < i_end1_p) { + v_s ^= ((((uint32_t)(v_p.ptr[0])) << 0) | + (((uint32_t)(v_p.ptr[1])) << 8) | + (((uint32_t)(v_p.ptr[2])) << 16) | + (((uint32_t)(v_p.ptr[3])) << 24)); + v_s = (WUFFS_CRC32__IEEE_TABLE[0][v_p.ptr[15]] ^ + WUFFS_CRC32__IEEE_TABLE[1][v_p.ptr[14]] ^ + WUFFS_CRC32__IEEE_TABLE[2][v_p.ptr[13]] ^ + WUFFS_CRC32__IEEE_TABLE[3][v_p.ptr[12]] ^ + WUFFS_CRC32__IEEE_TABLE[4][v_p.ptr[11]] ^ + WUFFS_CRC32__IEEE_TABLE[5][v_p.ptr[10]] ^ + WUFFS_CRC32__IEEE_TABLE[6][v_p.ptr[9]] ^ + WUFFS_CRC32__IEEE_TABLE[7][v_p.ptr[8]] ^ + WUFFS_CRC32__IEEE_TABLE[8][v_p.ptr[7]] ^ + WUFFS_CRC32__IEEE_TABLE[9][v_p.ptr[6]] ^ + WUFFS_CRC32__IEEE_TABLE[10][v_p.ptr[5]] ^ + WUFFS_CRC32__IEEE_TABLE[11][v_p.ptr[4]] ^ + WUFFS_CRC32__IEEE_TABLE[12][(255 & (v_s >> 24))] ^ + WUFFS_CRC32__IEEE_TABLE[13][(255 & (v_s >> 16))] ^ + WUFFS_CRC32__IEEE_TABLE[14][(255 & (v_s >> 8))] ^ + WUFFS_CRC32__IEEE_TABLE[15][(255 & (v_s >> 0))]); + v_p.ptr += 16; + } + v_p.len = 1; + uint8_t* i_end2_p = i_slice_p.ptr + i_slice_p.len; + while (v_p.ptr < i_end2_p) { + v_s = (WUFFS_CRC32__IEEE_TABLE[0][(((uint8_t)((v_s & 255))) ^ v_p.ptr[0])] ^ (v_s >> 8)); + v_p.ptr += 1; + } + v_p.len = 0; + } + self->private_impl.f_state = (4294967295 ^ v_s); + return wuffs_base__make_empty_struct(); +} +#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32) + #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) diff --git a/std/crc32/common_crc32.wuffs b/std/crc32/common_crc32.wuffs index cb94090f..db47ca75 100644 --- a/std/crc32/common_crc32.wuffs +++ b/std/crc32/common_crc32.wuffs @@ -24,6 +24,54 @@ pub func ieee_hasher.set_quirk_enabled!(quirk: base.u32, enabled: base.bool) { // to signal "initializer not called"? Should the return type, in the generated // C code, be "struct{ uint32_t checksum; wuffs_crc32__status status }"? pub func ieee_hasher.update_u32!(x: slice base.u8) base.u32 { + if this.state == 0 { + choose up = [up_arm_crc32] + } + this.up!(x: args.x) + return this.state +} + +pri func ieee_hasher.up!(x: slice base.u8), + choosy, +{ + var s : base.u32 + var p : slice base.u8 + + s = 0xFFFF_FFFF ^ this.state + + // See "Multi-Byte Lookup Tables" in std/crc32/README.md for more detail on + // the slicing-by-M algorithm. We use an M of 16. + iterate (p = args.x)(length: 16, advance: 16, unroll: 2) { + s ^= ((p[0x00] as base.u32) << 0) | + ((p[0x01] as base.u32) << 8) | + ((p[0x02] as base.u32) << 16) | + ((p[0x03] as base.u32) << 24) + s = IEEE_TABLE[0x00][p[0x0F]] ^ + IEEE_TABLE[0x01][p[0x0E]] ^ + IEEE_TABLE[0x02][p[0x0D]] ^ + IEEE_TABLE[0x03][p[0x0C]] ^ + IEEE_TABLE[0x04][p[0x0B]] ^ + IEEE_TABLE[0x05][p[0x0A]] ^ + IEEE_TABLE[0x06][p[0x09]] ^ + IEEE_TABLE[0x07][p[0x08]] ^ + IEEE_TABLE[0x08][p[0x07]] ^ + IEEE_TABLE[0x09][p[0x06]] ^ + IEEE_TABLE[0x0A][p[0x05]] ^ + IEEE_TABLE[0x0B][p[0x04]] ^ + IEEE_TABLE[0x0C][0xFF & (s >> 24)] ^ + IEEE_TABLE[0x0D][0xFF & (s >> 16)] ^ + IEEE_TABLE[0x0E][0xFF & (s >> 8)] ^ + IEEE_TABLE[0x0F][0xFF & (s >> 0)] + } else (length: 1, advance: 1, unroll: 1) { + s = IEEE_TABLE[0][((s & 0xFF) as base.u8) ^ p[0]] ^ (s >> 8) + } + + this.state = 0xFFFF_FFFF ^ s +} + +pri func ieee_hasher.up_arm_crc32!(x: slice base.u8), + choose cpu_arch >= arm_crc32, +{ var s : base.u32 var p : slice base.u8 @@ -57,7 +105,6 @@ pub func ieee_hasher.update_u32!(x: slice base.u8) base.u32 { } this.state = 0xFFFF_FFFF ^ s - return this.state } // The table below was created by script/print-crc32-magic-numbers.go.