From d30d4c3dad01b510433657d432bfe31c5ff6be15 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 6 Oct 2017 14:17:01 +1100 Subject: [PATCH] Add a writer1.length method. --- cmd/puffs-c/internal/cgen/expr.go | 16 ++++++++++++---- gen/c/std/flate.c | 2 ++ std/flate/decode_flate.puffs | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index 2c395560..4ce4c3ae 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -171,12 +171,20 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if pp == parenthesesMandatory { b.writeb('(') } - b.writes("(uint64_t)(") + x := n.LHS().Expr().LHS().Expr() - if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil { - return err + if typ := x.MType(); typ.Decorator() == 0 && typ.Name().Key() == t.KeyWriter1 { + // TODO: don't hard-code dst. + const wName = "dst" + b.printf("(uint64_t)(%swptr_%s - %swstart_%s)", bPrefix, wName, bPrefix, wName) + } else { + b.writes("(uint64_t)(") + if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil { + return err + } + b.writes(".len)") } - b.writes(".len)") + if pp == parenthesesMandatory { b.writeb(')') } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 2eb8f806..d7eb1337 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -1314,6 +1314,8 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( v_distance += ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1)); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; + if (((uint64_t)(v_distance)) > ((uint64_t)(b_wptr_dst - b_wstart_dst))) { + } PUFFS_COROUTINE_SUSPENSION_POINT(8); { self->private_impl.c_decode_huffman[0].scratch = diff --git a/std/flate/decode_flate.puffs b/std/flate/decode_flate.puffs index 8a1804b3..afb3f050 100644 --- a/std/flate/decode_flate.puffs +++ b/std/flate/decode_flate.puffs @@ -341,6 +341,8 @@ pri func decoder.decode_huffman?(dst writer1, src reader1)() { // TODO: copy_history32 should also take some notion of how much of dst // is valid. When copying from a distance greater than that, we also // need to keep a sliding window of previous history. + if (distance as u64) > in.dst.length() { + } in.dst.copy_history32?(distance:distance, length:length) }