From 0c481fe7c62a9b70db613d8b21cca9b5f2f73e5f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 Dec 2020 22:39:34 +1100 Subject: [PATCH] Improve cgen for constant-indexed slices of arrays --- internal/cgen/expr.go | 35 ++++++++++++++++++++++++-- release/c/wuffs-unsupported-snapshot.c | 6 ++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 566ca9f0..a49e8f1c 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -16,6 +16,7 @@ package cgen import ( "fmt" + "math/big" "strings" a "github.com/google/wuffs/lang/ast" @@ -163,6 +164,21 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, depth uint32) error { lhs := n.LHS().AsExpr() mhs := n.MHS().AsExpr() rhs := n.RHS().AsExpr() + + mcv := (*big.Int)(nil) + rcv := (*big.Int)(nil) + lhsIsArray := lhs.MType().IsArrayType() + if lhsIsArray { + if (mhs != nil) && (mhs.ConstValue() != nil) { + mcv = mhs.ConstValue() + mhs = nil + } + if (rhs != nil) && (rhs.ConstValue() != nil) { + rcv = rhs.ConstValue() + rhs = nil + } + } + switch { case mhs != nil && rhs == nil: b.writes("wuffs_base__slice_u8__subslice_i(") @@ -178,17 +194,32 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, depth uint32) error { comma = ",\n" } - lhsIsArray := lhs.MType().IsArrayType() if lhsIsArray { // TODO: don't assume that the slice is a slice of base.u8. b.writes("wuffs_base__make_slice_u8(") + if mcv != nil { + b.writeb('(') + } } if err := g.writeExpr(b, lhs, depth); err != nil { return err } if lhsIsArray { + if mcv != nil { + b.writes(") + ") + b.writes(mcv.String()) + } b.writes(comma) - b.printf("%v)", lhs.MType().ArrayLength().ConstValue()) + + length := lhs.MType().ArrayLength().ConstValue() + if rcv != nil { + length = rcv + } + if mcv != nil { + length = big.NewInt(0).Sub(length, mcv) + } + b.writes(length.String()) + b.writeb(')') } if mhs != nil { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 2482506b..a1cba1c5 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -16978,7 +16978,7 @@ wuffs_bmp__decoder__decode_frame( } v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler, wuffs_base__pixel_buffer__pixel_format(a_dst), - wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__slice_u8__subslice_i(wuffs_base__make_slice_u8(self->private_data.f_scratch, 2048), 1024)), + wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8((self->private_data.f_scratch) + 1024, 1024)), wuffs_base__utility__make_pixel_format(self->private_impl.f_src_pixfmt), wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024), a_blend); @@ -17090,7 +17090,7 @@ wuffs_bmp__decoder__swizzle_compress0( } 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_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__slice_u8__subslice_i(wuffs_base__make_slice_u8(self->private_data.f_scratch, 2048), 1024)); + v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8((self->private_data.f_scratch) + 1024, 1024)); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); label__outer__continue:; while (true) { @@ -17195,7 +17195,7 @@ wuffs_bmp__decoder__swizzle_compress3( } 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_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__slice_u8__subslice_i(wuffs_base__make_slice_u8(self->private_data.f_scratch, 2048), 1024)); + v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8((self->private_data.f_scratch) + 1024, 1024)); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); label__outer__continue:; while (true) {