diff --git a/internal/cgen/base/fundamental-private.h b/internal/cgen/base/fundamental-private.h index 9f0b8e38..d1bef6c8 100644 --- a/internal/cgen/base/fundamental-private.h +++ b/internal/cgen/base/fundamental-private.h @@ -178,6 +178,9 @@ wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { #define wuffs_base__utility__sign_extend_rshift_u32(a, n) \ ((uint32_t)(((int32_t)(a)) >> (n))) +#define wuffs_base__utility__sign_extend_rshift_u64(a, n) \ + ((uint64_t)(((int64_t)(a)) >> (n))) + // ---------------- Slices and Tables // wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s. diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 893809de..3fb6dbc8 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -388,6 +388,7 @@ var funcsOther = [...]string{ "min_incl_x: u32, min_incl_y: u32, max_excl_x: u32, max_excl_y: u32) rect_ie_u32", "utility.sign_extend_convert_u16_u32(a: u16) u32", "utility.sign_extend_rshift_u32(a: u32, n: u32[..= 31]) u32", + "utility.sign_extend_rshift_u64(a: u64, n: u32[..= 63]) u64", // ---- ranges diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a87fa357..418259df 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -12274,6 +12274,9 @@ wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { #define wuffs_base__utility__sign_extend_rshift_u32(a, n) \ ((uint32_t)(((int32_t)(a)) >> (n))) +#define wuffs_base__utility__sign_extend_rshift_u64(a, n) \ + ((uint64_t)(((int64_t)(a)) >> (n))) + // ---------------- Slices and Tables // wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s. @@ -41664,9 +41667,7 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default( label__0__break:; } v_dc_value = ((uint32_t)(((v_bits >> 32u) >> (32u - v_dc_symbol)))); - if ((v_bits >> 63u) == 0u) { - v_dc_value += ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_dc_symbol)))); - } + v_dc_value += ((((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u) & ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_dc_symbol))))); v_bits <<= v_dc_symbol; v_n_bits -= v_dc_symbol; v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[self->private_impl.f_mcu_current_block]]; @@ -41722,9 +41723,7 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default( v_ac_ssss = (v_ac_symbol & 15u); if (v_ac_ssss > 0u) { v_ac_value = ((uint32_t)((v_bits >> (64u - v_ac_ssss)))); - if ((v_bits >> 63u) == 0u) { - v_ac_value += ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_ac_ssss)))); - } + v_ac_value += ((((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u) & ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_ac_ssss))))); v_bits <<= v_ac_ssss; v_n_bits -= v_ac_ssss; v_z = (self->private_impl.f_mcu_zig_index + v_ac_rrrr); @@ -41887,9 +41886,7 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits( v_ac_ssss = (v_ac_symbol & 15u); if (v_ac_ssss > 0u) { v_ac_value = ((uint32_t)((v_bits >> (64u - v_ac_ssss)))); - if ((v_bits >> 63u) == 0u) { - v_ac_value += ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_ac_ssss)))); - } + v_ac_value += ((((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u) & ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_ac_ssss))))); v_bits <<= v_ac_ssss; v_n_bits -= v_ac_ssss; v_z = (self->private_impl.f_mcu_zig_index + v_ac_rrrr); @@ -42281,9 +42278,7 @@ wuffs_jpeg__decoder__decode_mcu_progressive_dc_high_bits( label__0__break:; } v_dc_value = ((uint32_t)(((v_bits >> 32u) >> (32u - v_dc_symbol)))); - if ((v_bits >> 63u) == 0u) { - v_dc_value += ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_dc_symbol)))); - } + v_dc_value += ((((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u) & ((uint32_t)(1u + ((uint32_t)(((uint32_t)(4294967295u)) << v_dc_symbol))))); v_bits <<= v_dc_symbol; v_n_bits -= v_dc_symbol; v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[self->private_impl.f_mcu_current_block]]; diff --git a/std/jpeg/decode_mcu_default.wuffs b/std/jpeg/decode_mcu_default.wuffs index d0a1a185..eb64fa1e 100644 --- a/std/jpeg/decode_mcu_default.wuffs +++ b/std/jpeg/decode_mcu_default.wuffs @@ -119,9 +119,9 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m // The dc_value is shifted by (64 - dc_symbol) in two steps, // because we want to shift by 64 (not 0) when dc_symbol is 0. dc_value = (((bits >> 32) >> (32 - dc_symbol)) & 0xFFFF_FFFF) as base.u32 - if (bits >> 63) == 0 { // EXTEND per section F.2.2.1. - dc_value ~mod+= 1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< dc_symbol) - } + dc_value ~mod+= // EXTEND per section F.2.2.1. + (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF) & + (1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< dc_symbol)) bits ~mod<<= dc_symbol n_bits ~mod-= dc_symbol csel = this.scan_comps_cselector[this.mcu_blocks_sselector[this.mcu_current_block]] @@ -202,9 +202,9 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m // Process the ac_value in the next ac_ssss (up to 15) bits. if ac_ssss > 0 { ac_value = ((bits >> (64 - ac_ssss)) & 0xFFFF_FFFF) as base.u32 - if (bits >> 63) == 0 { // EXTEND per section F.2.2.1. - ac_value ~mod+= 1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< ac_ssss) - } + ac_value ~mod+= // EXTEND per section F.2.2.1. + (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF) & + (1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< ac_ssss)) bits ~mod<<= ac_ssss n_bits ~mod-= ac_ssss z = this.mcu_zig_index + ac_rrrr diff --git a/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs b/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs index 3beae2a4..77033dde 100644 --- a/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs +++ b/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs @@ -120,9 +120,9 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx // the eob_run in the next ac_rrrr (up to 15) bits. if ac_ssss > 0 { ac_value = ((bits >> (64 - ac_ssss)) & 0xFFFF_FFFF) as base.u32 - if (bits >> 63) == 0 { // EXTEND per section F.2.2.1. - ac_value ~mod+= 1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< ac_ssss) - } + ac_value ~mod+= // EXTEND per section F.2.2.1. + (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF) & + (1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< ac_ssss)) bits ~mod<<= ac_ssss n_bits ~mod-= ac_ssss z = this.mcu_zig_index + ac_rrrr diff --git a/std/jpeg/decode_mcu_progressive_dc_high_bits.wuffs b/std/jpeg/decode_mcu_progressive_dc_high_bits.wuffs index a744916e..405cb919 100644 --- a/std/jpeg/decode_mcu_progressive_dc_high_bits.wuffs +++ b/std/jpeg/decode_mcu_progressive_dc_high_bits.wuffs @@ -92,9 +92,9 @@ pri func decoder.decode_mcu_progressive_dc_high_bits!(workbuf: slice base.u8, mx // The dc_value is shifted by (64 - dc_symbol) in two steps, // because we want to shift by 64 (not 0) when dc_symbol is 0. dc_value = (((bits >> 32) >> (32 - dc_symbol)) & 0xFFFF_FFFF) as base.u32 - if (bits >> 63) == 0 { // EXTEND per section F.2.2.1. - dc_value ~mod+= 1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< dc_symbol) - } + dc_value ~mod+= // EXTEND per section F.2.2.1. + (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF) & + (1 ~mod+ ((0xFFFF_FFFF as base.u32) ~mod<< dc_symbol)) bits ~mod<<= dc_symbol n_bits ~mod-= dc_symbol csel = this.scan_comps_cselector[this.mcu_blocks_sselector[this.mcu_current_block]]