Use the new read_uxx_as_uyy methods

This commit is contained in:
Nigel Tao committed 2018-11-25 12:29:15 +11:00
1 parent c986536230
commit d84d72ce27
4 files changed
+60 -61

No files matched your search

+40 -41
View File
@@ -5165,9 +5165,8 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_0 = *iop_a_src++;
self->private_impl.f_bits |=
(((uint32_t)(t_0)) << self->private_impl.f_n_bits);
uint32_t t_0 = *iop_a_src++;
self->private_impl.f_bits |= (t_0 << self->private_impl.f_n_bits);
}
self->private_impl.f_n_bits += 8;
}
@@ -5522,8 +5521,8 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_0 = *iop_a_src++;
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
uint32_t t_0 = *iop_a_src++;
v_bits |= (t_0 << v_n_bits);
}
v_n_bits += 8;
}
@@ -5551,8 +5550,8 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_1 = *iop_a_src++;
v_bits |= (((uint32_t)(t_1)) << v_n_bits);
uint32_t t_1 = *iop_a_src++;
v_bits |= (t_1 << v_n_bits);
}
v_n_bits += 8;
}
@@ -5589,8 +5588,8 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_2 = *iop_a_src++;
v_bits |= (((uint32_t)(t_2)) << v_n_bits);
uint32_t t_2 = *iop_a_src++;
v_bits |= (t_2 << v_n_bits);
}
v_n_bits += 8;
}
@@ -5637,8 +5636,8 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_3 = *iop_a_src++;
v_bits |= (((uint32_t)(t_3)) << v_n_bits);
uint32_t t_3 = *iop_a_src++;
v_bits |= (t_3 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6435,8 +6434,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_0 = *iop_a_src++;
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
uint32_t t_0 = *iop_a_src++;
v_bits |= (t_0 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6477,8 +6476,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_1 = *iop_a_src++;
v_bits |= (((uint32_t)(t_1)) << v_n_bits);
uint32_t t_1 = *iop_a_src++;
v_bits |= (t_1 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6525,8 +6524,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_2 = *iop_a_src++;
v_bits |= (((uint32_t)(t_2)) << v_n_bits);
uint32_t t_2 = *iop_a_src++;
v_bits |= (t_2 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6551,8 +6550,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_3 = *iop_a_src++;
v_bits |= (((uint32_t)(t_3)) << v_n_bits);
uint32_t t_3 = *iop_a_src++;
v_bits |= (t_3 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6581,8 +6580,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_4 = *iop_a_src++;
v_bits |= (((uint32_t)(t_4)) << v_n_bits);
uint32_t t_4 = *iop_a_src++;
v_bits |= (t_4 << v_n_bits);
}
v_n_bits += 8;
}
@@ -6607,8 +6606,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_5 = *iop_a_src++;
v_bits |= (((uint32_t)(t_5)) << v_n_bits);
uint32_t t_5 = *iop_a_src++;
v_bits |= (t_5 << v_n_bits);
}
v_n_bits += 8;
}
@@ -8044,7 +8043,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self,
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
uint16_t t_1;
uint32_t t_1;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_1 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8069,11 +8068,11 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_0)) << 56;
}
}
self->private_impl.f_width = ((uint32_t)(t_1));
self->private_impl.f_width = t_1;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
uint16_t t_3;
uint32_t t_3;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_3 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8098,7 +8097,7 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_2)) << 56;
}
}
self->private_impl.f_height = ((uint32_t)(t_3));
self->private_impl.f_height = t_3;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
@@ -8530,7 +8529,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
uint16_t t_5;
uint32_t t_5;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_5 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8555,7 +8554,7 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_4)) << 56;
}
}
self->private_impl.f_num_loops = ((uint32_t)(t_5));
self->private_impl.f_num_loops = t_5;
}
self->private_impl.f_seen_num_loops = true;
if ((0 < self->private_impl.f_num_loops) &&
@@ -8675,7 +8674,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self,
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
uint16_t t_3;
uint64_t t_3;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_3 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8700,7 +8699,7 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_2)) << 56;
}
}
self->private_impl.f_gc_duration = (((uint64_t)(t_3)) * 7056000);
self->private_impl.f_gc_duration = (t_3 * 7056000);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
@@ -8780,7 +8779,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self,
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
uint16_t t_1;
uint32_t t_1;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_1 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8805,11 +8804,11 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_0)) << 56;
}
}
self->private_impl.f_frame_rect_x0 = ((uint32_t)(t_1));
self->private_impl.f_frame_rect_x0 = t_1;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
uint16_t t_3;
uint32_t t_3;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_3 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8834,11 +8833,11 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self,
*scratch |= ((uint64_t)(t_2)) << 56;
}
}
self->private_impl.f_frame_rect_y0 = ((uint32_t)(t_3));
self->private_impl.f_frame_rect_y0 = t_3;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
uint16_t t_5;
uint32_t t_5;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_5 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8864,11 +8863,11 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self,
}
}
self->private_impl.f_frame_rect_x1 =
(self->private_impl.f_frame_rect_x0 + ((uint32_t)(t_5)));
(self->private_impl.f_frame_rect_x0 + t_5);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
uint16_t t_7;
uint32_t t_7;
if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= 2)) {
t_7 = wuffs_base__load_u16le(iop_a_src);
iop_a_src += 2;
@@ -8894,7 +8893,7 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self,
}
}
self->private_impl.f_frame_rect_y1 =
(self->private_impl.f_frame_rect_y0 + ((uint32_t)(t_7)));
(self->private_impl.f_frame_rect_y0 + t_7);
}
self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0;
self->private_impl.f_dst_y = self->private_impl.f_frame_rect_y0;
@@ -9123,8 +9122,8 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self,
status = wuffs_base__suspension__short_read;
goto suspend;
}
uint8_t t_4 = *iop_a_src++;
v_block_size = ((uint64_t)(t_4));
uint64_t t_4 = *iop_a_src++;
v_block_size = t_4;
}
if (v_block_size == 0) {
goto label_0_break;
+5 -5
View File
@@ -179,7 +179,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) {
while this.n_bits < 3,
post this.n_bits >= 3,
{
this.bits |= (args.src.read_u8!??() as base.u32) << this.n_bits
this.bits |= args.src.read_u8_as_u32!??() << this.n_bits
this.n_bits += 8
}
final = this.bits & 0x01
@@ -276,7 +276,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
while n_bits < 14,
post n_bits >= 14,
{
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
var n_lit base.u32[257..288] = bits.low_bits(n:5) + 257
@@ -300,7 +300,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
inv i < n_clen,
post n_bits >= 3,
{
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
assert i < 19 via "a < b: a < c; c <= b"(c:n_clen)
@@ -334,7 +334,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
break
}
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
// For H-CL, there should be no redirections and all symbols should be
@@ -382,7 +382,7 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
post n_bits >= n_extra_bits,
{
assert n_bits < 7 via "a < b: a < c; c <= b"(c:n_extra_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
rep_count += bits.low_bits(n:n_extra_bits)
+6 -6
View File
@@ -41,7 +41,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
@@ -71,7 +71,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
@@ -107,7 +107,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
post n_bits >= table_entry_n_bits,
{
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF
@@ -125,7 +125,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
// Check for a redirect.
@@ -144,7 +144,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
break
}
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
}
@@ -170,7 +170,7 @@ pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader)
post n_bits >= table_entry_n_bits,
{
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (args.src.read_u8!??() as base.u32) << n_bits
bits |= args.src.read_u8_as_u32!??() << n_bits
n_bits += 8
}
dist_minus_1 = (dist_minus_1 + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF
+9 -9
View File
@@ -322,8 +322,8 @@ pri func decoder.decode_header!??(src base.io_reader) {
//
// See the spec section 18 "Logical Screen Descriptor" on page 8.
pri func decoder.decode_lsd!??(src base.io_reader) {
this.width = args.src.read_u16le!??() as base.u32
this.height = args.src.read_u16le!??() as base.u32
this.width = args.src.read_u16le_as_u32!??()
this.height = args.src.read_u16le_as_u32!??()
var flags base.u8 = args.src.read_u8!??()
// Ignore the Background Color Index and Pixel Aspect Ratio bytes.
args.src.skip!??(n:2)
@@ -440,7 +440,7 @@ pri func decoder.decode_ae!??(src base.io_reader) {
args.src.skip!??(n:2)
break
}
this.num_loops = args.src.read_u16le!??() as base.u32
this.num_loops = args.src.read_u16le_as_u32!??()
this.seen_num_loops = true
// A loop count of N, in the wire format, actually means "repeat N
@@ -494,7 +494,7 @@ pri func decoder.decode_gc!??(src base.io_reader) {
}
// There are 7056000 flicks per centisecond.
this.gc_duration = (args.src.read_u16le!??() as base.u64) * 7056000
this.gc_duration = args.src.read_u16le_as_u64!??() * 7056000
this.gc_transparent_index = args.src.read_u8!??()
c = args.src.read_u8!??()
@@ -513,10 +513,10 @@ pri func decoder.decode_gc!??(src base.io_reader) {
// overall image's width and height also requires decoding the first frame's
// bounds (but doesn't require decoding the first frame's pixels).
pri func decoder.decode_id_part0!??(src base.io_reader) {
this.frame_rect_x0 = args.src.read_u16le!??() as base.u32
this.frame_rect_y0 = args.src.read_u16le!??() as base.u32
this.frame_rect_x1 = this.frame_rect_x0 ~mod+ (args.src.read_u16le!??() as base.u32)
this.frame_rect_y1 = this.frame_rect_y0 ~mod+ (args.src.read_u16le!??() as base.u32)
this.frame_rect_x0 = args.src.read_u16le_as_u32!??()
this.frame_rect_y0 = args.src.read_u16le_as_u32!??()
this.frame_rect_x1 = this.frame_rect_x0 ~mod+ args.src.read_u16le_as_u32!??()
this.frame_rect_y1 = this.frame_rect_y0 ~mod+ args.src.read_u16le_as_u32!??()
this.dst_x = this.frame_rect_x0
this.dst_y = this.frame_rect_y0
@@ -611,7 +611,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade
this.copy_to_image_buffer!?(pb:args.dst)
}
}
var block_size base.u64 = args.src.read_u8!??() as base.u64
var block_size base.u64 = args.src.read_u8_as_u64!??()
if block_size == 0 {
break
}