From 1c7a6792de33624fafeea46f281043ad10513b62 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 4 Nov 2017 15:19:40 +1100 Subject: [PATCH] Tweak the decode_huffman_fast loop condition. --- cmd/puffs-c/internal/cgen/expr.go | 19 ++++++++++++++++--- gen/c/std/flate.c | 2 +- std/flate/decode_huffman_fast.puffs | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index 0ee6e647..c1251e62 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -278,9 +278,22 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if pp == parenthesesMandatory { b.writeb('(') } - // TODO: don't hard-code dst. - const wName = "dst" - b.printf("(uint64_t)(%swend_%s - %swptr_%s)", bPrefix, wName, bPrefix, wName) + p0, p1 := "", "" + if o := n.LHS().Expr().LHS().Expr(); o != nil { + // TODO: don't hard-code these. + switch o.String(g.tm) { + case "in.dst": + p0 = bPrefix + "wend_dst" + p1 = bPrefix + "wptr_dst" + case "in.src": + p0 = bPrefix + "rend_src" + p1 = bPrefix + "rptr_src" + } + } + if p0 == "" { + return fmt.Errorf(`TODO: cgen a "foo.available" expression`) + } + b.printf("(uint64_t)(%s - %s)", p0, p1) if pp == parenthesesMandatory { b.writeb(')') } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 66421522..7f71595f 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2036,7 +2036,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_lmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1); v_dmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[1]) - 1); label_0_continue:; - while (((uint64_t)(b_wend_dst - b_wptr_dst)) > 999999999) { + while (((uint64_t)(b_rend_src - b_rptr_src)) >= 6) { while (true) { v_table_entry = self->private_impl.f_huffs[0][v_bits & v_lmask]; v_table_entry_n_bits = (v_table_entry & 15); diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index 1b2eaa70..4f877b1a 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -26,7 +26,7 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { var lmask u32[..511] = ((1 as u32) << this.n_huffs_bits[0]) - 1 var dmask u32[..511] = ((1 as u32) << this.n_huffs_bits[1]) - 1 - while:loop in.dst.available() > 999999999 { // TODO: change 999999999 to the real condition. + while:loop in.src.available() >= 6 { // Decode an lcode symbol from H-L. while true { table_entry = this.huffs[0][bits & lmask]