From 332fb46b5cf041de7135d900bf3ff389000b3f4f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 23 Dec 2020 15:34:42 +1100 Subject: [PATCH] Remove std/nie decoder.swizzle derived var hack --- internal/cgen/cgen.go | 3 ++- internal/cgen/var.go | 30 ++++++++++++++++++++++++-- release/c/wuffs-unsupported-snapshot.c | 2 -- std/nie/decode_nie.wuffs | 5 ----- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 2f23de5f..c4e8ca22 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -43,7 +43,8 @@ var ( maxInt64 = big.NewInt((1 << 63) - 1) - typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil) + typeExprPixelSwizzler = a.NewTypeExpr(0, t.IDBase, t.IDPixelSwizzler, nil, nil, nil) + typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil) ) // Prefixes are prepended to names to form a namespace and to avoid e.g. diff --git a/internal/cgen/var.go b/internal/cgen/var.go index 7321f108..6bdd3913 100644 --- a/internal/cgen/var.go +++ b/internal/cgen/var.go @@ -24,6 +24,18 @@ import ( var errNeedDerivedVar = errors.New("cgen: internal error: need derived var") +// argsContainsArgsDotFoo returns whether the argNodes, a slice of *ast.Node +// where each ast.Node is an ast.Arg, contains a "name: value" element whose +// value is "args.foo". +func argsContainsArgsDotFoo(argNodes []*a.Node, foo t.ID) bool { + for _, o := range argNodes { + if foo == o.AsArg().Value().IsArgsDotFoo() { + return true + } + } + return false +} + func (g *gen) needDerivedVar(name t.ID) bool { if name == 0 { return false @@ -34,10 +46,24 @@ func (g *gen) needDerivedVar(name t.ID) bool { if p.Kind() != a.KExpr { return nil } - recv, _, _ := p.AsExpr().IsMethodCall() - if (recv != nil) && (recv.IsArgsDotFoo() == name) { + recv, meth, args := p.AsExpr().IsMethodCall() + if recv == nil { + return nil + } + if recv.IsArgsDotFoo() == name { return errNeedDerivedVar } + // Some built-in methods will also need a derived var for their + // arguments. + // + // TODO: use a comprehensive list of such methods. + switch meth { + case t.IDLimitedSwizzleU32InterleavedFromReader, + t.IDSwizzleInterleavedFromReader: + if recv.MType().Eq(typeExprPixelSwizzler) && argsContainsArgsDotFoo(args, name) { + return errNeedDerivedVar + } + } return nil }) if err == errNeedDerivedVar { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 7822c485..38896590 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -28780,8 +28780,6 @@ wuffs_nie__decoder__swizzle( v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8))); v_dst_bytes_per_row = (((uint64_t)(self->private_impl.f_width)) * v_dst_bytes_per_pixel); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); - if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { - } label__0__continue:; while (true) { if (self->private_impl.f_dst_x == self->private_impl.f_width) { diff --git a/std/nie/decode_nie.wuffs b/std/nie/decode_nie.wuffs index 99ad7fea..6f3c390d 100644 --- a/std/nie/decode_nie.wuffs +++ b/std/nie/decode_nie.wuffs @@ -206,11 +206,6 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: base.io_reader) base. dst_bytes_per_row = (this.width as base.u64) * dst_bytes_per_pixel tab = args.dst.plane(p: 0) - // TODO: this hack (to generate derived variables for args.src) shouldn't - // be necessary. - if args.src.length() <= 0 { - } - while true { if this.dst_x == this.width { this.dst_x = 0