From fcf1f2b5ae5a2ddfdfc78a9126a21497d90a330d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 2 Oct 2017 13:31:13 +1100 Subject: [PATCH] Generate C derived start pointers for buffers. --- cmd/puffs-c/internal/cgen/func.go | 2 +- cmd/puffs-c/internal/cgen/var.go | 29 ++++++++++++++++++++++------- gen/c/std/flate.c | 30 +++++++++++++++++++++++++++++- gen/c/std/gif.c | 27 +++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 9 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/func.go b/cmd/puffs-c/internal/cgen/func.go index 1608d1c0..432ea85a 100644 --- a/cmd/puffs-c/internal/cgen/func.go +++ b/cmd/puffs-c/internal/cgen/func.go @@ -250,7 +250,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error { for _, o := range g.currFunk.astFunc.In().Fields() { o := o.Field() - if err := g.writeSaveDerivedVar(b, o.Name(), o.XType()); err != nil { + if err := g.writeSaveDerivedVar(b, o.Name(), o.XType(), true); err != nil { return err } } diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index cf26e3ab..a3d88338 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -65,7 +65,7 @@ func (g *gen) findDerivedVars() { } } -func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, decl bool) error { +func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bool) error { if g.currFunk.derivedVars == nil { return nil } @@ -75,14 +75,18 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, decl bo nameStr := name.String(g.tm) switch typ.Name().Key() { case t.KeyReader1: - if decl { + if header { b.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr) + b.printf("uint8_t* %srstart_%s = NULL;", bPrefix, nameStr) b.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr) } b.printf("if (%s%s.buf) {", aPrefix, nameStr) b.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;", bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) + if header { + b.printf("%srstart_%s = %srptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + } b.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) b.printf("puffs_base_limit1* lim;") @@ -94,14 +98,18 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, decl bo b.printf("}\n") case t.KeyWriter1: - if decl { + if header { b.printf("uint8_t* %swptr_%s = NULL;", bPrefix, nameStr) + b.printf("uint8_t* %swstart_%s = NULL;", bPrefix, nameStr) b.printf("uint8_t* %swend_%s = NULL;", bPrefix, nameStr) } b.printf("if (%s%s.buf) {", aPrefix, nameStr) b.printf("%swptr_%s = %s%s.buf->ptr + %s%s.buf->wi;", bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) + if header { + b.printf("%swstart_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + } b.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) b.printf("puffs_base_limit1* lim;") @@ -115,7 +123,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, decl bo return nil } -func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error { +func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer bool) error { if g.currFunk.derivedVars == nil { return nil } @@ -135,6 +143,11 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error { b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }") b.printf("}") + if footer { + b.printf("PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srstart_%s);", bPrefix, nameStr) + b.printf("PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srend_%s);", bPrefix, nameStr) + } + b.printf("}\n") case t.KeyWriter1: @@ -148,8 +161,10 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error { b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }") b.printf("}") - // Not all writer1 methods use the wend variable. - b.printf("PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr) + if footer { + b.printf("PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swstart_%s);", bPrefix, nameStr) + b.printf("PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr) + } b.printf("}\n") } @@ -189,7 +204,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error { if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" { continue } - if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType()); err != nil { + if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil { return err } } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index c2b0f5a1..2732962f 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -656,9 +656,11 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, uint32_t v_already_full; uint8_t* b_wptr_dst = NULL; + uint8_t* b_wstart_dst = NULL; uint8_t* b_wend_dst = NULL; if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + b_wstart_dst = b_wptr_dst; size_t len = a_dst.buf->len - a_dst.buf->wi; puffs_base_limit1* lim; for (lim = &a_dst.limit; lim; lim = lim->next) { @@ -692,7 +694,6 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, *lim->ptr_to_len -= n; } } - PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } puffs_flate_status t_0 = puffs_flate_decoder_decode_blocks(self, a_dst, a_src); @@ -768,6 +769,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -784,9 +786,11 @@ puffs_flate_status puffs_flate_decoder_decode_blocks(puffs_flate_decoder* self, uint32_t v_type; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -935,6 +939,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -960,9 +966,11 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( uint32_t v_n; uint8_t* b_wptr_dst = NULL; + uint8_t* b_wstart_dst = NULL; uint8_t* b_wend_dst = NULL; if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + b_wstart_dst = b_wptr_dst; size_t len = a_dst.buf->len - a_dst.buf->wi; puffs_base_limit1* lim; for (lim = &a_dst.limit; lim; lim = lim->next) { @@ -973,9 +981,11 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( b_wend_dst = b_wptr_dst + len; } uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1072,6 +1082,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -1083,6 +1094,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -1117,9 +1130,11 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( uint32_t v_distance; uint8_t* b_wptr_dst = NULL; + uint8_t* b_wstart_dst = NULL; uint8_t* b_wend_dst = NULL; if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + b_wstart_dst = b_wptr_dst; size_t len = a_dst.buf->len - a_dst.buf->wi; puffs_base_limit1* lim; for (lim = &a_dst.limit; lim; lim = lim->next) { @@ -1130,9 +1145,11 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( b_wend_dst = b_wptr_dst + len; } uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1407,6 +1424,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -1418,6 +1436,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -1511,9 +1531,11 @@ puffs_flate_status puffs_flate_decoder_init_dynamic_huffman( uint32_t v_rep_count; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1729,6 +1751,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -2043,9 +2067,11 @@ puffs_flate_status puffs_flate_zlib_decoder_decode( uint32_t v_checksum; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -2179,6 +2205,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } self->private_impl.status = status; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 694d0878..e7492b0d 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -559,9 +559,11 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, uint8_t v_c; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -719,6 +721,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } self->private_impl.status = status; @@ -744,9 +748,11 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, uint32_t v_i; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -802,6 +808,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -827,9 +835,11 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self, uint32_t v_gct_size; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -911,6 +921,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -935,9 +947,11 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, uint8_t v_block_size; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1023,6 +1037,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -1053,9 +1069,11 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, puffs_base_reader1 v_lzw_src; uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1179,6 +1197,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } return status; @@ -1240,9 +1260,11 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, uint32_t v_c; uint8_t* b_wptr_dst = NULL; + uint8_t* b_wstart_dst = NULL; uint8_t* b_wend_dst = NULL; if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + b_wstart_dst = b_wptr_dst; size_t len = a_dst.buf->len - a_dst.buf->wi; puffs_base_limit1* lim; for (lim = &a_dst.limit; lim; lim = lim->next) { @@ -1253,9 +1275,11 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, b_wend_dst = b_wptr_dst + len; } uint8_t* b_rptr_src = NULL; + uint8_t* b_rstart_src = NULL; uint8_t* b_rend_src = NULL; if (a_src.buf) { b_rptr_src = a_src.buf->ptr + a_src.buf->ri; + b_rstart_src = b_rptr_src; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base_limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1401,6 +1425,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -1412,6 +1437,8 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); + PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } self->private_impl.status = status;