Re-do how limits work.

This commit is contained in:
Nigel Tao committed 2017-10-26 16:59:03 +11:00
1 parent a382101a9c
commit 8ff453c752
16 files changed
+389 -122

No files matched your search

+6 -2
View File
@@ -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 {
+8 -2
View File
@@ -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){});
}
+1 -1
View File
@@ -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.
)
+6 -5
View File
@@ -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,
+21
View File
@@ -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:
+17 -5
View File
@@ -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))
}
+2 -1
View File
@@ -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;
}
+24 -4
View File
@@ -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 {