diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index 3e566ae7..046fc597 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -921,6 +921,62 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.writes("}\n") + } else if isInDst(g.tm, n, t.KeyCopyHistory32, 2) { + if g.perFunc.tempW > maxTemp-2 { + return fmt.Errorf("too many temporary variables required") + } + temp0 := g.perFunc.tempW + 0 + temp1 := g.perFunc.tempW + 1 + temp2 := g.perFunc.tempW + 2 + g.perFunc.tempW += 3 + g.perFunc.tempR += 3 + + g.writes("{\n") + + g.writes("self->private_impl.scratch = ((uint64_t)(") + x0 := n.Args()[0].Arg().Value() + if err := g.writeExpr(x0, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { + return err + } + g.writes(")<<32) | (uint64_t)(") + x1 := n.Args()[1].Arg().Value() + if err := g.writeExpr(x1, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { + return err + } + g.writes(");\n") + if err := g.writeCoroSuspPoint(); err != nil { + return err + } + + const wName = "dst" + g.printf("size_t %s%d = (size_t)(self->private_impl.scratch >> 32);", tPrefix, temp0) + // TODO: it's not a BAD_ARGUMENT if we can copy from the sliding window. + g.printf("if (PUFFS_UNLIKELY((%s%d == 0) || (%s%d > (%swptr_%s - %s%s.buf->ptr)))) { "+ + "status = %sERROR_BAD_ARGUMENT; goto exit; }\n", + tPrefix, temp0, tPrefix, temp0, bPrefix, wName, aPrefix, wName, g.PKGPREFIX) + g.printf("uint8_t* %s%d = %swptr_%s - %s%d;\n", tPrefix, temp1, bPrefix, wName, tPrefix, temp0) + g.printf("uint32_t %s%d = (uint32_t)(self->private_impl.scratch);", tPrefix, temp2) + + g.printf("if (PUFFS_LIKELY((size_t)(%s%d) <= (%swend_%s - %swptr_%s))) {", + tPrefix, temp2, bPrefix, wName, bPrefix, wName) + + g.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n", + tPrefix, temp2, tPrefix, temp2, bPrefix, wName, tPrefix, temp1) + + g.writes("} else {\n") + + g.printf("%s%d = (uint32_t)(%swend_%s - %swptr_%s);\n", + tPrefix, temp2, bPrefix, wName, bPrefix, wName) + g.printf("self->private_impl.scratch -= (uint64_t)(%s%d);\n", tPrefix, temp2) + g.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n", + tPrefix, temp2, tPrefix, temp2, bPrefix, wName, tPrefix, temp1) + // TODO: SHORT_WRITE vs LIMITED_WRITE? + g.printf("status = %sSUSPENSION_SHORT_WRITE; goto suspend;\n", g.PKGPREFIX) + + g.writes("}\n") + + g.writes("}\n") + } else if isThisMethod(g.tm, n, "decode_header", 1) { g.printf("status = %s%s_decode_header(self, %ssrc);\n", g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 5bc756bb..28d9951c 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -922,6 +922,33 @@ 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; + PUFFS_COROUTINE_SUSPENSION_POINT(6); + { + self->private_impl.scratch = + ((uint64_t)(v_distance) << 32) | (uint64_t)(v_length); + PUFFS_COROUTINE_SUSPENSION_POINT(7); + size_t t_4 = (size_t)(self->private_impl.scratch >> 32); + if (PUFFS_UNLIKELY((t_4 == 0) || + (t_4 > (b_wptr_dst - a_dst.buf->ptr)))) { + status = PUFFS_FLATE_ERROR_BAD_ARGUMENT; + goto exit; + } + uint8_t* t_5 = b_wptr_dst - t_4; + uint32_t t_6 = (uint32_t)(self->private_impl.scratch); + if (PUFFS_LIKELY((size_t)(t_6) <= (b_wend_dst - b_wptr_dst))) { + for (; t_6; t_6--) { + *b_wptr_dst++ = *t_5++; + } + } else { + t_6 = (uint32_t)(b_wend_dst - b_wptr_dst); + self->private_impl.scratch -= (uint64_t)(t_6); + for (; t_6; t_6--) { + *b_wptr_dst++ = *t_5++; + } + status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE; + goto suspend; + } + } } label_0_break:; self->private_impl.f_bits = v_bits; diff --git a/lang/check/bounds.go b/lang/check/bounds.go index bdfbff90..f461b7ec 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -646,7 +646,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, if isInSrc(q.tm, n, t.KeyReadU8, 0) || isInSrc(q.tm, n, t.KeyReadU32LE, 0) || isInSrc(q.tm, n, t.KeySkip32, 1) || isInDst(q.tm, n, t.KeyWrite, 1) || isInDst(q.tm, n, t.KeyWriteU8, 1) || - isInDst(q.tm, n, t.KeyCopyFrom32, 2) || + isInDst(q.tm, n, t.KeyCopyFrom32, 2) || isInDst(q.tm, n, t.KeyCopyHistory32, 2) || isThisMethod(q.tm, n, "decode_header", 1) || isThisMethod(q.tm, n, "decode_lsd", 1) || isThisMethod(q.tm, n, "decode_extension", 1) || isThisMethod(q.tm, n, "decode_id", 2) || isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) || diff --git a/lang/check/type.go b/lang/check/type.go index 54ef0928..08e85e0e 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -346,7 +346,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { if isInSrc(q.tm, n, t.KeyReadU8, 0) || isInSrc(q.tm, n, t.KeyReadU32LE, 0) || isInSrc(q.tm, n, t.KeySkip32, 1) || isInDst(q.tm, n, t.KeyWrite, 1) || isInDst(q.tm, n, t.KeyWriteU8, 1) || - isInDst(q.tm, n, t.KeyCopyFrom32, 2) || + isInDst(q.tm, n, t.KeyCopyFrom32, 2) || isInDst(q.tm, n, t.KeyCopyHistory32, 2) || isThisMethod(q.tm, n, "decode_header", 1) || isThisMethod(q.tm, n, "decode_lsd", 1) || isThisMethod(q.tm, n, "decode_extension", 1) || isThisMethod(q.tm, n, "decode_id", 2) || isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) || diff --git a/lang/token/list.go b/lang/token/list.go index 2b5eaafd..03aea360 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -257,10 +257,11 @@ const ( KeyWriteU64BE = Key(IDWriteU64BE >> KeyShift) KeyWriteU64LE = Key(IDWriteU64LE >> KeyShift) - KeyCopyFrom32 = Key(IDCopyFrom32 >> KeyShift) - KeyCopyFrom64 = Key(IDCopyFrom64 >> KeyShift) - KeySkip32 = Key(IDSkip32 >> KeyShift) - KeySkip64 = Key(IDSkip64 >> KeyShift) + KeyCopyFrom32 = Key(IDCopyFrom32 >> KeyShift) + KeyCopyFrom64 = Key(IDCopyFrom64 >> KeyShift) + KeySkip32 = Key(IDSkip32 >> KeyShift) + KeySkip64 = Key(IDSkip64 >> KeyShift) + KeyCopyHistory32 = Key(IDCopyHistory32 >> KeyShift) KeyXUnaryPlus = Key(IDXUnaryPlus >> KeyShift) KeyXUnaryMinus = Key(IDXUnaryMinus >> KeyShift) @@ -421,10 +422,11 @@ const ( IDWriteU64BE = ID(0xBE<>= table_entry_n_bits n_bits -= table_entry_n_bits - // TODO: use length and distance. + // 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. + in.dst.copy_history32?(distance:distance, length:length) } this.bits = bits diff --git a/test/c/std/flate.c b/test/c/std/flate.c index d64163f2..3537bb3b 100644 --- a/test/c/std/flate.c +++ b/test/c/std/flate.c @@ -204,11 +204,15 @@ void test_puffs_flate_work_in_progress() { puffs_base_buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; puffs_base_buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; + puffs_base_buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE}; golden_test* gt = &flate_romeo_gt; if (!read_file(&src, gt->src_filename)) { return; } + if (!read_file(&want, gt->want_filename)) { + return; + } src.ri = gt->src_offset0; src.wi = gt->src_offset1; @@ -228,42 +232,7 @@ void test_puffs_flate_work_in_progress() { return; } - // As per the package's README.md: - // lcode_lengths[31] = 0 - // lcode_lengths[32] = 4 - // lcode_lengths[33] = 8 - // lcode_lengths[34] = 0 - // etc - // dcode_lengths[18] = 3 - // dcode_lengths[19] = 6 - if (dec.private_impl.f_code_lengths[31] != 0) { - FAIL("cl[31]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[31], (uint8_t)(0)); - return; - } - if (dec.private_impl.f_code_lengths[32] != 4) { - FAIL("cl[32]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[32], (uint8_t)(4)); - return; - } - if (dec.private_impl.f_code_lengths[33] != 8) { - FAIL("cl[33]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[33], (uint8_t)(8)); - return; - } - if (dec.private_impl.f_code_lengths[34] != 0) { - FAIL("cl[34]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[34], (uint8_t)(0)); - return; - } - if (dec.private_impl.f_code_lengths[266 + 18] != 3) { - FAIL("cl[266 + 18]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[266 + 18], (uint8_t)(3)); - return; - } - if (dec.private_impl.f_code_lengths[266 + 19] != 6) { - FAIL("cl[266 + 19]: got %" PRIu8 ", want %" PRIu8, - dec.private_impl.f_code_lengths[266 + 19], (uint8_t)(6)); + if (!buf1s_equal("", &got, &want)) { return; } }