From 9d11334e2b733c442aed682da15fd0503e29a980 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 23 Dec 2018 09:41:07 +1100 Subject: [PATCH] Gen explicit read_uxx_as_uyy width conversions --- cmd/wuffs-c/internal/cgen/builtin.go | 26 +++++++++++++---- release/c/wuffs-unsupported-snapshot.c | 40 +++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 2e2697ba..7978cc20 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -653,9 +653,17 @@ func (g *gen) writeReadUxxAsUyy(b *buffer, n *a.Expr, preName string, xx uint8, cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) b.printf("if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= %d)) {", xx/8) - b.printf("%s%d = wuffs_base__load_u%d%ce(iop_a_src);\n", tPrefix, temp, xx, endianness) - b.printf("iop_a_src += %d;\n", xx/8) + b.printf("%s%d =", tPrefix, temp) + if xx != yy { + b.printf("((uint%d_t)(", yy) + } + b.printf("wuffs_base__load_u%d%ce(iop_a_src)", xx, endianness) + if xx != yy { + b.writes("))") + } + b.printf("; iop_a_src += %d;\n", xx/8) b.printf("} else {") + b.printf("%s = 0;\n", scratchName) if err := g.writeCoroSuspPoint(b, false); err != nil { return err @@ -679,14 +687,20 @@ func (g *gen) writeReadUxxAsUyy(b *buffer, n *a.Expr, preName string, xx uint8, iopPrefix, preName, temp) } - b.printf("if (num_bits_%d == %d) {", temp, xx-8) + b.printf("if (num_bits_%d == %d) { %s%d =", temp, xx-8, tPrefix, temp) + if xx != yy { + b.printf("((uint%d_t)(", yy) + } switch endianness { case 'b': - b.printf("%s%d = *scratch >> (64 - %d);", tPrefix, temp, xx) + b.printf("*scratch >> %d", 64-xx) case 'l': - b.printf("%s%d = *scratch;", tPrefix, temp) + b.printf("*scratch") } - b.printf("break;") + if xx != yy { + b.writes("))") + } + b.printf("; break;") b.printf("}") b.printf("num_bits_%d += 8;", temp) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index e94f6aff..c4c3400b 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -8383,7 +8383,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_0 = wuffs_base__load_u16le(iop_a_src); + t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -8399,7 +8399,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; if (num_bits_0 == 8) { - t_0 = *scratch; + t_0 = ((uint32_t)(*scratch)); break; } num_bits_0 += 8; @@ -8412,7 +8412,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_1 = wuffs_base__load_u16le(iop_a_src); + t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -8428,7 +8428,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1; if (num_bits_1 == 8) { - t_1 = *scratch; + t_1 = ((uint32_t)(*scratch)); break; } num_bits_1 += 8; @@ -8465,7 +8465,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); uint32_t t_3; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { - t_3 = wuffs_base__load_u24be(iop_a_src); + t_3 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { self->private_impl.c_decode_lsd[0].scratch = 0; @@ -8481,7 +8481,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, *scratch <<= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3); if (num_bits_3 == 16) { - t_3 = *scratch >> (64 - 24); + t_3 = ((uint32_t)(*scratch >> 40)); break; } num_bits_3 += 8; @@ -8870,7 +8870,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); uint32_t t_4; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_4 = wuffs_base__load_u16le(iop_a_src); + t_4 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_ae[0].scratch = 0; @@ -8886,7 +8886,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4; if (num_bits_4 == 8) { - t_4 = *scratch; + t_4 = ((uint32_t)(*scratch)); break; } num_bits_4 += 8; @@ -9124,7 +9124,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); uint32_t t_0; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_0 = wuffs_base__load_u16le(iop_a_src); + t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -9140,7 +9140,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0; if (num_bits_0 == 8) { - t_0 = *scratch; + t_0 = ((uint32_t)(*scratch)); break; } num_bits_0 += 8; @@ -9153,7 +9153,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_1 = wuffs_base__load_u16le(iop_a_src); + t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -9169,7 +9169,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1; if (num_bits_1 == 8) { - t_1 = *scratch; + t_1 = ((uint32_t)(*scratch)); break; } num_bits_1 += 8; @@ -9182,7 +9182,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); uint32_t t_2; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_2 = wuffs_base__load_u16le(iop_a_src); + t_2 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -9198,7 +9198,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2; if (num_bits_2 == 8) { - t_2 = *scratch; + t_2 = ((uint32_t)(*scratch)); break; } num_bits_2 += 8; @@ -9212,7 +9212,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); uint32_t t_3; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) { - t_3 = wuffs_base__load_u16le(iop_a_src); + t_3 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { self->private_impl.c_decode_id_part0[0].scratch = 0; @@ -9228,7 +9228,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, *scratch >>= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3; if (num_bits_3 == 8) { - t_3 = *scratch; + t_3 = ((uint32_t)(*scratch)); break; } num_bits_3 += 8; @@ -9338,7 +9338,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); uint32_t t_1; if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 3)) { - t_1 = wuffs_base__load_u24be(iop_a_src); + t_1 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { self->private_impl.c_decode_id_part1[0].scratch = 0; @@ -9355,7 +9355,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, *scratch <<= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1); if (num_bits_1 == 16) { - t_1 = *scratch >> (64 - 24); + t_1 = ((uint32_t)(*scratch >> 40)); break; } num_bits_1 += 8; @@ -10455,7 +10455,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, *scratch <<= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0); if (num_bits_0 == 8) { - t_0 = *scratch >> (64 - 16); + t_0 = *scratch >> 48; break; } num_bits_0 += 8; @@ -10539,7 +10539,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, *scratch <<= 8; *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2); if (num_bits_2 == 24) { - t_2 = *scratch >> (64 - 32); + t_2 = *scratch >> 32; break; } num_bits_2 += 8;