Optimize reader1 calls.

name                          old speed     new speed     delta
bench_lzw_decode_20k/clang    110MB/s ± 2%  128MB/s ± 0%  +16.73%  (p=0.008 n=5+5)
bench_lzw_decode_100k/clang   149MB/s ± 0%  166MB/s ± 0%  +11.40%  (p=0.008 n=5+5)
bench_gif_decode_1k/clang     281MB/s ± 0%  351MB/s ± 0%  +24.55%  (p=0.008 n=5+5)
bench_gif_decode_10k/clang    106MB/s ± 0%  131MB/s ± 0%  +23.71%  (p=0.008 n=5+5)
bench_gif_decode_100k/clang   101MB/s ± 0%  121MB/s ± 0%  +19.87%  (p=0.008 n=5+5)
bench_gif_decode_1000k/clang  103MB/s ± 0%  124MB/s ± 0%  +19.61%  (p=0.008 n=5+5)
bench_lzw_decode_20k/gcc      136MB/s ± 0%  143MB/s ± 0%   +4.61%  (p=0.008 n=5+5)
bench_lzw_decode_100k/gcc     187MB/s ± 0%  195MB/s ± 0%   +4.23%  (p=0.008 n=5+5)
bench_gif_decode_1k/gcc       392MB/s ± 1%  394MB/s ± 0%   +0.67%  (p=0.008 n=5+5)
bench_gif_decode_10k/gcc      129MB/s ± 0%  137MB/s ± 0%   +6.07%  (p=0.008 n=5+5)
bench_gif_decode_100k/gcc     124MB/s ± 0%  127MB/s ± 0%   +2.51%  (p=0.016 n=5+4)
bench_gif_decode_1000k/gcc    126MB/s ± 0%  130MB/s ± 0%   +3.28%  (p=0.016 n=5+4)
This commit is contained in:
Nigel Tao committed 2017-06-30 15:04:39 +10:00
1 parent 11f4cfeb49
commit 8be3e9e91f
3 files changed
+478 -86

No files matched your search

+195 -11
View File
@@ -4,6 +4,7 @@
package main
import (
"errors"
"fmt"
"math/big"
@@ -13,6 +14,7 @@ import (
type perFunc struct {
funk *a.Func
derivedVars map[t.ID]struct{}
jumpTargets map[*a.While]uint32
coroState uint32
tempW uint32
@@ -121,6 +123,15 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
g.writes("\n")
if g.perFunc.suspendible {
g.findDerivedVars()
for _, o := range n.In().Fields() {
o := o.Field()
if err := g.writeLoadDerivedVar(o.Name(), o.XType(), true); err != nil {
return err
}
}
g.writes("\n")
// TODO: don't hard-code [0], and allow recursive coroutines.
g.printf("uint32_t coro_state = self->private_impl.%s%s[0].coro_state;\n", cPrefix, n.Name().String(g.tm))
g.printf("if (coro_state) {\n")
@@ -154,6 +165,14 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
}
g.writes("\n")
for _, o := range n.In().Fields() {
o := o.Field()
if err := g.writeSaveDerivedVar(o.Name(), o.XType()); err != nil {
return err
}
}
g.writes("\n")
g.writes("goto exit;\n") // Avoid the "unused label" warning.
g.writes("exit:")
if g.perFunc.public {
@@ -237,6 +256,156 @@ func (g *gen) writeFuncImplArgChecks(n *a.Func) error {
return nil
}
var errNeedDerivedVar = errors.New("internal: need derived var")
func (g *gen) needDerivedVar(name t.ID) bool {
for _, o := range g.perFunc.funk.Body() {
err := o.Walk(func(p *a.Node) error {
// Look for p matching "in.name.etc(etc)".
if p.Kind() != a.KExpr {
return nil
}
q := p.Expr()
if q.ID0().Key() != t.KeyOpenParen {
return nil
}
q = q.LHS().Expr()
if q.ID0().Key() != t.KeyDot {
return nil
}
q = q.LHS().Expr()
if q.ID0().Key() != t.KeyDot || q.ID1() != name {
return nil
}
q = q.LHS().Expr()
if q.ID0() != 0 || q.ID1().Key() != t.KeyIn {
return nil
}
return errNeedDerivedVar
})
if err == errNeedDerivedVar {
return true
}
}
return false
}
func (g *gen) findDerivedVars() {
for _, o := range g.perFunc.funk.In().Fields() {
o := o.Field()
oTyp := o.XType()
if oTyp.Decorator() != 0 {
continue
}
if k := oTyp.Name().Key(); k != t.KeyReader1 && k != t.KeyWriter1 {
continue
}
if !g.needDerivedVar(o.Name()) {
continue
}
if g.perFunc.derivedVars == nil {
g.perFunc.derivedVars = map[t.ID]struct{}{}
}
g.perFunc.derivedVars[o.Name()] = struct{}{}
}
}
func (g *gen) writeLoadDerivedVar(name t.ID, typ *a.TypeExpr, decl bool) error {
if g.perFunc.derivedVars == nil {
return nil
}
if _, ok := g.perFunc.derivedVars[name]; !ok {
return nil
}
nameStr := name.String(g.tm)
switch typ.Name().Key() {
case t.KeyReader1:
if decl {
g.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr)
g.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr)
}
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
g.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;",
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
g.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;",
aPrefix, nameStr, aPrefix, nameStr)
g.printf("puffs_base_limit1* lim;")
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
g.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
g.printf("}")
g.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
g.printf("}\n")
case t.KeyWriter1:
// TODO.
}
return nil
}
func (g *gen) writeSaveDerivedVar(name t.ID, typ *a.TypeExpr) error {
if g.perFunc.derivedVars == nil {
return nil
}
if _, ok := g.perFunc.derivedVars[name]; !ok {
return nil
}
nameStr := name.String(g.tm)
switch typ.Name().Key() {
case t.KeyReader1:
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
g.printf("size_t n = %srptr_%s - (%s%s.buf->ptr + %s%s.buf->ri);",
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
g.printf("%s%s.buf->ri += n;", aPrefix, nameStr)
g.printf("puffs_base_limit1* lim;")
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
g.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
g.printf("}")
g.printf("}\n")
case t.KeyWriter1:
// TODO.
}
return nil
}
func (g *gen) writeLoadExprDerivedVars(n *a.Expr) error {
if g.perFunc.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
return nil
}
for _, o := range n.Args() {
o := o.Arg()
// TODO: don't hard-code these.
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
continue
}
if err := g.writeLoadDerivedVar(o.Name(), o.Value().MType(), false); err != nil {
return err
}
}
return nil
}
func (g *gen) writeSaveExprDerivedVars(n *a.Expr) error {
if g.perFunc.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
return nil
}
for _, o := range n.Args() {
o := o.Arg()
// TODO: don't hard-code these.
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
continue
}
if err := g.writeSaveDerivedVar(o.Name(), o.Value().MType()); err != nil {
return err
}
}
return nil
}
func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) error) error {
if depth > a.MaxBodyDepth {
return fmt.Errorf("body recursion depth too large")
@@ -569,6 +738,10 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
return nil
}
if err := g.writeSaveExprDerivedVars(n); err != nil {
return err
}
// TODO: delete these hacks that only matches "in.src.read_u8?()" etc.
//
// TODO: check reader1.buf and writer1.buf is non-NULL.
@@ -579,10 +752,8 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
temp := g.perFunc.tempW
g.perFunc.tempW++
// TODO: loop over all limits, not just the first one.
g.printf("if ((%ssrc.buf->ri >= %ssrc.buf->wi) || "+
"(%ssrc.limit.ptr_to_len && (*%ssrc.limit.ptr_to_len == 0))) {",
aPrefix, aPrefix, aPrefix, aPrefix)
g.printf("if (%srptr_src == %srend_src) {", bPrefix, bPrefix)
// TODO: ri == wi isn't the right condition.
g.printf("status = ((%ssrc.buf->closed) && (%ssrc.buf->ri == %ssrc.buf->wi)) ?"+
"puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;",
aPrefix, aPrefix, aPrefix, g.pkgName, g.pkgName)
@@ -597,8 +768,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
if err := g.writeCTypeName(n.MType(), tPrefix, fmt.Sprint(temp)); err != nil {
return err
}
g.printf(" = %ssrc.buf->ptr[%ssrc.buf->ri++];\n", aPrefix, aPrefix)
g.printf("if (%ssrc.limit.ptr_to_len) { (*%ssrc.limit.ptr_to_len)--; }\n", aPrefix, aPrefix)
g.printf(" = *%srptr_src++;\n", bPrefix)
} else if isInSrc(g.tm, n, t.KeySkip32, 1) {
if g.perFunc.tempW > maxTemp {
@@ -616,21 +786,21 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
}
g.writes(";\n")
g.printf("if (%s%d > %ssrc.buf->wi - %ssrc.buf->ri) {\n", tPrefix, temp, aPrefix, aPrefix)
g.printf("if (%s%d > %srend_src - %srptr_src) {\n", tPrefix, temp, bPrefix, bPrefix)
// TODO: save tPrefix+temp as coroutine state, and suspend.
g.printf("%s%d -= %ssrc.buf->wi - %ssrc.buf->ri;\n", tPrefix, temp, aPrefix, aPrefix)
g.printf("%s%d -= %srend_src - %srptr_src;\n", tPrefix, temp, bPrefix, bPrefix)
g.printf("%ssrc.buf->ri = %ssrc.buf->wi;\n", aPrefix, aPrefix)
g.printf("status = %ssrc.buf->closed ? puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;",
aPrefix, g.pkgName, g.pkgName)
if g.perFunc.public && g.perFunc.suspendible {
if g.perFunc.public && g.perFunc.suspendible { // TODO: drop the g.perFunc.public?
g.writes("goto suspend;")
} else {
g.writes("return status;")
}
g.writes("}\n")
g.printf("%ssrc.buf->ri += %s%d;\n", aPrefix, tPrefix, temp)
g.printf("%srptr_src += %s%d;\n", bPrefix, tPrefix, temp)
} else if isInDst(g.tm, n, t.KeyWrite, 1) {
// TODO: don't assume that the argument is "this.stack[s:]".
@@ -675,29 +845,43 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
} else if isThisMethod(g.tm, n, "decode_header", 1) {
g.printf("status = puffs_%s_%s_decode_header(self, %ssrc);\n",
g.pkgName, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_lsd", 1) {
g.printf("status = puffs_%s_%s_decode_lsd(self, %ssrc);\n",
g.pkgName, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_extension", 1) {
g.printf("status = puffs_%s_%s_decode_extension(self, %ssrc);\n",
g.pkgName, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_id", 2) {
g.printf("status = puffs_%s_%s_decode_id(self, %sdst, %ssrc);\n",
g.pkgName, g.perFunc.funk.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
} else if isDecode(g.tm, n) {
g.printf("status = puffs_%s_lzw_decoder_decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
g.pkgName, aPrefix, vPrefix, n.Args()[1].Arg().Value().String(g.tm))
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
// TODO: be principled with "if (status&1)" vs "if (status)".
g.writes("if (status&1) { return status; }\n")
return nil
} else {
// TODO: fix this.
+1
View File
@@ -34,6 +34,7 @@ var (
// "double" being a valid Puffs variable name but not a valid C one.
const (
aPrefix = "a_" // Function argument.
bPrefix = "b_" // Derived from a function argument.
cPrefix = "c_" // Coroutine state.
fPrefix = "f_" // Struct field.
lPrefix = "l_" // Limit length.
+282 -75
View File
@@ -392,6 +392,20 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
uint8_t v_c;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode[0].coro_state;
if (coro_state) {
v_c = self->private_impl.c_decode[0].v_c;
@@ -400,38 +414,118 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
PUFFS_COROUTINE_STATE(0);
PUFFS_COROUTINE_STATE(1);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif_decoder_decode_header(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
PUFFS_COROUTINE_STATE(2);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif_decoder_decode_lsd(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
while (true) {
PUFFS_COROUTINE_STATE(3);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
goto suspend;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_c = t_0;
if (v_c == 33) {
PUFFS_COROUTINE_STATE(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif_decoder_decode_extension(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
} else if (v_c == 44) {
PUFFS_COROUTINE_STATE(5);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif_decoder_decode_id(self, a_dst, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
goto suspend;
}
@@ -451,6 +545,17 @@ suspend:
self->private_impl.c_decode[0].coro_state = coro_state;
self->private_impl.c_decode[0].v_c = v_c;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
self->private_impl.status = status;
@@ -464,6 +569,20 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
uint8_t v_c[6];
uint32_t v_i;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_header[0].coro_state;
if (coro_state) {
memcpy(v_c, self->private_impl.c_decode_header[0].v_c, 6);
@@ -481,17 +600,13 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
v_i = 0;
while (v_i < 6) {
PUFFS_COROUTINE_STATE(1);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_c[v_i] = t_0;
v_i += 1;
}
@@ -508,6 +623,17 @@ suspend:
memcpy(self->private_impl.c_decode_header[0].v_c, v_c, 6);
self->private_impl.c_decode_header[0].v_i = v_i;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
return status;
@@ -521,6 +647,20 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
uint32_t v_i;
uint32_t v_gct_size;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_lsd[0].coro_state;
if (coro_state) {
memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, 7);
@@ -539,17 +679,13 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
v_i = 0;
while (v_i < 7) {
PUFFS_COROUTINE_STATE(1);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_c[v_i] = t_0;
v_i += 1;
}
@@ -563,43 +699,31 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
v_i = 0;
while (v_i < v_gct_size) {
PUFFS_COROUTINE_STATE(2);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_1 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 0] = t_1;
PUFFS_COROUTINE_STATE(3);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_2 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 1] = t_2;
PUFFS_COROUTINE_STATE(4);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_3 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_3 = *b_rptr_src++;
self->private_impl.f_gct[(3 * v_i) + 2] = t_3;
v_i += 1;
}
@@ -614,6 +738,17 @@ suspend:
self->private_impl.c_decode_lsd[0].v_i = v_i;
self->private_impl.c_decode_lsd[0].v_gct_size = v_gct_size;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
return status;
@@ -626,6 +761,20 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
uint8_t v_label;
uint8_t v_block_size;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_extension[0].coro_state;
if (coro_state) {
v_label = self->private_impl.c_decode_extension[0].v_label;
@@ -635,17 +784,13 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
PUFFS_COROUTINE_STATE(0);
PUFFS_COROUTINE_STATE(1);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_label = t_0;
if (v_label == 1) {
} else if (v_label == 249) {
@@ -656,31 +801,27 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
}
while (true) {
PUFFS_COROUTINE_STATE(2);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_1 = *b_rptr_src++;
v_block_size = t_1;
if (v_block_size == 0) {
goto label_0_break;
}
PUFFS_COROUTINE_STATE(3);
size_t t_2 = ((uint32_t)(v_block_size));
if (t_2 > a_src.buf->wi - a_src.buf->ri) {
t_2 -= a_src.buf->wi - a_src.buf->ri;
if (t_2 > b_rend_src - b_rptr_src) {
t_2 -= b_rend_src - b_rptr_src;
a_src.buf->ri = a_src.buf->wi;
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
a_src.buf->ri += t_2;
b_rptr_src += t_2;
}
label_0_break:;
PUFFS_COROUTINE_STATE(4);
@@ -692,6 +833,17 @@ suspend:
self->private_impl.c_decode_extension[0].v_label = v_label;
self->private_impl.c_decode_extension[0].v_block_size = v_block_size;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
return status;
@@ -710,6 +862,20 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
uint64_t l_lzw_src;
puffs_base_reader1 v_lzw_src;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode_id[0].coro_state;
if (coro_state) {
memcpy(v_c, self->private_impl.c_decode_id[0].v_c, 9);
@@ -732,17 +898,13 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
v_i = 0;
while (v_i < 9) {
PUFFS_COROUTINE_STATE(1);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_c[v_i] = t_0;
v_i += 1;
}
@@ -753,17 +915,13 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
return puffs_gif_error_todo_unsupported_local_color_table;
}
PUFFS_COROUTINE_STATE(2);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_1 = *b_rptr_src++;
v_lw = t_1;
if ((v_lw < 2) || (8 < v_lw)) {
return puffs_gif_error_bad_lzw_literal_width;
@@ -772,17 +930,13 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
((uint32_t)(v_lw)));
while (true) {
PUFFS_COROUTINE_STATE(3);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_2 = *b_rptr_src++;
v_block_size = t_2;
if (v_block_size == 0) {
goto label_0_break;
@@ -794,8 +948,29 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
.ptr_to_len = &l_lzw_src, .next = &a_src.limit,
}};
PUFFS_COROUTINE_STATE(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif_lzw_decoder_decode(&self->private_impl.f_lzw, a_dst,
v_lzw_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status & 1) {
return status;
}
@@ -815,6 +990,17 @@ suspend:
self->private_impl.c_decode_id[0].l_lzw_src = l_lzw_src;
self->private_impl.c_decode_id[0].v_lzw_src = v_lzw_src;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
return status;
@@ -867,6 +1053,20 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
uint32_t v_s;
uint32_t v_c;
uint8_t* b_rptr_src = NULL;
uint8_t* b_rend_src = NULL;
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
uint32_t coro_state = self->private_impl.c_decode[0].coro_state;
if (coro_state) {
v_clear_code = self->private_impl.c_decode[0].v_clear_code;
@@ -896,17 +1096,13 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
while (true) {
while (v_n_bits < v_width) {
PUFFS_COROUTINE_STATE(1);
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.ptr_to_len && (*a_src.limit.ptr_to_len == 0))) {
if (b_rptr_src == b_rend_src) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
goto suspend;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.ptr_to_len) {
(*a_src.limit.ptr_to_len)--;
}
uint8_t t_0 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
v_n_bits += 8;
}
@@ -1004,6 +1200,17 @@ suspend:
self->private_impl.c_decode[0].v_s = v_s;
self->private_impl.c_decode[0].v_c = v_c;
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base_limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
goto exit;
exit:
self->private_impl.status = status;