From 4a2f570d5644c270a05205d75c05f578b89fa222 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 5 Jun 2023 13:22:21 +1000 Subject: [PATCH] cgen: simplify bulk_etc method's generated code --- internal/cgen/builtin.go | 53 +++++++++++++++++--------- internal/cgen/expr.go | 21 ++++++++++ release/c/wuffs-unsupported-snapshot.c | 10 ++--- 3 files changed, 58 insertions(+), 26 deletions(-) diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 900131cc..1c7bece5 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -990,15 +990,10 @@ func (g *gen) writeBuiltinSliceBulkMethodRecv(b *buffer, recv *a.Expr, depth uin if err := g.writeExpr(b, lo, false, depth); err != nil { return err } - b.writes("], (") - if err := g.writeExpr(b, hi, false, depth); err != nil { + b.writes("], ") + if err := g.writeExprXMinusY(b, hi, lo, depth); err != nil { return err } - b.writes(" - ") - if err := g.writeExpr(b, lo, false, depth); err != nil { - return err - } - b.writes(")") } if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) { b.writes(" * (size_t)") @@ -1008,19 +1003,39 @@ func (g *gen) writeBuiltinSliceBulkMethodRecv(b *buffer, recv *a.Expr, depth uin b.writes(", ") return nil - } else if arrayOrSlice.MType().IsContainerOfSpecificNumType(t.IDSlice, t.IDU8) { - if err := g.writeExpr(b, recv, false, depth); err != nil { - return err + } else if recv.MType().IsContainerOfSpecificNumType(t.IDSlice, t.IDU8) { + if arrayOrSlice.MType().IsContainerOfSpecificNumType(t.IDSlice, t.IDU8) { + if err := g.writeExpr(b, arrayOrSlice, false, depth); err != nil { + return err + } + b.writes(".ptr") + if mhs := recv.MHS(); mhs != nil { + b.writes(" + ") + if err := g.writeExpr(b, mhs.AsExpr(), false, depth); err != nil { + return err + } + } + b.writes(", ") + } else { + if err := g.writeExpr(b, recv, false, depth); err != nil { + return err + } + b.writes(".ptr, ") } - b.writes(".ptr, ") - if err := g.writeExpr(b, recv, false, depth); err != nil { - return err - } - b.writes(".len") - if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) { - b.writes(" * (size_t)") - b.writes(bs.String()) - b.writes("u") + + if mhs, rhs := recv.MHS(), recv.RHS(); (mhs != nil) && (rhs != nil) { + if err := g.writeExprXMinusY(b, rhs.AsExpr(), mhs.AsExpr(), depth); err != nil { + return err + } + } else if rhs := recv.RHS(); rhs != nil { + if err := g.writeExpr(b, rhs.AsExpr(), false, depth); err != nil { + return err + } + } else { + if err := g.writeExpr(b, recv, false, depth); err != nil { + return err + } + b.writes(".len") } b.writes(", ") return nil diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index aa83fa62..562ebca5 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -382,6 +382,27 @@ func (g *gen) writeExprRepr(b *buffer, n *a.Expr, depth uint32) error { return nil } +func (g *gen) writeExprXMinusY(b *buffer, x *a.Expr, y *a.Expr, depth uint32) error { + if x.Operator() == t.IDXBinaryPlus { + if x.LHS().AsExpr().Eq(y) { + return g.writeExpr(b, x.RHS().AsExpr(), false, depth) + } else if x.RHS().AsExpr().Eq(y) { + return g.writeExpr(b, x.LHS().AsExpr(), false, depth) + } + } + + b.writes("(") + if err := g.writeExpr(b, x, false, depth); err != nil { + return err + } + b.writes(" - ") + if err := g.writeExpr(b, y, false, depth); err != nil { + return err + } + b.writes(")") + return nil +} + func (g *gen) writeExprAs(b *buffer, lhs *a.Expr, rhs *a.TypeExpr, depth uint32) error { // Drop the "& redundantMask" in "(foo & redundantMask) as base.uxx". It's // redundant in C/C++ (but not in Wuffs). diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index bfc3b277..fc4a6a46 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -39041,11 +39041,7 @@ wuffs_jpeg__decoder__do_decode_frame( status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); goto exit; } else if (self->private_impl.f_components_workbuf_offsets[4u] < self->private_impl.f_components_workbuf_offsets[8u]) { - wuffs_base__bulk_memset(wuffs_base__slice_u8__subslice_ij(a_workbuf, - self->private_impl.f_components_workbuf_offsets[4u], - self->private_impl.f_components_workbuf_offsets[8u]).ptr, wuffs_base__slice_u8__subslice_ij(a_workbuf, - self->private_impl.f_components_workbuf_offsets[4u], - self->private_impl.f_components_workbuf_offsets[8u]).len, 0u); + wuffs_base__bulk_memset(a_workbuf.ptr + self->private_impl.f_components_workbuf_offsets[4u], (self->private_impl.f_components_workbuf_offsets[8u] - self->private_impl.f_components_workbuf_offsets[4u]), 0u); } label__0__continue:; while (true) { @@ -40082,7 +40078,7 @@ wuffs_jpeg__decoder__load_mcu_blocks( v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[v_csel] * 16u))); v_offset = (self->private_impl.f_components_workbuf_offsets[(v_csel | 4u)] + (((v_h * ((uint64_t)(a_mx))) + ((uint64_t)(self->private_impl.f_scan_comps_bx_offset[v_b]))) * 128u) + (((v_v * ((uint64_t)(a_my))) + ((uint64_t)(self->private_impl.f_scan_comps_by_offset[v_b]))) * v_stride16)); if (v_offset <= ((uint64_t)(a_workbuf.len))) { - wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[v_b], ((v_b + 1u) - v_b) * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset)); + wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[v_b], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset)); } v_b += 1u; } @@ -40116,7 +40112,7 @@ wuffs_jpeg__decoder__save_mcu_blocks( v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[v_csel] * 16u))); v_offset = (self->private_impl.f_components_workbuf_offsets[(v_csel | 4u)] + (((v_h * ((uint64_t)(a_mx))) + ((uint64_t)(self->private_impl.f_scan_comps_bx_offset[v_b]))) * 128u) + (((v_v * ((uint64_t)(a_my))) + ((uint64_t)(self->private_impl.f_scan_comps_by_offset[v_b]))) * v_stride16)); if (v_offset <= ((uint64_t)(a_workbuf.len))) { - wuffs_base__bulk_save_host_endian(&self->private_data.f_mcu_blocks[v_b], ((v_b + 1u) - v_b) * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset)); + wuffs_base__bulk_save_host_endian(&self->private_data.f_mcu_blocks[v_b], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset)); } v_b += 1u; }