mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Re-do how limits work.
This commit is contained in:
1 parent
a382101a9c
commit
8ff453c752
16 files changed
+389
-122
No files matched your search
@@ -78,7 +78,9 @@ typedef struct puffs_base__limit1 {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -88,7 +90,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
|
||||
@@ -277,7 +277,10 @@ static inline uint32_t puffs_base__writer1__copy_from_slice32(
|
||||
static inline puffs_base__empty_struct puffs_base__reader1__limit(
|
||||
puffs_base__reader1* r,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!r->use_limitt || (r->limitt > limit)) {
|
||||
r->limitt = limit;
|
||||
r->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
@@ -291,7 +294,10 @@ static inline puffs_base__empty_struct puffs_base__reader1__mark(
|
||||
static inline puffs_base__empty_struct puffs_base__writer1__limit(
|
||||
puffs_base__writer1* w,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!w->use_limitt || (w->limitt > limit)) {
|
||||
w->limitt = limit;
|
||||
w->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ const (
|
||||
cPrefix = "c_" // Coroutine state.
|
||||
fPrefix = "f_" // Struct field.
|
||||
iPrefix = "i_" // Iterate variable.
|
||||
lPrefix = "l_" // Limit length.
|
||||
lPrefix = "l_" // Limit length. TODO: delete.
|
||||
tPrefix = "t_" // Temporary local variable.
|
||||
vPrefix = "v_" // Local variable.
|
||||
)
|
||||
|
||||
@@ -19,8 +19,8 @@ package cgen
|
||||
const baseHeader = "" +
|
||||
"#ifndef PUFFS_BASE_HEADER_H\n#define PUFFS_BASE_HEADER_H\n\n// Copyright 2017 The Puffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n#include <stdbool.h>\n#include <stdint.h>\n#include <string.h>\n\n// Puffs requires a word size of at least 32 bits because it assumes that\n// converting a u32 to usize will never overflow. For example, the size of a\n// decoded image is often represented, explicitly or implicitly in an image\n// file, as a u32, and it is convenient to compare that to a buffer size.\n//\n// Si" +
|
||||
"milarly, the word size is at most 64 bits because it assumes that\n// converting a usize to u64 will never overflow.\n#if __WORDSIZE < 32\n#error \"Puffs requires a word size of at least 32 bits\"\n#elif __WORDSIZE > 64\n#error \"Puffs requires a word size of at most 64 bits\"\n#endif\n\n// PUFFS_VERSION is the major.minor version number as a uint32. The major\n// number is the high 16 bits. The minor number is the low 16 bits.\n//\n// The intention is to bump the version number at least on every API / ABI\n// backwards incompatible change.\n//\n// For now, the API and ABI are simply unstable and can change at any time.\n//\n// TODO: don't hard code this in base-header.h.\n#define PUFFS_VERSION (0x00001)\n\n// puffs_base__slice_u8 is a 1-dimensional buffer (a pointer and length).\n//\n// A value with all fields NULL or zero is a valid, empty slice.\ntypedef struct {\n uint8_t* ptr;\n size_t len;\n} puffs_base__slice_u8;\n\n// puffs_base__buf1 is a 1-dimensional buffer (a pointer and length), plus\n// additional indexes into that buffer, p" +
|
||||
"lus an opened / closed flag.\n//\n// A value with all fields NULL or zero is a valid, empty buffer.\ntypedef struct {\n uint8_t* ptr; // Pointer.\n size_t len; // Length.\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n bool closed; // No further writes are expected.\n} puffs_base__buf1;\n\n// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:\n// its first N bytes. That N can be greater than a buffer's current read or\n// write capacity. N decreases naturally over time as bytes are read from or\n// written to the stream.\n//\n// A value with all fields NULL or zero is a valid, unlimited view.\ntypedef struct puffs_base__limit1 {\n uint64_t* ptr_to_len; // Pointer to N.\n struct puffs_base__limit1* next; // Linked list of limits.\n} puffs_base__limit1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or s" +
|
||||
"afety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__reader1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__writer1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
|
||||
"lus an opened / closed flag.\n//\n// A value with all fields NULL or zero is a valid, empty buffer.\ntypedef struct {\n uint8_t* ptr; // Pointer.\n size_t len; // Length.\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n bool closed; // No further writes are expected.\n} puffs_base__buf1;\n\n// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:\n// its first N bytes. That N can be greater than a buffer's current read or\n// write capacity. N decreases naturally over time as bytes are read from or\n// written to the stream.\n//\n// A value with all fields NULL or zero is a valid, unlimited view.\ntypedef struct puffs_base__limit1 {\n uint64_t* ptr_to_len; // Pointer to N.\n struct puffs_base__limit1* next; // Linked list of limits.\n} puffs_base__limit1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit; // TODO: delete.\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n b" +
|
||||
"ool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__reader1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit; // TODO: delete.\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n bool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__writer1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
|
||||
""
|
||||
|
||||
const baseImpl = "" +
|
||||
@@ -32,8 +32,8 @@ const baseImpl = "" +
|
||||
"_ij(\n puffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((puffs_base__slice_u8){});\n}\n\n// puffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline puffs_base__slice_u8 puffs_base__slice_u8__prefix(\n puffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// puffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline puffs_base__slice_u8 puffs_base__slice_u8_suffix(\n puffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// puffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a puffs_base__slice_u8 with all fields NULL or zero (a v" +
|
||||
"alid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t puffs_base__slice_u8__copy_from_slice(\n puffs_base__slice_u8 dst,\n puffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_history32(\n uint8_t** ptr_ptr,\n uint8_t* start, // May be NULL, meaning an unmarked writer1.\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!start) {\n return 0;\n }\n uint8_t* ptr = *ptr_ptr;\n size_t d = ptr - start;\n if ((d == 0) || (d < (size_t)(distance))) {\n return 0;\n }\n start = ptr - distance;\n size_t n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; n >= 8; n -= 8) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *star" +
|
||||
"t++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_reader32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t puffs_base__writer1__copy_from_slice(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n puffs_base__slice_u8 src) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t puffs_base__writer1__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n " +
|
||||
" puffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__limit(\n puffs_base__reader1* r,\n uint64_t limit) {\n // TODO: implement.\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__mark(\n puffs_base__reader1* r,\n uint8_t* mark) {\n r->private_impl.mark = mark;\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__writer1__limit(\n puffs_base__writer1* w,\n uint64_t limit) {\n // TODO: implement.\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__writer1__mark(\n puffs_base__writer1* w,\n uint8_t* mark) {\n w->private_impl.mark = mark;\n return ((puffs_base__empty_struct){});\n}\n\n#e" +
|
||||
"ndif // PUFFS_BASE_IMPL_H\n" +
|
||||
" puffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__limit(\n puffs_base__reader1* r,\n uint64_t limit) {\n if (!r->use_limitt || (r->limitt > limit)) {\n r->limitt = limit;\n r->use_limitt = true;\n }\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__reader1__mark(\n puffs_base__reader1* r,\n uint8_t* mark) {\n r->private_impl.mark = mark;\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_struct puffs_base__writer1__limit(\n puffs_base__writer1* w,\n uint64_t limit) {\n if (!w->use_limitt || (w->limitt > limit)) {\n w->limitt = limit;\n w->use_limitt = true;\n }\n return ((puffs_base__empty_struct){});\n}\n\nstatic inline puffs_base__empty_stru" +
|
||||
"ct puffs_base__writer1__mark(\n puffs_base__writer1* w,\n uint8_t* mark) {\n w->private_impl.mark = mark;\n return ((puffs_base__empty_struct){});\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" +
|
||||
""
|
||||
|
||||
type template_args_short_read struct {
|
||||
@@ -42,7 +42,8 @@ type template_args_short_read struct {
|
||||
}
|
||||
|
||||
func template_short_read(b *buffer, args template_args_short_read) error {
|
||||
b.printf("short_read_%s:\nif (a_%s.buf && a_%s.buf->closed && !a_%s.limit.ptr_to_len) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
|
||||
b.printf("short_read_%s:\nif (a_%s.buf && a_%s.buf->closed && !a_%s.limit.ptr_to_len &&\n!a_%s.use_limitt) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
|
||||
args.name,
|
||||
args.name,
|
||||
args.name,
|
||||
args.name,
|
||||
|
||||
@@ -313,6 +313,27 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
|
||||
b.writes(")\n")
|
||||
return nil
|
||||
}
|
||||
if isThatMethod(g.tm, n, t.KeyLimitt, 1) {
|
||||
// TODO: don't hard-code v_r.
|
||||
b.printf("puffs_base__reader1__limit(&v_r,")
|
||||
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")")
|
||||
return nil
|
||||
}
|
||||
if isThatMethod(g.tm, n, t.KeyMark, 0) {
|
||||
// TODO: don't hard-code v_r or b_rptr_src.
|
||||
b.printf("puffs_base__reader1__mark(&v_r, b_rptr_src)")
|
||||
return nil
|
||||
}
|
||||
if isThatMethod(g.tm, n, t.KeySinceMark, 0) {
|
||||
// TODO: don't hard-code v_r or b_rptr_src.
|
||||
b.printf("((puffs_base__slice_u8){ " +
|
||||
".ptr = v_r.private_impl.mark, " +
|
||||
".len = v_r.private_impl.mark ? b_rptr_src - v_r.private_impl.mark : 0, })")
|
||||
return nil
|
||||
}
|
||||
// TODO.
|
||||
|
||||
case t.KeyOpenBracket:
|
||||
|
||||
@@ -556,7 +556,9 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
}
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThatMethod(g.tm, n, g.tm.ByName("decode").Key(), 2) {
|
||||
} else if isThatMethod(g.tm, n, g.tm.ByName("decode").Key(), 2) ||
|
||||
isThatMethod(g.tm, n, g.tm.ByName("decode").Key(), 3) {
|
||||
|
||||
switch g.pkgName {
|
||||
case "flate":
|
||||
// TODO: don't hard code being inside a try call.
|
||||
@@ -566,6 +568,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
temp := g.currFunk.tempW
|
||||
g.currFunk.tempW++
|
||||
|
||||
// TODO: don't hard-code a_dst or a_src.
|
||||
b.printf("%sstatus %s%d = %sflate_decoder__decode(&self->private_impl.f_flate, %sdst, %ssrc);\n",
|
||||
g.pkgPrefix, tPrefix, temp,
|
||||
g.pkgPrefix, aPrefix, aPrefix)
|
||||
@@ -575,13 +578,22 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
// TODO: check if tPrefix_temp is an error, and return?
|
||||
|
||||
case "gif":
|
||||
b.printf("status = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
|
||||
g.pkgPrefix, aPrefix, vPrefix, n.Args()[1].Arg().Value().String(g.tm))
|
||||
// TODO: don't hard code being inside a try call.
|
||||
if g.currFunk.tempW > maxTemp {
|
||||
return fmt.Errorf("too many temporary variables required")
|
||||
}
|
||||
temp := g.currFunk.tempW
|
||||
g.currFunk.tempW++
|
||||
|
||||
// TODO: don't hard-code a_dst or v_r.
|
||||
b.printf("%sstatus %s%d = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %sr);\n",
|
||||
g.pkgPrefix, tPrefix, temp,
|
||||
g.pkgPrefix, aPrefix, vPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
// TODO: be principled with "if (l_lzw_src && etc)".
|
||||
b.writes("if (l_lzw_src && status) { goto suspend; }\n")
|
||||
// TODO: check if tPrefix_temp is an error, and return?
|
||||
|
||||
default:
|
||||
return fmt.Errorf("cannot convert Puffs call %q to C", n.String(g.tm))
|
||||
}
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
|
||||
template short_read(string qPKGPREFIXq, string qnameq) {
|
||||
short_read_qnameq:
|
||||
if (a_qnameq.buf && a_qnameq.buf->closed && !a_qnameq.limit.ptr_to_len) {
|
||||
if (a_qnameq.buf && a_qnameq.buf->closed && !a_qnameq.limit.ptr_to_len &&
|
||||
!a_qnameq.use_limitt) {
|
||||
status = qPKGPREFIXqERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
@@ -77,6 +77,12 @@ func (g *gen) findDerivedVars() {
|
||||
}
|
||||
|
||||
func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bool) error {
|
||||
// TODO: remove this hack. We're picking up the wrong name for "src:r,
|
||||
// dummy:in.src".
|
||||
if name.String(g.tm) == "dummy" {
|
||||
name = g.tm.ByName("src")
|
||||
}
|
||||
|
||||
if g.currFunk.derivedVars == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -94,7 +100,9 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
|
||||
|
||||
b.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("uint64_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("if (%s%s.use_limitt && (len > %s%s.limitt)) { len = %s%s.limitt; }",
|
||||
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("puffs_base__limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
@@ -114,7 +122,9 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, 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)
|
||||
b.printf("uint64_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("if (%s%s.use_limitt && (len > %s%s.limitt)) { len = %s%s.limitt; }",
|
||||
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("puffs_base__limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
@@ -128,6 +138,12 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
|
||||
}
|
||||
|
||||
func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer bool) error {
|
||||
// TODO: remove this hack. We're picking up the wrong name for "src:r,
|
||||
// dummy:in.src".
|
||||
if name.String(g.tm) == "dummy" {
|
||||
name = g.tm.ByName("src")
|
||||
}
|
||||
|
||||
if g.currFunk.derivedVars == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -142,6 +158,8 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer
|
||||
b.printf("size_t n = %srptr_%s - (%s%s.buf->ptr + %s%s.buf->ri);",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%s%s.buf->ri += n;", aPrefix, nameStr)
|
||||
// TODO: Should limitt be a uint8_t*, not a uint64_t?
|
||||
b.printf("if (%s%s.use_limitt) { %s%s.limitt -= n; }", aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("puffs_base__limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
@@ -159,6 +177,8 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer
|
||||
b.printf("size_t n = %swptr_%s - (%s%s.buf->ptr + %s%s.buf->wi);",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%s%s.buf->wi += n;", aPrefix, nameStr)
|
||||
// TODO: Should limitt be a uint8_t*, not a uint64_t?
|
||||
b.printf("if (%s%s.use_limitt) { %s%s.limitt -= n; }", aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("puffs_base__limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
@@ -183,7 +203,7 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
// TODO: don't hard-code these.
|
||||
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" {
|
||||
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" {
|
||||
continue
|
||||
}
|
||||
if err := g.writeLoadDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
|
||||
@@ -203,7 +223,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
// TODO: don't hard-code these.
|
||||
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" {
|
||||
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" {
|
||||
continue
|
||||
}
|
||||
if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
|
||||
|
||||
+129
-24
@@ -81,7 +81,9 @@ typedef struct puffs_base__limit1 {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -91,7 +93,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -604,7 +608,10 @@ static inline uint32_t puffs_base__writer1__copy_from_slice32(
|
||||
static inline puffs_base__empty_struct puffs_base__reader1__limit(
|
||||
puffs_base__reader1* r,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!r->use_limitt || (r->limitt > limit)) {
|
||||
r->limitt = limit;
|
||||
r->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
@@ -618,7 +625,10 @@ static inline puffs_base__empty_struct puffs_base__reader1__mark(
|
||||
static inline puffs_base__empty_struct puffs_base__writer1__limit(
|
||||
puffs_base__writer1* w,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!w->use_limitt || (w->limitt > limit)) {
|
||||
w->limitt = limit;
|
||||
w->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
@@ -855,7 +865,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -882,6 +895,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -895,7 +911,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -968,6 +987,9 @@ exit:
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -994,7 +1016,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1035,6 +1060,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1046,7 +1074,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
puffs_flate__flate_decoder__decode_uncompressed(self, a_dst, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1070,6 +1101,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1080,7 +1114,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
status = puffs_flate__flate_decoder__init_dynamic_huffman(self, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1100,6 +1137,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1110,7 +1150,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
|
||||
status = puffs_flate__flate_decoder__decode_huffman(self, a_dst, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1140,6 +1183,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1152,7 +1198,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1175,7 +1222,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1189,7 +1239,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1281,6 +1334,9 @@ exit:
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1292,6 +1348,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1304,7 +1363,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1338,7 +1398,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1352,7 +1415,10 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1692,6 +1758,9 @@ exit:
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1703,6 +1772,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1715,7 +1787,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1806,7 +1879,10 @@ puffs_flate__status puffs_flate__flate_decoder__init_dynamic_huffman(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -2018,6 +2094,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -2030,7 +2109,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -2343,7 +2423,10 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -2357,7 +2440,10 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -2425,6 +2511,9 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -2435,6 +2524,9 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -2448,7 +2540,10 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -2460,7 +2555,10 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
|
||||
}
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -2532,6 +2630,9 @@ exit:
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -2543,6 +2644,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -2556,7 +2660,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
+134
-50
@@ -81,7 +81,9 @@ typedef struct puffs_base__limit1 {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -91,7 +93,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -228,8 +232,7 @@ typedef struct {
|
||||
bool v_interlace;
|
||||
uint8_t v_lw;
|
||||
uint64_t v_block_size;
|
||||
uint64_t l_lzw_src;
|
||||
puffs_base__reader1 v_lzw_src;
|
||||
puffs_gif__status v_z;
|
||||
} c_decode_id[1];
|
||||
} private_impl;
|
||||
} puffs_gif__decoder;
|
||||
@@ -552,7 +555,10 @@ static inline uint32_t puffs_base__writer1__copy_from_slice32(
|
||||
static inline puffs_base__empty_struct puffs_base__reader1__limit(
|
||||
puffs_base__reader1* r,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!r->use_limitt || (r->limitt > limit)) {
|
||||
r->limitt = limit;
|
||||
r->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
@@ -566,7 +572,10 @@ static inline puffs_base__empty_struct puffs_base__reader1__mark(
|
||||
static inline puffs_base__empty_struct puffs_base__writer1__limit(
|
||||
puffs_base__writer1* w,
|
||||
uint64_t limit) {
|
||||
// TODO: implement.
|
||||
if (!w->use_limitt || (w->limitt > limit)) {
|
||||
w->limitt = limit;
|
||||
w->use_limitt = true;
|
||||
}
|
||||
return ((puffs_base__empty_struct){});
|
||||
}
|
||||
|
||||
@@ -704,7 +713,10 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -725,6 +737,9 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -735,7 +750,10 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
status = puffs_gif__decoder__decode_header(self, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -751,6 +769,9 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -761,7 +782,10 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
status = puffs_gif__decoder__decode_lsd(self, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -785,6 +809,9 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -795,7 +822,10 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
status = puffs_gif__decoder__decode_extension(self, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -812,6 +842,9 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -822,7 +855,10 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
|
||||
status = puffs_gif__decoder__decode_id(self, a_dst, a_src);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -858,6 +894,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -871,7 +910,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -890,7 +930,10 @@ puffs_gif__status puffs_gif__decoder__decode_header(puffs_gif__decoder* self,
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -942,6 +985,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -954,7 +1000,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -974,7 +1021,10 @@ puffs_gif__status puffs_gif__decoder__decode_lsd(puffs_gif__decoder* self,
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1052,6 +1102,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1064,7 +1117,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1084,7 +1138,10 @@ puffs_gif__status puffs_gif__decoder__decode_extension(
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1158,6 +1215,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1170,7 +1230,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1188,14 +1249,17 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
bool v_interlace;
|
||||
uint8_t v_lw;
|
||||
uint64_t v_block_size;
|
||||
uint64_t l_lzw_src;
|
||||
puffs_base__reader1 v_lzw_src;
|
||||
puffs_base__reader1 v_r;
|
||||
puffs_gif__status v_z;
|
||||
|
||||
uint8_t* b_rptr_src = NULL;
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1212,8 +1276,8 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
v_interlace = self->private_impl.c_decode_id[0].v_interlace;
|
||||
v_lw = self->private_impl.c_decode_id[0].v_lw;
|
||||
v_block_size = self->private_impl.c_decode_id[0].v_block_size;
|
||||
l_lzw_src = self->private_impl.c_decode_id[0].l_lzw_src;
|
||||
v_lzw_src = self->private_impl.c_decode_id[0].v_lzw_src;
|
||||
v_r = ((puffs_base__reader1){});
|
||||
v_z = self->private_impl.c_decode_id[0].v_z;
|
||||
}
|
||||
switch (coro_susp_point) {
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(0);
|
||||
@@ -1259,18 +1323,16 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
goto label_0_break;
|
||||
}
|
||||
while (true) {
|
||||
puffs_base__reader1__mark(&a_src, b_rptr_src);
|
||||
puffs_base__reader1__limit(&a_src, v_block_size);
|
||||
l_lzw_src = v_block_size;
|
||||
v_lzw_src = (puffs_base__reader1){.buf = a_src.buf,
|
||||
.limit = (puffs_base__limit1){
|
||||
.ptr_to_len = &l_lzw_src,
|
||||
.next = &a_src.limit,
|
||||
}};
|
||||
v_r = a_src;
|
||||
puffs_base__reader1__mark(&v_r, b_rptr_src);
|
||||
puffs_base__reader1__limit(&v_r, v_block_size);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1278,11 +1340,14 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
}
|
||||
}
|
||||
}
|
||||
status = puffs_gif__lzw_decoder__decode(&self->private_impl.f_lzw,
|
||||
a_dst, v_lzw_src);
|
||||
puffs_gif__status t_3 = puffs_gif__lzw_decoder__decode(
|
||||
&self->private_impl.f_lzw, a_dst, v_r);
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1291,14 +1356,15 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
}
|
||||
b_rend_src = b_rptr_src + len;
|
||||
}
|
||||
if (l_lzw_src && status) {
|
||||
goto suspend;
|
||||
v_z = t_3;
|
||||
if (v_z == 0) {
|
||||
goto label_1_break;
|
||||
}
|
||||
if (v_block_size <
|
||||
((uint64_t)(((puffs_base__slice_u8){
|
||||
.ptr = a_src.private_impl.mark,
|
||||
.len = a_src.private_impl.mark
|
||||
? b_rptr_src - a_src.private_impl.mark
|
||||
.ptr = v_r.private_impl.mark,
|
||||
.len = v_r.private_impl.mark
|
||||
? b_rptr_src - v_r.private_impl.mark
|
||||
: 0,
|
||||
})
|
||||
.len))) {
|
||||
@@ -1307,15 +1373,17 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
|
||||
}
|
||||
v_block_size -=
|
||||
((uint64_t)(((puffs_base__slice_u8){
|
||||
.ptr = a_src.private_impl.mark,
|
||||
.len = a_src.private_impl.mark
|
||||
? b_rptr_src - a_src.private_impl.mark
|
||||
.ptr = v_r.private_impl.mark,
|
||||
.len = v_r.private_impl.mark
|
||||
? b_rptr_src - v_r.private_impl.mark
|
||||
: 0,
|
||||
})
|
||||
.len));
|
||||
if (v_block_size == 0) {
|
||||
if ((v_block_size == 0) && (v_z > 0)) {
|
||||
goto label_1_break;
|
||||
}
|
||||
goto label_1_break;
|
||||
status = v_z;
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
|
||||
}
|
||||
label_1_break:;
|
||||
}
|
||||
@@ -1335,13 +1403,15 @@ suspend:
|
||||
self->private_impl.c_decode_id[0].v_interlace = v_interlace;
|
||||
self->private_impl.c_decode_id[0].v_lw = v_lw;
|
||||
self->private_impl.c_decode_id[0].v_block_size = v_block_size;
|
||||
self->private_impl.c_decode_id[0].l_lzw_src = l_lzw_src;
|
||||
self->private_impl.c_decode_id[0].v_lzw_src = v_lzw_src;
|
||||
self->private_impl.c_decode_id[0].v_z = v_z;
|
||||
|
||||
exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1354,7 +1424,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
@@ -1414,7 +1485,10 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
|
||||
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
|
||||
b_wend_dst = b_wptr_dst;
|
||||
if (!a_dst.buf->closed) {
|
||||
size_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
uint64_t len = a_dst.buf->len - a_dst.buf->wi;
|
||||
if (a_dst.use_limitt && (len > a_dst.limitt)) {
|
||||
len = a_dst.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1428,7 +1502,10 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
|
||||
uint8_t* b_rend_src = NULL;
|
||||
if (a_src.buf) {
|
||||
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
|
||||
size_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
uint64_t len = a_src.buf->wi - a_src.buf->ri;
|
||||
if (a_src.use_limitt && (len > a_src.limitt)) {
|
||||
len = a_src.limitt;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
|
||||
@@ -1575,6 +1652,9 @@ exit:
|
||||
if (a_dst.buf) {
|
||||
size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi);
|
||||
a_dst.buf->wi += n;
|
||||
if (a_dst.use_limitt) {
|
||||
a_dst.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_dst.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1586,6 +1666,9 @@ exit:
|
||||
if (a_src.buf) {
|
||||
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
|
||||
a_src.buf->ri += n;
|
||||
if (a_src.use_limitt) {
|
||||
a_src.limitt -= n;
|
||||
}
|
||||
puffs_base__limit1* lim;
|
||||
for (lim = &a_src.limit; lim; lim = lim->next) {
|
||||
if (lim->ptr_to_len) {
|
||||
@@ -1599,7 +1682,8 @@ exit:
|
||||
return status;
|
||||
|
||||
short_read_src:
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
|
||||
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
|
||||
!a_src.use_limitt) {
|
||||
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
+6
-2
@@ -81,7 +81,9 @@ typedef struct puffs_base__limit1 {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -91,7 +93,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
|
||||
+7
-4
@@ -81,7 +81,9 @@ typedef struct puffs_base__limit1 {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -91,7 +93,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
puffs_base__buf1* buf;
|
||||
puffs_base__limit1 limit;
|
||||
puffs_base__limit1 limit; // TODO: delete.
|
||||
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
|
||||
bool use_limitt;
|
||||
// Do not access the private_impl's fields directly. There is no API/ABI
|
||||
// compatibility or safety guarantee if you do so.
|
||||
struct {
|
||||
@@ -228,8 +232,7 @@ typedef struct {
|
||||
bool v_interlace;
|
||||
uint8_t v_lw;
|
||||
uint64_t v_block_size;
|
||||
uint64_t l_lzw_src;
|
||||
puffs_base__reader1 v_lzw_src;
|
||||
puffs_gif__status v_z;
|
||||
} c_decode_id[1];
|
||||
} private_impl;
|
||||
} puffs_gif__decoder;
|
||||
|
||||
+1
-2
@@ -613,9 +613,8 @@ func (n *TypeExpr) HasPointers() bool {
|
||||
for ; n != nil; n = n.Inner() {
|
||||
switch n.id0.Key() {
|
||||
case 0:
|
||||
// TODO: add t.KeyReader1, after figuring out how limit's should really work.
|
||||
switch n.id1.Key() {
|
||||
case t.KeyBuf1, t.KeyWriter1, t.KeyBuf2:
|
||||
case t.KeyBuf1, t.KeyReader1, t.KeyWriter1, t.KeyBuf2:
|
||||
return true
|
||||
}
|
||||
case t.KeyPtr, t.KeyNptr, t.KeyColon:
|
||||
|
||||
@@ -731,7 +731,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
|
||||
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
|
||||
isThisMethod(q.tm, n, "decode_blocks", 2) ||
|
||||
isThisMethod(q.tm, n, "init_fixed_huffman", 0) || isThisMethod(q.tm, n, "init_dynamic_huffman", 1) ||
|
||||
isThisMethod(q.tm, n, "init_huff", 4) {
|
||||
isThisMethod(q.tm, n, "init_huff", 4) ||
|
||||
isThatMethod(q.tm, n, t.KeyMark, 0) || isThatMethod(q.tm, n, t.KeyLimitt, 1) ||
|
||||
isThatMethod(q.tm, n, t.KeySinceMark, 0) {
|
||||
|
||||
for _, o := range n.Args() {
|
||||
a := o.Arg().Value()
|
||||
@@ -784,7 +786,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
|
||||
return nil, nil, nil
|
||||
}
|
||||
// TODO: delete this hack that only matches "foo.decode(etc)".
|
||||
if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) || isThatMethod(q.tm, n, t.KeyCopyFromSlice, 1) ||
|
||||
if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) ||
|
||||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) ||
|
||||
isThatMethod(q.tm, n, t.KeyCopyFromSlice, 1) ||
|
||||
isThatMethod(q.tm, n, q.tm.ByName("update").Key(), 1) {
|
||||
for _, o := range n.Args() {
|
||||
a := o.Arg().Value()
|
||||
|
||||
+5
-2
@@ -449,7 +449,9 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
|
||||
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
|
||||
isThisMethod(q.tm, n, "decode_blocks", 2) ||
|
||||
isThisMethod(q.tm, n, "init_fixed_huffman", 0) || isThisMethod(q.tm, n, "init_dynamic_huffman", 1) ||
|
||||
isThisMethod(q.tm, n, "init_huff", 4) {
|
||||
isThisMethod(q.tm, n, "init_huff", 4) ||
|
||||
isThatMethod(q.tm, n, t.KeyMark, 0) || isThatMethod(q.tm, n, t.KeyLimitt, 1) ||
|
||||
isThatMethod(q.tm, n, t.KeySinceMark, 0) {
|
||||
|
||||
if err := q.tcheckExpr(n.LHS().Expr(), depth); err != nil {
|
||||
return err
|
||||
@@ -530,7 +532,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
|
||||
}
|
||||
// TODO: delete this hack that only matches "foo.set_literal_width(etc)".
|
||||
if isThatMethod(q.tm, n, q.tm.ByName("set_literal_width").Key(), 1) ||
|
||||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) {
|
||||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) ||
|
||||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) {
|
||||
foo := n.LHS().Expr().LHS().Expr()
|
||||
if err := q.tcheckExpr(foo, depth); err != nil {
|
||||
return err
|
||||
|
||||
+16
-16
@@ -162,25 +162,25 @@ pri func decoder.decode_id?(dst writer1, src reader1)() {
|
||||
break
|
||||
}
|
||||
while true {
|
||||
in.src.mark()
|
||||
in.src.limitt(l:block_size)
|
||||
// TODO: how should this reader1-typed variable (which is implemented
|
||||
// by containing pointers) work across resume/suspend? We don't want to
|
||||
// have a dangling pointer to an earlier src buffer.
|
||||
var lzw_src reader1 = limit (block_size) in.src
|
||||
this.lzw.decode?(dst:in.dst, src:lzw_src)
|
||||
|
||||
if block_size < in.src.since_mark().length() {
|
||||
var r reader1 = in.src
|
||||
r.mark()
|
||||
r.limitt(l:block_size)
|
||||
// TODO: remove the dummy param. It's needed for now so that
|
||||
// writeSaveExprDerivedVars updates e.g. the b_rptr_src derived
|
||||
// variables.
|
||||
var z status = try this.lzw.decode?(dst:in.dst, src:r, dummy:in.src)
|
||||
if z.is_ok() {
|
||||
break
|
||||
}
|
||||
if block_size < r.since_mark().length() {
|
||||
return error "internal error: inconsistent limited read"
|
||||
}
|
||||
block_size -= in.src.since_mark().length()
|
||||
if block_size == 0 {
|
||||
// TODO: examine the this.lzw.decode? status.
|
||||
block_size -= r.since_mark().length()
|
||||
// TODO: z.is_suspension() should be (z == suspension "short read").
|
||||
if (block_size == 0) and z.is_suspension() {
|
||||
break
|
||||
}
|
||||
|
||||
// TODO: add a "try" to the this.lzw.decode? line above, and break
|
||||
// *conditionally*.
|
||||
break
|
||||
return z
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user