diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 4b6a8a8f..50549228 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -94,6 +94,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header case t.KeyReader1: 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) @@ -102,6 +103,8 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) if header { + b.printf("%srstart_%s = %srptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("uint64_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) b.printf("puffs_base__limit1* lim;\n") @@ -119,6 +122,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header case t.KeyWriter1: 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) @@ -127,6 +131,8 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) if header { + b.printf("%swstart_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, 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) @@ -177,6 +183,7 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer b.printf("}\n") if footer { + b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srstart_%s);", bPrefix, nameStr) b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srend_%s);", bPrefix, nameStr) } @@ -197,6 +204,7 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer b.printf("}\n") if footer { + b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swstart_%s);", bPrefix, nameStr) b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr) } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 1fcd388e..b2b2a5bb 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -893,9 +893,11 @@ puffs_flate__status puffs_flate__flate_decoder__decode( 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1009,6 +1011,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -1026,9 +1029,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_blocks( 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1189,6 +1194,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1213,9 +1219,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed( uint32_t v_n_copied; 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1229,9 +1237,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed( } } 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1332,6 +1342,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -1343,6 +1354,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1437,9 +1449,11 @@ static puffs_flate__status puffs_flate__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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1666,6 +1680,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1981,9 +1996,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( uint32_t v_hdist; 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1997,9 +2014,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( } } 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2372,6 +2391,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -2383,6 +2403,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2418,9 +2439,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_slow( uint32_t v_hdist; 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -2434,9 +2457,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_slow( } } 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2807,6 +2832,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -2818,6 +2844,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2852,9 +2879,11 @@ puffs_flate__status puffs_flate__zlib_decoder__decode( puffs_flate__status v_z; 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -2868,9 +2897,11 @@ puffs_flate__status puffs_flate__zlib_decoder__decode( } } 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -3037,6 +3068,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -3048,6 +3080,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 6cb8297e..702ce2c6 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -721,9 +721,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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -854,6 +856,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -878,9 +881,11 @@ static puffs_gif__status puffs_gif__decoder__decode_header( 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -941,6 +946,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -965,9 +971,11 @@ static puffs_gif__status puffs_gif__decoder__decode_lsd( 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1060,6 +1068,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1083,9 +1092,11 @@ static puffs_gif__status puffs_gif__decoder__decode_extension( 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1170,6 +1181,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1199,9 +1211,11 @@ static puffs_gif__status puffs_gif__decoder__decode_id( puffs_gif__status v_z; 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1354,6 +1368,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1415,9 +1430,11 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self, uint64_t v_n_copied; 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; b_wend_dst = b_wptr_dst; if (!a_dst.buf->closed) { uint64_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1431,9 +1448,11 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self, } } 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; uint64_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -1589,6 +1608,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.buf) { @@ -1600,6 +1620,7 @@ exit: *lim->ptr_to_len -= n; } } + PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); }