diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index c114ed27..bf6e6cea 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -184,19 +184,10 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare return nil } if isInDst(g.tm, n, t.IDSinceMark, 0) { - // Write .len as either "foo ? bar : baz" or "bar". - // - // TODO: drop the "true" in the "if true", provided that the - // benchmark numbers improve. - len0, len1 := "", "" - if true { - len0 = aPrefix + "dst.private_impl.bounds[0] ?" - len1 = ": 0" - } b.printf("((wuffs_base__slice_u8){ "+ ".ptr = %sdst.private_impl.bounds[0], "+ - ".len = %s (size_t)(%swptr_dst - %sdst.private_impl.bounds[0]) %s, })", - aPrefix, len0, bPrefix, aPrefix, len1) + ".len = %swptr_dst - %sdst.private_impl.bounds[0], })", + aPrefix, bPrefix, aPrefix) return nil } if isInDst(g.tm, n, t.IDCopyFromReader32, 2) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 8acefa24..11d35d58 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1836,9 +1836,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( } v_written = ((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], }); if (((uint64_t)(v_written.len)) >= 32768) { v_written = wuffs_base__slice_u8_suffix(v_written, 32768); @@ -3138,23 +3136,17 @@ label_0_continue:; if (((uint64_t)((v_dist_minus_1 + 1))) > ((uint64_t)(((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], }) .len))) { v_hlen = 0; - v_hdist = ((uint32_t)(( - ((uint64_t)((v_dist_minus_1 + 1))) - - ((uint64_t)(((wuffs_base__slice_u8){ - .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, - }) - .len))))); + v_hdist = ((uint32_t)( + (((uint64_t)((v_dist_minus_1 + 1))) - + ((uint64_t)(((wuffs_base__slice_u8){ + .ptr = a_dst.private_impl.bounds[0], + .len = b_wptr_dst - a_dst.private_impl.bounds[0], + }) + .len))))); if (v_length > v_hdist) { v_length -= v_hdist; v_hlen = v_hdist; @@ -3198,10 +3190,7 @@ label_0_continue:; if (((uint64_t)((v_dist_minus_1 + 1))) > ((uint64_t)(((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], }) .len))) { status = WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE; @@ -3547,24 +3536,17 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( if (((uint64_t)((v_dist_minus_1 + 1))) > ((uint64_t)(((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], }) .len))) { v_hlen = 0; - v_hdist = ((uint32_t)( - (((uint64_t)((v_dist_minus_1 + 1))) - - ((uint64_t)( - ((wuffs_base__slice_u8){ - .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, - }) - .len))))); + v_hdist = ((uint32_t)(( + ((uint64_t)((v_dist_minus_1 + 1))) - + ((uint64_t)(((wuffs_base__slice_u8){ + .ptr = a_dst.private_impl.bounds[0], + .len = b_wptr_dst - a_dst.private_impl.bounds[0], + }) + .len))))); if (v_length > v_hdist) { v_length -= v_hdist; v_hlen = v_hdist; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 0be2b035..30ade335 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -2140,20 +2140,15 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, &self->private_impl.f_checksum, ((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], })); - v_decoded_length_got += ((uint32_t)(( - ((uint64_t)(((wuffs_base__slice_u8){ - .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - - a_dst.private_impl.bounds[0]) - : 0, - }) - .len)) & - 4294967295))); + v_decoded_length_got += ((uint32_t)( + (((uint64_t)(((wuffs_base__slice_u8){ + .ptr = a_dst.private_impl.bounds[0], + .len = b_wptr_dst - a_dst.private_impl.bounds[0], + }) + .len)) & + 4294967295))); } if (v_z == 0) { goto label_2_break; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 0eb1d221..22419dcc 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -2043,9 +2043,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, &self->private_impl.f_checksum, ((wuffs_base__slice_u8){ .ptr = a_dst.private_impl.bounds[0], - .len = a_dst.private_impl.bounds[0] - ? (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]) - : 0, + .len = b_wptr_dst - a_dst.private_impl.bounds[0], })); } if (v_z == 0) {