Remove parenthesesPolicy, part 2 of N

This commit is contained in:
Nigel Tao committed 2018-05-14 20:42:39 +10:00
1 parent f159bcdadc
commit 0870643c77
5 files changed
+97 -98

No files matched your search

+23 -23
View File
@@ -90,11 +90,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// "x.low_bits(n:etc)" in C is "((x) & ((1 << (n)) - 1))".
x := n.LHS().Expr().LHS().Expr()
b.writes("((")
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(") & ((1 << (")
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")) - 1))")
@@ -104,7 +104,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// "x.high_bits(n:etc)" in C is "((x) >> (8*sizeof(x) - (n)))".
x := n.LHS().Expr().LHS().Expr()
b.writes("((")
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(") >> (")
@@ -114,7 +114,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("%d", 8*sz)
}
b.writes(" - (")
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")))")
@@ -129,11 +129,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("%d", 8*sz)
}
b.writes("__min(")
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(",")
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")")
@@ -148,11 +148,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("%d", 8*sz)
}
b.writes("__max(")
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(",")
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")")
@@ -186,11 +186,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// TODO: don't assume that the slice is a slice of base.u8.
b.writes("wuffs_base__slice_u8_suffix(")
x := n.LHS().Expr().LHS().Expr()
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writeb(',')
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")")
@@ -198,7 +198,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
}
if isInSrc(g.tm, n, t.IDSetLimit, 1) {
b.printf("wuffs_base__io_reader__set_limit(&%ssrc, %srptr_src,", aPrefix, bPrefix)
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")")
@@ -237,7 +237,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// TODO: don't assume that the first argument is "in.src".
b.printf(", &%srptr_src, %srend_src,", bPrefix, bPrefix)
a := n.Args()[1].Arg().Value()
if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writeb(')')
@@ -253,7 +253,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
bco, bPrefix, aPrefix, bPrefix)
for _, o := range n.Args() {
b.writeb(',')
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
}
@@ -265,7 +265,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
"&%swptr_dst, %swend_dst", bPrefix, bPrefix)
for _, o := range n.Args() {
b.writeb(',')
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
}
@@ -275,7 +275,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isInDst(g.tm, n, t.IDCopyFromSlice, 1) {
b.printf("wuffs_base__io_writer__copy_from_slice(&%swptr_dst, %swend_dst,", bPrefix, bPrefix)
a := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writeb(')')
@@ -284,12 +284,12 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isThatMethod(g.tm, n, t.IDCopyFromSlice, 1) {
b.writes("wuffs_base__slice_u8__copy_from_slice(")
receiver := n.LHS().Expr().LHS().Expr()
if err := g.writeExpr(b, receiver, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, receiver, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writeb(',')
a := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writes(")\n")
@@ -366,7 +366,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("wuffs_base__image_config__initialize(a_dst")
for _, o := range n.Args() {
b.writeb(',')
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
}
@@ -388,7 +388,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("wuffs_base__io_%s__set(&v_w, &u_w, &b_wptr_w, &b_wend_w", typ)
for _, o := range n.Args() {
b.writeb(',')
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesMandatory, depth); err != nil {
return err
}
}
@@ -407,7 +407,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.writes(".ptr")
}
b.writeb('[')
if err := g.writeExpr(b, n.RHS().Expr(), rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, n.RHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
return err
}
b.writeb(']')
@@ -432,7 +432,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// TODO: don't assume that the slice is a slice of base.u8.
b.writes("((wuffs_base__slice_u8){.ptr=")
}
if err := g.writeExpr(b, lhs, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, lhs, rp, parenthesesMandatory, depth); err != nil {
return err
}
if lhsIsArray {
@@ -441,13 +441,13 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if mhs != nil {
b.writeb(',')
if err := g.writeExpr(b, mhs, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, mhs, rp, parenthesesMandatory, depth); err != nil {
return err
}
}
if rhs != nil {
b.writeb(',')
if err := g.writeExpr(b, rhs, rp, parenthesesOptional, depth); err != nil {
if err := g.writeExpr(b, rhs, rp, parenthesesMandatory, depth); err != nil {
return err
}
}
+1 -1
View File
@@ -282,7 +282,7 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error
// particular, the code gen can be subtle if the slice element type has
// zero size, such as the empty struct.
b.printf("wuffs_base__slice_u8 %sslice_%s =", iPrefix, name)
if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesMandatory, 0); err != nil {
return err
}
b.writes(";\n")
+39 -38
View File
@@ -2020,10 +2020,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2032,10 +2032,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2044,10 +2044,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2056,10 +2056,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2068,10 +2068,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2080,10 +2080,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2092,10 +2092,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
v_s ^=
((((uint32_t)(v_p.ptr[0])) << 0) | (((uint32_t)(v_p.ptr[1])) << 8) |
@@ -2104,10 +2104,10 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
}
v_p.len = 8;
@@ -2120,17 +2120,18 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
wuffs_crc32__ieee_table[1][v_p.ptr[6]] ^
wuffs_crc32__ieee_table[2][v_p.ptr[5]] ^
wuffs_crc32__ieee_table[3][v_p.ptr[4]] ^
wuffs_crc32__ieee_table[4][255 & (v_s >> 24)] ^
wuffs_crc32__ieee_table[5][255 & (v_s >> 16)] ^
wuffs_crc32__ieee_table[6][255 & (v_s >> 8)] ^
wuffs_crc32__ieee_table[7][255 & (v_s >> 0)]);
wuffs_crc32__ieee_table[4][(255 & (v_s >> 24))] ^
wuffs_crc32__ieee_table[5][(255 & (v_s >> 16))] ^
wuffs_crc32__ieee_table[6][(255 & (v_s >> 8))] ^
wuffs_crc32__ieee_table[7][(255 & (v_s >> 0))]);
v_p.ptr += 8;
}
v_p.len = 1;
uint8_t* i_end2_p = i_slice_p.ptr + (i_slice_p.len / 1) * 1;
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_s =
(wuffs_crc32__ieee_table[0][(((uint8_t)((v_s & 255))) ^ v_p.ptr[0])] ^
(v_s >> 8));
v_p.ptr += 1;
}
}
+27 -29
View File
@@ -1901,7 +1901,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode(
wuffs_base__slice_u8__subslice_i(
((wuffs_base__slice_u8){.ptr = self->private_impl.f_history,
.len = 32768}),
self->private_impl.f_history_index & 32767),
(self->private_impl.f_history_index & 32767)),
v_written);
if (v_n_copied < ((uint64_t)(v_written.len))) {
v_written = wuffs_base__slice_u8__subslice_i(v_written, v_n_copied);
@@ -2435,7 +2435,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman(
while (v_i < (v_n_lit + v_n_dist)) {
v_table_entry = 0;
while (true) {
v_table_entry = self->private_impl.f_huffs[0][v_bits & v_mask];
v_table_entry = self->private_impl.f_huffs[0][(v_bits & v_mask)];
v_table_entry_n_bits = (v_table_entry & 15);
if (v_n_bits >= v_table_entry_n_bits) {
v_bits >>= v_table_entry_n_bits;
@@ -2473,7 +2473,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman(
status = WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION;
goto exit;
}
v_rep_symbol = self->private_impl.f_code_lengths[v_i - 1];
v_rep_symbol = self->private_impl.f_code_lengths[(v_i - 1)];
v_rep_count = 3;
} else if (v_table_entry == 17) {
v_n_extra_bits = 3;
@@ -2732,9 +2732,8 @@ label_1_break:;
if (v_max_cl < 9) {
v_initial_high_bits = (((uint32_t)(1)) << v_max_cl);
}
v_prev_cl = ((uint32_t)(
self->private_impl
.f_code_lengths[a_n_codes0 + ((uint32_t)(v_symbols[0]))]));
v_prev_cl = ((uint32_t)(self->private_impl.f_code_lengths[(
a_n_codes0 + ((uint32_t)(v_symbols[0])))]));
v_prev_redirect_key = 4294967295;
v_top = 0;
v_next_top = 512;
@@ -2747,9 +2746,8 @@ label_1_break:;
WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_cl = ((uint32_t)(
self->private_impl
.f_code_lengths[a_n_codes0 + ((uint32_t)(v_symbols[v_i]))]));
v_cl = ((uint32_t)(self->private_impl.f_code_lengths[(
a_n_codes0 + ((uint32_t)(v_symbols[v_i])))]));
if (v_cl > v_prev_cl) {
v_code <<= (v_cl - v_prev_cl);
if (v_code >= 32768) {
@@ -2798,7 +2796,7 @@ label_1_break:;
}
v_next_top = (v_top + (((uint32_t)(1)) << v_tmp));
v_redirect_key =
(((uint32_t)(wuffs_deflate__reverse8[v_redirect_key >> 1])) |
(((uint32_t)(wuffs_deflate__reverse8[(v_redirect_key >> 1)])) |
((v_redirect_key & 1) << 8));
self->private_impl.f_huffs[a_which][v_redirect_key] =
(268435465 | (v_top << 8) | (v_tmp << 4));
@@ -2810,7 +2808,7 @@ label_1_break:;
goto exit;
}
v_counts[v_prev_cl] -= 1;
v_reversed_key = (((uint32_t)(wuffs_deflate__reverse8[v_key >> 1])) |
v_reversed_key = (((uint32_t)(wuffs_deflate__reverse8[(v_key >> 1)])) |
((v_key & 1) << 8));
v_reversed_key >>= (9 - v_cl);
v_symbol = ((uint32_t)(v_symbols[v_i]));
@@ -2821,9 +2819,9 @@ label_1_break:;
} else if (v_symbol >= a_base_symbol) {
v_symbol -= a_base_symbol;
if (a_which == 0) {
v_value = (wuffs_deflate__lcode_magic_numbers[v_symbol & 31] | v_cl);
v_value = (wuffs_deflate__lcode_magic_numbers[(v_symbol & 31)] | v_cl);
} else {
v_value = (wuffs_deflate__dcode_magic_numbers[v_symbol & 31] | v_cl);
v_value = (wuffs_deflate__dcode_magic_numbers[(v_symbol & 31)] | v_cl);
}
} else {
status =
@@ -2840,7 +2838,7 @@ label_1_break:;
goto exit;
}
self->private_impl
.f_huffs[a_which][v_top + ((v_high_bits | v_reversed_key) & 511)] =
.f_huffs[a_which][(v_top + ((v_high_bits | v_reversed_key) & 511))] =
v_value;
}
v_i += 1;
@@ -2939,7 +2937,7 @@ label_0_continue:;
v_n_bits += 8;
} else {
}
v_table_entry = self->private_impl.f_huffs[0][v_bits & v_lmask];
v_table_entry = self->private_impl.f_huffs[0][(v_bits & v_lmask)];
v_table_entry_n_bits = (v_table_entry & 15);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
@@ -2971,8 +2969,8 @@ label_0_continue:;
WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_table_entry =
self->private_impl.f_huffs[0][v_redir_top + (v_bits & v_redir_mask)];
v_table_entry = self->private_impl
.f_huffs[0][(v_redir_top + (v_bits & v_redir_mask))];
v_table_entry_n_bits = (v_table_entry & 15);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
@@ -3044,7 +3042,7 @@ label_0_continue:;
v_n_bits += 8;
} else {
}
v_table_entry = self->private_impl.f_huffs[1][v_bits & v_dmask];
v_table_entry = self->private_impl.f_huffs[1][(v_bits & v_dmask)];
v_table_entry_n_bits = (v_table_entry & 15);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
@@ -3069,8 +3067,8 @@ label_0_continue:;
WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_table_entry =
self->private_impl.f_huffs[1][v_redir_top + (v_bits & v_redir_mask)];
v_table_entry = self->private_impl
.f_huffs[1][(v_redir_top + (v_bits & v_redir_mask))];
v_table_entry_n_bits = (v_table_entry & 15);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
@@ -3147,7 +3145,7 @@ label_0_continue:;
wuffs_base__slice_u8__subslice_i(
((wuffs_base__slice_u8){.ptr = self->private_impl.f_history,
.len = 32768}),
v_hdist & 32767),
(v_hdist & 32767)),
v_hlen);
if (v_hlen <= v_n_copied) {
goto label_1_break;
@@ -3177,7 +3175,7 @@ label_0_continue:;
}
wuffs_base__io_writer__copy_from_history32__bco(
&b_wptr_dst, a_dst.private_impl.bounds[0], b_wend_dst,
v_dist_minus_1 + 1, v_length);
(v_dist_minus_1 + 1), v_length);
goto label_2_break;
}
label_2_break:;
@@ -3302,7 +3300,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
label_0_continue:;
while (true) {
while (true) {
v_table_entry = self->private_impl.f_huffs[0][v_bits & v_lmask];
v_table_entry = self->private_impl.f_huffs[0][(v_bits & v_lmask)];
v_table_entry_n_bits = (v_table_entry & 15);
if (v_n_bits >= v_table_entry_n_bits) {
v_bits >>= v_table_entry_n_bits;
@@ -3343,7 +3341,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
}
v_table_entry =
self->private_impl
.f_huffs[0][v_redir_top + (v_bits & v_redir_mask)];
.f_huffs[0][(v_redir_top + (v_bits & v_redir_mask))];
v_table_entry_n_bits = (v_table_entry & 15);
if (v_n_bits >= v_table_entry_n_bits) {
v_bits >>= v_table_entry_n_bits;
@@ -3414,7 +3412,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
v_n_bits -= v_table_entry_n_bits;
}
while (true) {
v_table_entry = self->private_impl.f_huffs[1][v_bits & v_dmask];
v_table_entry = self->private_impl.f_huffs[1][(v_bits & v_dmask)];
v_table_entry_n_bits = (v_table_entry & 15);
if (v_n_bits >= v_table_entry_n_bits) {
v_bits >>= v_table_entry_n_bits;
@@ -3443,7 +3441,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
}
v_table_entry =
self->private_impl
.f_huffs[1][v_redir_top + (v_bits & v_redir_mask)];
.f_huffs[1][(v_redir_top + (v_bits & v_redir_mask))];
v_table_entry_n_bits = (v_table_entry & 15);
if (v_n_bits >= v_table_entry_n_bits) {
v_bits >>= v_table_entry_n_bits;
@@ -3527,7 +3525,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
wuffs_base__slice_u8__subslice_i(
((wuffs_base__slice_u8){.ptr = self->private_impl.f_history,
.len = 32768}),
v_hdist & 32767),
(v_hdist & 32767)),
v_hlen);
if (v_hlen <= v_n_copied) {
v_hlen = 0;
@@ -3551,7 +3549,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
wuffs_base__slice_u8__subslice_i(
((wuffs_base__slice_u8){
.ptr = self->private_impl.f_history, .len = 32768}),
v_hdist & 32767),
(v_hdist & 32767)),
v_hlen);
if (v_hlen <= v_n_copied) {
v_hlen = 0;
@@ -3570,7 +3568,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
}
v_n_copied = wuffs_base__io_writer__copy_from_history32(
&b_wptr_dst, a_dst.private_impl.bounds[0], b_wend_dst,
v_dist_minus_1 + 1, v_length);
(v_dist_minus_1 + 1), v_length);
if (v_length <= v_n_copied) {
v_length = 0;
goto label_7_break;
+7 -7
View File
@@ -2218,7 +2218,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
goto short_read_src;
}
uint8_t t_1 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 0] = t_1;
self->private_impl.f_gct[((3 * v_i) + 0)] = t_1;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
@@ -2226,7 +2226,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
goto short_read_src;
}
uint8_t t_2 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 1] = t_2;
self->private_impl.f_gct[((3 * v_i) + 1)] = t_2;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
@@ -2234,7 +2234,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
goto short_read_src;
}
uint8_t t_3 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 2] = t_3;
self->private_impl.f_gct[((3 * v_i) + 2)] = t_3;
}
v_i += 1;
}
@@ -2872,7 +2872,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
goto short_read_src;
}
uint8_t t_9 = *b_rptr_src++;
self->private_impl.f_lct[(3 * v_i) + 0] = t_9;
self->private_impl.f_lct[((3 * v_i) + 0)] = t_9;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
@@ -2880,7 +2880,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
goto short_read_src;
}
uint8_t t_10 = *b_rptr_src++;
self->private_impl.f_lct[(3 * v_i) + 1] = t_10;
self->private_impl.f_lct[((3 * v_i) + 1)] = t_10;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
@@ -2888,7 +2888,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
goto short_read_src;
}
uint8_t t_11 = *b_rptr_src++;
self->private_impl.f_lct[(3 * v_i) + 2] = t_11;
self->private_impl.f_lct[((3 * v_i) + 2)] = t_11;
}
v_i += 1;
}
@@ -2958,7 +2958,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
self->private_impl.f_uncompressed_wi =
(4096 - ((uint32_t)(wuffs_base__u64__min(
(uint64_t)(b_wend_w - b_wptr_w), 4096))));
((uint64_t)(b_wend_w - b_wptr_w)), 4096))));
wuffs_base__u64__sat_sub_indirect(
&v_block_size,
((uint64_t)(((wuffs_base__slice_u8){