Improve cgen for constant-indexed slices of arrays

This commit is contained in:
Nigel Tao committed 2020-12-02 22:39:34 +11:00
1 parent 8482161c91
commit 0c481fe7c6
2 files changed
+36 -5

No files matched your search

+33 -2
View File
@@ -16,6 +16,7 @@ package cgen
import ( import (
"fmt" "fmt"
"math/big"
"strings" "strings"
a "github.com/google/wuffs/lang/ast" 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() lhs := n.LHS().AsExpr()
mhs := n.MHS().AsExpr() mhs := n.MHS().AsExpr()
rhs := n.RHS().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 { switch {
case mhs != nil && rhs == nil: case mhs != nil && rhs == nil:
b.writes("wuffs_base__slice_u8__subslice_i(") 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" comma = ",\n"
} }
lhsIsArray := lhs.MType().IsArrayType()
if lhsIsArray { if lhsIsArray {
// TODO: don't assume that the slice is a slice of base.u8. // TODO: don't assume that the slice is a slice of base.u8.
b.writes("wuffs_base__make_slice_u8(") b.writes("wuffs_base__make_slice_u8(")
if mcv != nil {
b.writeb('(')
}
} }
if err := g.writeExpr(b, lhs, depth); err != nil { if err := g.writeExpr(b, lhs, depth); err != nil {
return err return err
} }
if lhsIsArray { if lhsIsArray {
if mcv != nil {
b.writes(") + ")
b.writes(mcv.String())
}
b.writes(comma) 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 { if mhs != nil {
+3 -3
View File
@@ -16978,7 +16978,7 @@ wuffs_bmp__decoder__decode_frame(
} }
v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler, v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
wuffs_base__pixel_buffer__pixel_format(a_dst), 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__utility__make_pixel_format(self->private_impl.f_src_pixfmt),
wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024), wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024),
a_blend); 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_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_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); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0);
label__outer__continue:; label__outer__continue:;
while (true) { 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_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_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); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0);
label__outer__continue:; label__outer__continue:;
while (true) { while (true) {