From 18e32d61e521d9712e1843a0096c844e9f348009 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 22 Sep 2017 11:54:24 +1000 Subject: [PATCH] Add a writer1.slice method. --- cmd/puffs-c/internal/cgen/expr.go | 10 +++++ cmd/puffs-c/internal/cgen/statement.go | 23 +++++----- cmd/puffs-c/internal/cgen/var.go | 18 ++++++-- gen/c/std/flate.c | 58 +++++++++++++++++++++++++- gen/c/std/gif.c | 2 + lang/check/bounds.go | 1 + lang/check/check.go | 12 +++--- lang/check/type.go | 6 ++- lang/token/list.go | 3 ++ std/flate/decode_flate.puffs | 6 ++- 10 files changed, 115 insertions(+), 24 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index d677711c..8076d4ff 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -134,6 +134,16 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil } + if isInDst(g.tm, n, t.KeySlice, 0) { + if pp == parenthesesMandatory { + b.writeb('(') + } + b.writes("(puffs_base_slice_u8){.ptr= a_dst.buf->ptr, .len=b_wptr_dst - a_dst.buf->ptr}") + if pp == parenthesesMandatory { + b.writeb(')') + } + return nil + } // TODO. case t.KeyOpenBracket: diff --git a/cmd/puffs-c/internal/cgen/statement.go b/cmd/puffs-c/internal/cgen/statement.go index 11af2ba2..d13c7a64 100644 --- a/cmd/puffs-c/internal/cgen/statement.go +++ b/cmd/puffs-c/internal/cgen/statement.go @@ -183,27 +183,25 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { name := n.Name().String(g.tm) b.printf("memset(%s%s, 0, sizeof(%s%s));\n", vPrefix, name, vPrefix, name) - case t.KeyColon: - if n.Value() != nil { - return fmt.Errorf("TODO: slice initializers for non-zero default values") - } - // TODO: don't assume that the slice is a slice of u8. - b.printf("%s%s = ((puffs_base_slice_u8){});", vPrefix, n.Name().String(g.tm)) - - // TODO: remove this. - b.printf("\n/* Avoid the \"unused variable\" warning. */\n") - b.printf("if (%s%s.ptr) {}\n", vPrefix, n.Name().String(g.tm)) - default: b.printf("%s%s = ", vPrefix, n.Name().String(g.tm)) if v := n.Value(); v != nil { if err := g.writeExpr(b, v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil { return err } + } else if n.XType().Decorator().Key() == t.KeyColon { + // TODO: don't assume that the slice is a slice of u8. + b.printf("((puffs_base_slice_u8){})") } else { b.writeb('0') } b.writes(";\n") + + // TODO: remove this. + if n.XType().Decorator().Key() == t.KeyColon { + b.printf("\n/* Avoid the \"unused variable\" warning. */\n") + b.printf("if (%s%s.ptr) {}\n", vPrefix, n.Name().String(g.tm)) + } } return nil @@ -718,8 +716,9 @@ func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { } func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { + callSuspendible := methodName != t.KeySlice // TODO: check that n.Args() is "(x:bar)". - if n.ID0().Key() != t.KeyOpenParen || !n.CallSuspendible() || len(n.Args()) != nArgs { + if n.ID0().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 68313d61..d2c2b85a 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -148,19 +148,26 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error { b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }") b.printf("}") + // Not all writer1 methods use the wend variable. + b.printf("\n/* Avoid the \"unused variable\" warning. */\n") + b.printf("(void)(%swend_%s);", bPrefix, nameStr) + b.printf("}\n") } return nil } func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error { - if g.currFunk.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen { + if g.currFunk.derivedVars == nil { + return nil + } + if k := n.ID0().Key(); k != t.KeyOpenParen && k != t.KeyTry { return nil } for _, o := range n.Args() { o := o.Arg() // TODO: don't hard-code these. - if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" { + if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" { continue } if err := g.writeLoadDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil { @@ -171,13 +178,16 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error { } func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error { - if g.currFunk.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen { + if g.currFunk.derivedVars == nil { + return nil + } + if k := n.ID0().Key(); k != t.KeyOpenParen && k != t.KeyTry { return nil } for _, o := range n.Args() { o := o.Arg() // TODO: don't hard-code these. - if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" { + if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" { continue } if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType()); err != nil { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index ba7d1079..1f41c366 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -535,6 +535,20 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, puffs_flate_status v_z; puffs_base_slice_u8 v_written; + uint8_t* b_wptr_dst = NULL; + uint8_t* b_wend_dst = NULL; + if (a_dst.buf) { + b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + len = *lim->ptr_to_len; + } + } + b_wend_dst = b_wptr_dst + len; + } + uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; if (coro_susp_point) { v_z = self->private_impl.c_decode[0].v_z; @@ -544,11 +558,36 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, PUFFS_COROUTINE_SUSPENSION_POINT(0); PUFFS_COROUTINE_SUSPENSION_POINT(1); + if (a_dst.buf) { + size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi); + a_dst.buf->wi += n; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len) { + *lim->ptr_to_len -= n; + } + } + /* Avoid the "unused variable" warning. */ + (void)(b_wend_dst); + } puffs_flate_status t_0 = puffs_flate_decoder_decode_blocks(self, a_dst, a_src); + if (a_dst.buf) { + b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + len = *lim->ptr_to_len; + } + } + b_wend_dst = b_wptr_dst + len; + } v_z = t_0; if (v_z > 0) { - v_written = ((puffs_base_slice_u8){}); + v_written = ((puffs_base_slice_u8){.ptr = a_dst.buf->ptr, + .len = b_wptr_dst - a_dst.buf->ptr}); + /* Avoid the "unused variable" warning. */ if (v_written.ptr) { } @@ -566,6 +605,19 @@ suspend: self->private_impl.c_decode[0].v_written = ((puffs_base_slice_u8){}); exit: + if (a_dst.buf) { + size_t n = b_wptr_dst - (a_dst.buf->ptr + a_dst.buf->wi); + a_dst.buf->wi += n; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len) { + *lim->ptr_to_len -= n; + } + } + /* Avoid the "unused variable" warning. */ + (void)(b_wend_dst); + } + self->private_impl.status = status; return status; } @@ -867,6 +919,8 @@ exit: *lim->ptr_to_len -= n; } } + /* Avoid the "unused variable" warning. */ + (void)(b_wend_dst); } if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); @@ -1201,6 +1255,8 @@ exit: *lim->ptr_to_len -= n; } } + /* Avoid the "unused variable" warning. */ + (void)(b_wend_dst); } if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 15a23bc2..bd12111e 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1288,6 +1288,8 @@ exit: *lim->ptr_to_len -= n; } } + /* Avoid the "unused variable" warning. */ + (void)(b_wend_dst); } if (a_src.buf) { size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri); diff --git a/lang/check/bounds.go b/lang/check/bounds.go index f8e000f9..8c6f1841 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -649,6 +649,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, 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.KeyCopyHistory32, 2) || + isInDst(q.tm, n, t.KeySlice, 0) || 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/check.go b/lang/check/check.go index 5e913a85..d411e3e0 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -56,11 +56,13 @@ func trimQuotes(s string) string { // typeExprFoo is an *ast.Node MType (implicit type). var ( - typeExprBool = a.NewTypeExpr(0, t.IDBool, nil, nil, nil) - typeExprIdeal = a.NewTypeExpr(0, t.IDDoubleZ, nil, nil, nil) - typeExprList = a.NewTypeExpr(0, t.IDDollar, nil, nil, nil) - typeExprStatus = a.NewTypeExpr(0, t.IDStatus, nil, nil, nil) - typeExprU64 = a.NewTypeExpr(0, t.IDU64, nil, nil, nil) + typeExprBool = a.NewTypeExpr(0, t.IDBool, nil, nil, nil) + typeExprIdeal = a.NewTypeExpr(0, t.IDDoubleZ, nil, nil, nil) + typeExprList = a.NewTypeExpr(0, t.IDDollar, nil, nil, nil) + typeExprStatus = a.NewTypeExpr(0, t.IDStatus, nil, nil, nil) + typeExprU8 = a.NewTypeExpr(0, t.IDU8, nil, nil, nil) + typeExprU64 = a.NewTypeExpr(0, t.IDU64, nil, nil, nil) + typeExprSliceU8 = a.NewTypeExpr(t.IDColon, 0, nil, nil, typeExprU8) // TODO: delete this. typeExprPlaceholder = a.NewTypeExpr(0, t.IDU8, nil, nil, nil) diff --git a/lang/check/type.go b/lang/check/type.go index 54d75b92..a292b786 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -349,6 +349,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { 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.KeyCopyHistory32, 2) || + isInDst(q.tm, n, t.KeySlice, 0) || 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) || @@ -370,6 +371,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { n.SetMType(typeExprPlaceholder32) // HACK. } else if isInSrc(q.tm, n, t.KeyReadU16BE, 0) || isInSrc(q.tm, n, t.KeyReadU16LE, 0) { n.SetMType(typeExprPlaceholder16) // HACK. + } else if isInDst(q.tm, n, t.KeySlice, 0) { + n.SetMType(typeExprSliceU8) // HACK. } else { n.SetMType(typeExprPlaceholder) // HACK. } @@ -528,8 +531,9 @@ func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { } func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { + callSuspendible := methodName != t.KeySlice // TODO: check that n.Args() is "(x:bar)". - if n.ID0().Key() != t.KeyOpenParen || !n.CallSuspendible() || len(n.Args()) != nArgs { + if n.ID0().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() diff --git a/lang/token/list.go b/lang/token/list.go index e03f2f33..1c2df852 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -269,6 +269,7 @@ const ( KeyIsError = Key(IDIsError >> KeyShift) KeyIsOK = Key(IDIsOK >> KeyShift) KeyIsSuspension = Key(IDIsSuspension >> KeyShift) + KeySlice = Key(IDSlice >> KeyShift) KeyXUnaryPlus = Key(IDXUnaryPlus >> KeyShift) KeyXUnaryMinus = Key(IDXUnaryMinus >> KeyShift) @@ -442,6 +443,7 @@ const ( IDIsError = ID(0xC5<