From 4158d7eae7ba9172a25f78a260a60c3ca8638bba Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 2 Nov 2017 18:29:37 +1100 Subject: [PATCH] Avoid redundantly setting end ptrs after resume. No significant benchmark changes. --- cmd/puffs-c/internal/cgen/var.go | 30 +++++++++++++---------- gen/c/std/flate.c | 42 -------------------------------- gen/c/std/gif.c | 28 --------------------- 3 files changed, 17 insertions(+), 83 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 6cd1e9b9..99dbc3f2 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -100,11 +100,13 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;", bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) - b.printf("uint64_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) - b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) - b.printf("if (%s%s.private_impl.limit && (%srend_%s > %s%s.private_impl.limit)) {"+ - " %srend_%s = %s%s.private_impl.limit; }", - aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) + if header { + b.printf("uint64_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) + b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("if (%s%s.private_impl.limit && (%srend_%s > %s%s.private_impl.limit)) {"+ + " %srend_%s = %s%s.private_impl.limit; }", + aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) + } b.printf("}\n") @@ -117,14 +119,16 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("%swptr_%s = %s%s.buf->ptr + %s%s.buf->wi;", bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) - b.printf("%swend_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) - b.printf("if (!%s%s.buf->closed) {", aPrefix, nameStr) - b.printf("uint64_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) - b.printf("%swend_%s += len;", bPrefix, nameStr) - b.printf("if (%s%s.private_impl.limit && (%swend_%s > %s%s.private_impl.limit)) {"+ - " %swend_%s = %s%s.private_impl.limit; }", - aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) - b.printf("}\n") + if header { + b.printf("%swend_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("if (!%s%s.buf->closed) {", aPrefix, nameStr) + b.printf("uint64_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) + b.printf("%swend_%s += len;", bPrefix, nameStr) + b.printf("if (%s%s.private_impl.limit && (%swend_%s > %s%s.private_impl.limit)) {"+ + " %swend_%s = %s%s.private_impl.limit; }", + aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) + b.printf("}\n") + } b.printf("}\n") } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 9f1e0883..64981952 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -947,15 +947,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode( puffs_flate__flate_decoder__decode_blocks(self, a_dst, a_src); if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; - b_wend_dst = b_wptr_dst; - if (!a_dst.buf->closed) { - uint64_t len = a_dst.buf->len - a_dst.buf->wi; - b_wend_dst += len; - if (a_dst.private_impl.limit && - (b_wend_dst > a_dst.private_impl.limit)) { - b_wend_dst = a_dst.private_impl.limit; - } - } } v_z = t_0; if (!(v_z > 0)) { @@ -1083,12 +1074,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks( puffs_flate__flate_decoder__decode_uncompressed(self, a_dst, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -1109,12 +1094,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks( status = puffs_flate__flate_decoder__init_dynamic_huffman(self, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -1131,12 +1110,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks( status = puffs_flate__flate_decoder__decode_huffman(self, a_dst, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -2396,24 +2369,9 @@ puffs_flate__status puffs_flate__zlib_decoder__decode( &self->private_impl.f_flate, a_dst, a_src); if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; - b_wend_dst = b_wptr_dst; - if (!a_dst.buf->closed) { - uint64_t len = a_dst.buf->len - a_dst.buf->wi; - b_wend_dst += len; - if (a_dst.private_impl.limit && - (b_wend_dst > a_dst.private_impl.limit)) { - b_wend_dst = a_dst.private_impl.limit; - } - } } if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } v_z = t_2; v_checksum = puffs_flate__adler32__update( diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 7d08f116..d6653a71 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -788,11 +788,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self, status = puffs_gif__decoder__decode_header(self, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -805,11 +800,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self, status = puffs_gif__decoder__decode_lsd(self, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -830,12 +820,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self, status = puffs_gif__decoder__decode_extension(self, a_src); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -849,12 +833,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self, 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; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } if (status) { goto suspend; @@ -1260,12 +1238,6 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self, &self->private_impl.f_lzw, a_dst, v_r); if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; - uint64_t len = a_src.buf->wi - a_src.buf->ri; - b_rend_src = b_rptr_src + len; - if (a_src.private_impl.limit && - (b_rend_src > a_src.private_impl.limit)) { - b_rend_src = a_src.private_impl.limit; - } } v_z = t_3; if (v_z == 0) {