From bdfe4abbd39ee9e34a1bc9ef4b423439bd70ef72 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 26 Oct 2017 12:55:52 +1100 Subject: [PATCH] Remove codegen for b_wstart_dst. --- cmd/puffs-c/internal/cgen/var.go | 10 ---------- gen/c/std/flate.c | 27 --------------------------- gen/c/std/gif.c | 21 --------------------- 3 files changed, 58 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 4a2753e0..d11184fb 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -88,16 +88,12 @@ 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) // TODO: delete. 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;") b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr) @@ -110,16 +106,12 @@ 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) // TODO: delete. 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("%swend_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) b.printf("if (!%s%s.buf->closed) {", aPrefix, nameStr) b.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) @@ -156,7 +148,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer b.printf("}") 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) } @@ -174,7 +165,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer b.printf("}") 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 79078d7d..ca44936c 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -836,11 +836,9 @@ 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) { size_t len = a_dst.buf->len - a_dst.buf->wi; @@ -962,7 +960,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -980,11 +977,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1137,7 +1132,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1162,11 +1156,9 @@ 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) { size_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1180,11 +1172,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1283,7 +1273,6 @@ 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) { @@ -1295,7 +1284,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1331,11 +1319,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman( 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) { size_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1349,11 +1335,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman( } } 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) { @@ -1692,7 +1676,6 @@ 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) { @@ -1704,7 +1687,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1799,11 +1781,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -2022,7 +2002,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2337,11 +2316,9 @@ 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) { size_t len = a_dst.buf->len - a_dst.buf->wi; @@ -2355,11 +2332,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -2541,7 +2516,6 @@ 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) { @@ -2553,7 +2527,6 @@ 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 a7eda5ee..7fc85d54 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -684,11 +684,9 @@ 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) { @@ -849,7 +847,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -873,11 +870,9 @@ 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) { @@ -936,7 +931,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -960,11 +954,9 @@ 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) { @@ -1049,7 +1041,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1073,11 +1064,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1158,7 +1147,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1187,11 +1175,9 @@ 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) { @@ -1318,7 +1304,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -1380,11 +1365,9 @@ 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) { size_t len = a_dst.buf->len - a_dst.buf->wi; @@ -1398,11 +1381,9 @@ 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; size_t len = a_src.buf->wi - a_src.buf->ri; puffs_base__limit1* lim; for (lim = &a_src.limit; lim; lim = lim->next) { @@ -1556,7 +1537,6 @@ 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) { @@ -1568,7 +1548,6 @@ exit: *lim->ptr_to_len -= n; } } - PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); }